Merge pull request #61 from elixir-lang/fix-indents-after-newlines

Remove "=" & left-assoc opers from "OP" regex. Fixes #18.

Author: mattdeboard

elixir-smie.el

@@ -84,7 +84,6 @@
                                  "===" "!=="                                                      ; comp3
                                  "==" "!=" "<=" ">="                                              ; comp2
                                  "<" ">"                                                          ; comp1
-                                 "+" "-" "*" "/" "=" "|" "!" "^" "@"                              ; op1
                                  "&&" "||" "<>" "++" "--" "**" "//" "::" "<-"  ".." "/>" "=~"     ; op2 (minus ->)
                                  "xor" "|>"                                                       ; http://elixir-lang.org/docs/stable/Kernel.html
                                  )
@@ -320,7 +319,7 @@ Return non-nil if any line breaks were skipped."
     (`(:after . "end") 0)
     (`(:after . ,(or `"do"))
      elixir-smie-indent-basic)
-    (`(:list-intro . ,(or `"do")) t)))
+    (`(:list-intro . ,(or `"do" `";")) t)))
 
 (define-minor-mode elixir-smie-mode
   "SMIE-based indentation and syntax for Elixir"

test/elixir-mode-indentation-tests.el

@@ -126,20 +126,23 @@ defmodule FooBar do
 end")
 
 (elixir-def-indentation-test indents-after-empty-line
-    (:expected-result :failed) ; #18
+    ()
   "
+def foo do
 a = 2
 
-  b = a + 3
+b = a + 3
 
-    c = a + b"
+c = a * b
+end"
   "
-a = 2
-
-b = a + 3
+def foo do
+  a = 2
 
-c = a + b")
+  b = a + 3
 
+  c = a * b
+end")
 
 (elixir-def-indentation-test indents-function-calls-without-parens ()
   "