Merge pull request #151 from elixir-lang/indent-block-inside-fn-match

Indent block inside a fn match

Author: tonini

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## v2.2.0-dev (unreleased)
 
+### Enhancements
+
+  * [Indentation] Indent block inside a fn match.
+
 ## v2.1.0 - 2014/12/23
 
 ### Enhancements

elixir-smie.el

@@ -291,7 +291,8 @@
        (if (and smie--parent (elixir-smie--same-line-as-parent
                               (nth 1 smie--parent)
                               (point)))
-           (smie-rule-parent elixir-smie-indent-basic)))
+           (smie-rule-parent elixir-smie-indent-basic)
+	 elixir-smie-indent-basic))
       ;; Otherwise, if just indent by two.
       ((smie-rule-hanging-p)
        (cond

test/elixir-mode-indentation-test.el

@@ -412,6 +412,30 @@ rescue
 end
 ")
 
+(elixir-def-indentation-test indent-block-inside-fn-match ()
+"
+defp into(stream, device, raw) do
+ fn
+   :ok, {:cont, x} ->
+  case raw do
+true  -> IO.binwrite(device, x)
+false -> IO.write(device, x)
+end
+:ok, _ -> stream
+end
+end"
+"
+defp into(stream, device, raw) do
+  fn
+    :ok, {:cont, x} ->
+      case raw do
+        true  -> IO.binwrite(device, x)
+        false -> IO.write(device, x)
+      end
+    :ok, _ -> stream
+  end
+end")
+
 (elixir-def-indentation-test indent-fn-in-assignment ()
   "
 f = fn x, y ->