Skip to content

Correct indentation after a one line 'fn' definition #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2016
Merged

Correct indentation after a one line 'fn' definition #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions elixir-smie.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,13 @@
((and (smie-rule-parent-p "after")
(smie-rule-hanging-p))
(smie-rule-parent elixir-smie-indent-basic))
;; Correct indentation after a one-line fn definition
;; Example:
;;
;; sum = Enum.reduce(dbms, fn(x, sum) -> x + sum end)
;; average_dbm = sum / length(addresses)
((smie-rule-parent-p "fn")
(smie-rule-parent elixir-smie-indent-basic))
(t
(smie-rule-parent))))
(`(:before . "fn")
Expand Down
15 changes: 15 additions & 0 deletions test/elixir-mode-indentation-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,6 +1688,21 @@ some_method :arg1,
other_method
")

(elixir-def-indentation-test indent-correct-inside-fn-block
(:tags '(indentation))
"
Enum.map(addresses, fn({mac_address, dbms}) ->
sum = Enum.reduce(dbms, fn(x, sum) -> x + sum end)
average_dbm = sum / length(addresses)
end)
"
"
Enum.map(addresses, fn({mac_address, dbms}) ->
sum = Enum.reduce(dbms, fn(x, sum) -> x + sum end)
average_dbm = sum / length(addresses)
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
Expand Down