Fix case of atoms inside lists

tonini · tonini · commit 597818c668e0 · 2016-04-13T11:07:05.000+02:00
diff --git a/elixir-smie.el b/elixir-smie.el
@@ -330,6 +330,9 @@
      -4)
     (`(:elem . args)
      -4)
+    (`(:close-all . "}")
+     (smie-rule-parent -222)
+     )
     (`(:before . "OP")
      (cond
       ((and (not (smie-rule-hanging-p))
@@ -529,7 +532,9 @@
             (smie-rule-hanging-p))
        (smie-rule-parent))
       ((smie-rule-parent-p "[")
-       (smie-rule-parent))
+       (if (nth 0 smie--parent)
+           (smie-rule-parent elixir-smie-indent-basic)
+         (smie-rule-parent)))
       ((smie-rule-parent-p "->")
        (if (save-excursion
              (move-end-of-line 1)
diff --git a/test/elixir-mode-indentation-test.el b/test/elixir-mode-indentation-test.el
@@ -1835,6 +1835,12 @@ end
 (elixir-def-indentation-test indent-maps-inside-list
                              (:tags '(indentation))
 "
+[
+{1, 2, 3},
+{4, 5, 6},
+    {7, 8, 9}
+]
+
 [
 %{
  name: \"John Doe\",
@@ -1851,6 +1857,12 @@ email: \"jane@doe.org\",
 ]
 "
 "
+[
+  {1, 2, 3},
+  {4, 5, 6},
+  {7, 8, 9}
+]
+
 [
   %{
     name: \"John Doe\",

Original file line number	Diff line number	Diff line change
`@@ -1835,6 +1835,12 @@ end`
`1835`	`1835`	`(elixir-def-indentation-test indent-maps-inside-list`
`1836`	`1836`	`(:tags '(indentation))`
`1837`	`1837`	`"`
	`1838`	`+[`
	`1839`	`+{1, 2, 3},`
	`1840`	`+{4, 5, 6},`
	`1841`	`+ {7, 8, 9}`
	`1842`	`+]`
	`1843`	`+`
`1838`	`1844`	`[`
`1839`	`1845`	`%{`
`1840`	`1846`	`name: \"John Doe\",`
`@@ -1851,6 +1857,12 @@ email: \"jane@doe.org\",`
`1851`	`1857`	`]`
`1852`	`1858`	`"`
`1853`	`1859`	`"`
	`1860`	`+[`
	`1861`	`+ {1, 2, 3},`
	`1862`	`+ {4, 5, 6},`
	`1863`	`+ {7, 8, 9}`
	`1864`	`+]`
	`1865`	`+`
`1854`	`1866`	`[`
`1855`	`1867`	`%{`
`1856`	`1868`	`name: \"John Doe\",`