Merge pull request #1275 from gracjan/pr-fix-module-indentation

Fix module declaration indentation

Author: gracjan

haskell-indentation.el

@@ -493,6 +493,7 @@ fixes up only indentation."
     ("type"     . haskell-indentation-data)
     ("newtype"  . haskell-indentation-data)
     ("import"   . haskell-indentation-import)
+    ("where"    . haskell-indentation-toplevel-where)
     ("class"    . haskell-indentation-class-declaration)
     ("instance" . haskell-indentation-class-declaration)
     ("deriving" . haskell-indentation-deriving))
@@ -732,21 +733,32 @@ For example
   "Parse module declaration."
   (haskell-indentation-with-starter
    (lambda ()
-     (let ((current-indent (current-column)))
-       (haskell-indentation-read-next-token)
-       (when (string= current-token "(")
-         (haskell-indentation-list
-          #'haskell-indentation-module-export
-          ")" ","))
-       (when (eq current-token 'end-tokens)
-         (haskell-indentation-add-indentation current-indent)
-         (throw 'parse-end nil))
-       (when (string= current-token "where")
+     (haskell-indentation-read-next-token)
+     (when (string= current-token "(")
+       (haskell-indentation-list
+        #'haskell-indentation-module-export
+        ")" ","))
+     (if (string= current-token "where")
          (haskell-indentation-read-next-token)
-         (when (eq current-token 'end-tokens)
-           (haskell-indentation-add-layout-indent)
+
+       (when (eq current-token 'end-tokens)
+         (when (member following-token '(value no-following-token "("))
+           (haskell-indentation-add-indentation
+            (+ starter-indent haskell-indentation-starter-offset))
+           (haskell-indentation-add-indentation
+            (+ left-indent haskell-indentation-starter-offset))
            (throw 'parse-end nil))
-         (haskell-indentation-layout #'haskell-indentation-toplevel))))))
+         (haskell-indentation-add-layout-indent)
+         (throw 'parse-end nil))))))
+
+(defun haskell-indentation-toplevel-where ()
+  "Parse 'where' that we may hit as a standalone in module
+declaration."
+  (haskell-indentation-read-next-token)
+
+  (when (eq current-token 'end-tokens)
+    (haskell-indentation-add-layout-indent)
+    (throw 'parse-end nil)))
 
 (defun haskell-indentation-module-export ()
   "Parse export list."
@@ -986,7 +998,8 @@ layout starts."
                           (haskell-indentation-expression-token-p following-token))
                          (string= following-token ";")
                          (and (equal layout-indent 0)
-                              (member following-token (mapcar #'car haskell-indentation-toplevel-list))))
+                              (member following-token (mapcar #'car haskell-indentation-toplevel-list))
+                              (not (string= following-token "where"))))
                  (haskell-indentation-add-layout-indent))
                (throw 'return nil))
               (t (throw 'return nil))))))

tests/haskell-indentation-tests.el

@@ -905,7 +905,7 @@ newtype instance T Char = TC Bool"
               (3 0)
               (4 0 26))
 
-(hindent-test "52a* module simplest case two lines" "
+(hindent-test "52a module simplest case two lines" "
 module A.B
 where"
               (1 0)
@@ -917,7 +917,7 @@ module A.B where"
               (1 0)
               (2 0))
 
-(hindent-test "52c* module with exports" "
+(hindent-test "52c module with exports" "
 module A.B
   ( x
   , y
@@ -959,6 +959,29 @@ data Foo = Bar
               (2 9)
               (3 0 2 9))
 
+(hindent-test "56 module name on next line" "
+module
+  X"
+              (1 0)
+              (2 2))
+
+(hindent-test "57 module continued" "
+module X"
+              (1 0)
+              (2 2))
+
+(hindent-test "58 module where same line" "
+module X where"
+              (1 0)
+              (2 0))
+
+(hindent-test "59 module where same line" "
+module X
+   where"
+              (1 0)
+              (2 0)
+              (3 0))
+
 (ert-deftest haskell-indentation-ret-indents ()
   (with-temp-switch-to-buffer
    (haskell-mode)