Merge pull request #150 from elixir-lang/indent-continuation-lines-assignment

Continue of indentation in multiple line assignment.

Author: tonini

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+  * [Indentation] Continue of indentation in multiple line assignment.
   * [Indentation] Always indent with only 2 spaces except when function arguments span multiple lines.
   * [Indentation] Fix the indentation for mixed matchings.
   * [Indentation] Pipe |> indentation works correctly.

elixir-smie.el

@@ -117,7 +117,7 @@
 
 (defvar elixir-smie--operator-regexp
   (rx (or "<<<" ">>>" "^^^" "~~~" "&&&" "|||" "===" "!==" "==" "!=" "<="
-          ">=" "<" ">" "&&" "||" "<>" "++" "--" "//" "/>" "=~" "|>")))
+	  "=" ">=" "<" ">" "&&" "||" "<>" "++" "--" "//" "/>" "=~" "|>")))
 
 (defvar elixir-smie--block-operator-regexp
   (rx "->" (0+ nonl)))
@@ -283,7 +283,7 @@
 
     ;; Closing paren on the other line
     (`(:before . "(")
-     (smie-rule-parent))
+     (unless smie--parent 0))
 
     (`(:before . ";")
      (cond

test/elixir-mode-indentation-test.el

@@ -246,8 +246,7 @@ end
 ")
 
 (elixir-def-indentation-test indent-continuation-lines-assignment
-  (:expected-result :failed
-   :tags '(indentation))
+			     (:tags '(indentation))
   "
 some_var =
 some_expr
@@ -256,6 +255,22 @@ some_var =
   some_expr
 ")
 
+(elixir-def-indentation-test indent-continuation-lines-assignment/2
+			     (:tags '(indentation))
+  "
+next_fun =
+        case raw do
+ true  -> &IO.each_binstream(&1, line_or_bytes)
+      false -> &IO.each_stream(&1, line_or_bytes)
+       end
+" "
+next_fun =
+  case raw do
+    true  -> &IO.each_binstream(&1, line_or_bytes)
+    false -> &IO.each_stream(&1, line_or_bytes)
+  end
+")
+
 (elixir-def-indentation-test indent-last-commented-line
     ()
   "