Skip to content

Use Emacs' built-in completing-read instead of Grizzl #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
3. Install import-js.el for Emacs
* Install via [MELPA](https://melpa.org/#/import-js)
* Alternatively, Copy plugins/import-js.el into your Emacs load-path and add
`(require 'import-js)` to your config. You will also need to install
[grizzl](https://github.com/grizzl/grizzl)
`(require 'import-js)` to your config.
4. Run the import-js daemon
* `(M-x) run-import-js`
* The daemon will use watchman if installed to improve performance
Expand Down
29 changes: 13 additions & 16 deletions plugin/import-js.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;;
;; Author: Kevin Kehl <kevin.kehl@gmail.com>
;; URL: http://github.com/Galooshi/emacs-import-js/
;; Package-Requires: ((grizzl "0.1.0") (emacs "24"))
;; Package-Requires: ((emacs "24"))
;; Version: 1.0.0
;; Keywords: javascript

Expand All @@ -30,9 +30,6 @@

(require 'json)

(eval-when-compile
(require 'grizzl))

(defvar import-js-handler nil "Current import-js output handler")
(defvar import-js-handler-buffer nil "Current import-js buffer to write to when handler is invoked.")
(defvar import-js-output "" "Partial import-js output")
Expand Down Expand Up @@ -91,18 +88,18 @@

(defun import-js-handle-unresolved (unresolved word)
"Map unresolved imports to a path"
(let ((paths (mapcar
(lambda (car)
(cdr (assoc 'importPath car)))
(cdr (assoc-string word unresolved)))))
(minibuffer-with-setup-hook
(lambda () (make-sparse-keymap))
(grizzl-completing-read (format "Unresolved import (%s)" word)
(grizzl-make-index
paths
'files
import-js-current-project-root
nil)))))
(let* ((unresolvedImports (cdr (assoc-string word unresolved)))
(collection (mapcar
(lambda (car)
(list
(cdr (assoc 'displayName car))
(cdr (assoc 'importPath car))))
unresolvedImports)))
(cadr (assoc
(completing-read
(format "Unresolved import (%s)" word)
collection)
collection))))

(defun import-js-handle-data (process data)
"Handles STDOUT from node, which arrives in chunks"
Expand Down