Merge pull request #316 from elixir-lang/correct-if-indention-inside-…

…else-block Fix indentation of if within an else block
elixir-editors · Mar 24, 2016 · e909185 · e909185
2 parents c056282 + b56362f
commit e909185
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/elixir-smie.el b/elixir-smie.el
@@ -515,8 +515,16 @@
       ;;   ....
       ((elixir-smie-last-line-end-with-block-operator-p)
        (smie-rule-parent elixir-smie-indent-basic))
-      (t
-       (smie-rule-parent))))
+      ;; Indent if inside else
+      ;;
+      ;; Example:
+      ;;
+      ;; else
+      ;;   if condition, do: :bar <-
+      ;; end
+      ((smie-rule-parent-p "else")
+       (smie-rule-parent elixir-smie-indent-basic))
+      (t (smie-rule-parent))))
     (`(:before . "->")
      (cond
       ;; Example

diff --git a/test/elixir-mode-indentation-test.el b/test/elixir-mode-indentation-test.el
@@ -350,8 +350,7 @@ end")
 
 
 (elixir-def-indentation-test indent-if-else/2
-                             ;; https://github.com/elixir-lang/emacs-elixir/issues/288
-                             (:expected-result :failed :tags '(indentation))
+                             (:tags '(indentation))
   "
 if condition do
 :foo