hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inserting qualified module.

Browse Source
This commit is contained in:
Kazu Yamamoto 2014-03-26 11:32:08 +09:00
parent 2e2e8a8b99
commit 40a81cad74
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elisp/ghc-check.el
View File

@ -184,7 +184,8 @@
(ghc-ins-mod sym))) (ghc-ins-mod sym)))
((string-match "Not in scope: `\\([^'\n\0]+\\)'" data) ((string-match "Not in scope: `\\([^'\n\0]+\\)'" data)
(let ((sym (match-string 1 data))) (let ((sym (match-string 1 data)))
(if (y-or-n-p (format "Import module for %s?" sym)) (if (or (string-match "\\." sym) ;; qualified
(y-or-n-p (format "Import module for %s?" sym)))
(ghc-ins-mod sym) (ghc-ins-mod sym)
(unless (re-search-forward "^$" nil t) (unless (re-search-forward "^$" nil t)
(goto-char (point-max)) (goto-char (point-max))

11
elisp/ghc-ins-mod.el
View File

@ -20,13 +20,20 @@
(ghc-ins-mod expr))) (ghc-ins-mod expr)))
(defun ghc-ins-mod (expr) (defun ghc-ins-mod (expr)
(let ((mods (ghc-function-to-modules expr))) (let (prefix fun mods)
(if (not (string-match "^\\([^.]+\\)\\\.\\([^.]+\\)$" expr))
(setq fun expr)
(setq prefix (match-string 1 expr))
(setq fun (match-string 2 expr)))
(setq mods (ghc-function-to-modules fun))
(if (null mods) (if (null mods)
(message "No module guessed") (message "No module guessed")
(let ((mod (ghc-completing-read "Module name (%s): " mods))) (let ((mod (ghc-completing-read "Module name (%s): " mods)))
(save-excursion (save-excursion
(ghc-goto-module-position) (ghc-goto-module-position)
(insert "import " mod " (" (ghc-enclose expr) ")\n")))))) (if prefix
(insert "import qualified " mod " as " prefix "\n")
(insert "import " mod " (" (ghc-enclose expr) ")\n")))))))
(defun ghc-completing-read (fmt lst) (defun ghc-completing-read (fmt lst)
(let* ((def (car lst)) (let* ((def (car lst))