Merge pull request #161 from elixir-lang/indent-inside-square-brackets

Indent inside square brackets

Author: tonini

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+  * [Indentation] Indent listing inside square brackets. (#160)
   * [Indentation] Ident correct after a binary sequence `<<1,2,3,4>>`.
   * [Indentation] Indent correct after oneline `def ... do:` function
   * [Indentation] Correct behavior after last line in buffer. (#145)

elixir-smie.el

@@ -281,6 +281,14 @@
     ;; Closing paren on the other line
     (`(:before . "(")
      (smie-rule-parent))
+    (`(:before . "[")
+     (cond
+      ((smie-rule-hanging-p)
+       (smie-rule-parent))))
+    (`(:after . "[")
+     (cond
+      ((smie-rule-hanging-p)
+       (smie-rule-parent elixir-smie-indent-basic))))
     (`(:before . "->")
      (cond
       ((smie-rule-hanging-p)

test/elixir-mode-indentation-test.el

@@ -914,6 +914,19 @@ case asd do
     main
 end")
 
+(elixir-def-indentation-test indent-inside-square-brackets
+			     (:tags '(indentation))
+"
+children = [
+        supervisor(Task.Supervisor, [[name: KVServer.TaskSupervisor]]),
+worker(Task, [KVServer, :accept, [4040]])
+]"
+
+"
+children = [
+  supervisor(Task.Supervisor, [[name: KVServer.TaskSupervisor]]),
+  worker(Task, [KVServer, :accept, [4040]])
+]")
 
 ;; We don't want automatic whitespace cleanup here because of the significant
 ;; whitespace after `Record' above. By setting `whitespace-action' to nil,