Merge pull request #337 from elixir-lang/fix-before-comma-indent

Fix indentation issue after COMMA token

Author: tonini

elixir-smie.el

@@ -285,10 +285,11 @@
    ((looking-at elixir-smie--operator-regexp)
     (goto-char (match-end 0))
     "OP")
-   (t (let ((token (smie-default-forward-token)))
-        (unless (or (elixir-smie-empty-string-p token)
-                    (elixir-smie--at-dot-call))
-          token)))))
+   (t
+    (let ((token (smie-default-forward-token)))
+      (unless (or (elixir-smie-empty-string-p token)
+		  (elixir-smie--at-dot-call))
+	token)))))
 
 (defun elixir-smie--at-dot-call ()
   (and (eq ?w (char-syntax (following-char)))
@@ -346,7 +347,7 @@
      (cond
       ((and (smie-rule-parent-p ";")
             (smie-rule-hanging-p))
-       (smie-rule-parent (- elixir-smie-indent-basic)))
+       (smie-rule-parent))
       ((smie-rule-parent-p "(")
        (smie-rule-parent))
       ((smie-rule-parent-p "->")

test/elixir-mode-indentation-test.el

@@ -1947,6 +1947,25 @@ defmodule Test do
 end
 ")
 
+(elixir-def-indentation-test indent-before-comma
+                             (:tags '(indentation))
+"
+defmodule TestIndentation do
+import Enum
+
+@att %{ab: 21,
+   de: 22}
+                  IO.inspect @att
+end"
+"
+defmodule TestIndentation do
+  import Enum
+
+  @att %{ab: 21,
+         de: 22}
+  IO.inspect @att
+end")
+
 ;; We don't want automatic whitespace cleanup here because of the significant
 ;; whitespace after `Record' above. By setting `whitespace-action' to nil,
 ;; `whitespace-mode' won't automatically clean up trailing whitespace (in my