Skip to content

Commit e909185

Browse files
committed
Merge pull request #316 from elixir-lang/correct-if-indention-inside-else-block
Fix indentation of if within an else block
2 parents c056282 + b56362f commit e909185

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

elixir-smie.el

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,16 @@
515515
;; ....
516516
((elixir-smie-last-line-end-with-block-operator-p)
517517
(smie-rule-parent elixir-smie-indent-basic))
518-
(t
519-
(smie-rule-parent))))
518+
;; Indent if inside else
519+
;;
520+
;; Example:
521+
;;
522+
;; else
523+
;; if condition, do: :bar <-
524+
;; end
525+
((smie-rule-parent-p "else")
526+
(smie-rule-parent elixir-smie-indent-basic))
527+
(t (smie-rule-parent))))
520528
(`(:before . "->")
521529
(cond
522530
;; Example

test/elixir-mode-indentation-test.el

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ end")
350350

351351

352352
(elixir-def-indentation-test indent-if-else/2
353-
;; https://github.com/elixir-lang/emacs-elixir/issues/288
354-
(:expected-result :failed :tags '(indentation))
353+
(:tags '(indentation))
355354
"
356355
if condition do
357356
:foo

0 commit comments

Comments
 (0)