Merge pull request #327 from elixir-lang/indent-maps-inside-list-correct

Correct indentation of maps inside lists

Author: tonini

elixir-smie.el

@@ -527,7 +527,10 @@
            (smie-rule-parent))))
       ((and (smie-rule-parent-p "OP")
             (smie-rule-hanging-p))
-       (smie-rule-parent))))
+       (smie-rule-parent))
+      ((smie-rule-parent-p "[")
+       (smie-rule-parent))
+      ))
     (`(:after . "{")
      (cond
       ((smie-rule-hanging-p)

test/elixir-mode-indentation-test.el

@@ -1834,6 +1834,41 @@ cond do
 end
 ")
 
+(elixir-def-indentation-test indent-maps-inside-list
+                             (:tags '(indentation))
+"
+[
+%{
+ name: \"John Doe\",
+  email: \"[email protected]\"
+},
+%{
+        name: \"Jane Doe\",
+email: \"[email protected]\",
+},
+%{
+  name: \"Josie Doe\",
+    email: \"[email protected]\",
+  },
+]
+"
+"
+[
+  %{
+    name: \"John Doe\",
+    email: \"[email protected]\"
+  },
+  %{
+    name: \"Jane Doe\",
+    email: \"[email protected]\",
+  },
+  %{
+    name: \"Josie Doe\",
+    email: \"[email protected]\",
+  },
+]
+")
+
 ;; 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