Merge pull request #190 from elixir-lang/issue-184

correct indentation for multiclause anonymous functions

Author: mattdeboard

elixir-smie.el

@@ -291,7 +291,10 @@
      (smie-rule-parent))
     ;; Closing paren on the other line
     (`(:before . "(")
-     (smie-rule-parent))
+     (cond
+      ((smie-rule-parent-p "fn")
+       (smie-rule-parent elixir-smie-indent-basic))
+      (t (smie-rule-parent))))
     (`(:before . "[")
      (cond
       ((smie-rule-hanging-p)

test/elixir-mode-indentation-test.el

@@ -965,7 +965,6 @@ def foo(test) do
   run(test_case)
 end")
 
-;; Will pass when #180 is resolved.
 (elixir-def-indentation-test indent-after-bitstring/1
                              (:tags '(indentation))
 "
@@ -981,6 +980,29 @@ defmodule X do
   def c, do: <<3 :: size(8)>>
 end")
 
+(elixir-def-indentation-test indent-after-fn/1
+                             (:tags '(indentation))
+"
+defmodule X do
+  def func do
+    Enum.filter([1,2,3],
+      fn(1) -> true
+             (2) -> false
+  (_) -> true
+      end)
+  end
+end"
+"
+defmodule X do
+  def func do
+    Enum.filter([1,2,3],
+      fn(1) -> true
+        (2) -> false
+        (_) -> true
+      end)
+  end
+end")
+
 ;; 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