Improve guess module name

pedroaarm · Jul 14, 2016 · 2e2ce54 · 2e2ce54
1 parent 27a6e6f
commit 2e2ce54
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/haskell-mode.el b/haskell-mode.el
@@ -1113,14 +1113,28 @@ successful, nil otherwise."
       (if (not (haskell-mode-try-insert-scc-at-point))
           (error "Could not insert or remove SCC"))))
 
-(defun haskell-guess-module-name ()
-  "Guess the current module name of the buffer."
-  (interactive)
-  (let ((components (cl-loop for part
-                             in (reverse (split-string (buffer-file-name) "/"))
+(defun haskell-guess-module-name-from-file-name (file-name)
+  "Guess the module name from FILE-NAME.
+
+Based on given FILE-NAME this function tries to find path
+components that look like module identifiers and composes full
+module path using this information. For example:
+
+    /Abc/Def/Xyz.lhs => Abc.Def.Xyz
+    /Ab-c/Def/Xyz.lhs => Def.Xyz
+    src/Abc/Def/Xyz.hs => Abc.Def.Xyz
+    c:\\src\\Abc\\Def\\Xyz.hs => Abc.Def.Xyz
+
+This function usually will be used with `buffer-file-name':
+
+    (haskell-guess-module-name-from-file-name (buffer-file-name))"
+
+  (let* ((file-name-sans-ext (file-name-sans-extension file-name))
+         (components (cl-loop for part
+                             in (reverse (split-string file-name-sans-ext "/"))
                              while (let ((case-fold-search nil))
-                                     (string-match "^[A-Z]+" part))
-                             collect (replace-regexp-in-string "\\.l?hs$" "" part))))
+                                     (string-match (concat "^" haskell-lexeme-modid "$") part))
+                             collect part)))
     (mapconcat 'identity (reverse components) ".")))
 
 (defvar haskell-auto-insert-module-format-string
@@ -1133,7 +1147,7 @@ successful, nil otherwise."
   (when (and (= (point-min)
                 (point-max))
              (buffer-file-name))
-    (insert (format haskell-auto-insert-module-format-string (haskell-guess-module-name)))
+    (insert (format haskell-auto-insert-module-format-string (haskell-guess-module-name-from-file-name (buffer-file-name))))
     (goto-char (point-min))
     (end-of-line)))
 

diff --git a/haskell.el b/haskell.el
@@ -502,7 +502,7 @@ for various things, but is optional."
   (insert-file-contents-literally
    (concat (haskell-session-current-dir (haskell-session))
            "/"
-           (haskell-guess-module-name)
+           (haskell-guess-module-name-from-file-name (buffer-file-name))
            ".imports")))
 
 (defun haskell-interactive-jump-to-error-line ()