Skip to content

Commit

Permalink
Indent by one level if current line belongs to function call
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonini
tonini committed Apr 14, 2016
1 parent 230b0dc commit 94bfd8e
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 51 deletions.
114 changes: 92 additions & 22 deletions elixir-smie.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
(rassoc next smie-closer-alist))))
(smie-indent-calculate))))))))

(defun elixir-smie-looking-around (back at)
"Check if looking backwards at BACK and forward at AT."
(and (looking-at-p at) (looking-back back)))

;; Declare variable that we need from the smie package
(defvar smie--parent)

Expand Down Expand Up @@ -271,7 +275,9 @@
;; the beginning of a new line. Keep that in mind.
(if (elixir-smie--semi-ends-match)
"MATCH-STATEMENT-DELIMITER"
";"))
(if (and (looking-at ".+,$")
(not (> (nth 0 (syntax-ppss)) 0)))
"COMMA"";")))
((looking-at elixir-smie--block-operator-regexp)
(goto-char (match-end 0))
"->")
Expand All @@ -296,7 +302,10 @@
(elixir-smie--implicit-semi-p))
(if (elixir-smie--semi-ends-match)
"MATCH-STATEMENT-DELIMITER"
";"))
(if (and (looking-back ",$" (- (point) 2) t)
(not (> (nth 0 (syntax-ppss)) 0)))
"COMMA"
";")))
((looking-back elixir-smie--oneline-def-operator-regexp (- (point) 3) t)
(goto-char (match-beginning 0))
";")
Expand Down Expand Up @@ -330,6 +339,29 @@
-4)
(`(:elem . args)
-4)
(`(:before . "COMMA")
(cond
((and (smie-rule-parent-p ";")
(smie-rule-hanging-p))
(smie-rule-parent (- elixir-smie-indent-basic)))
((smie-rule-parent-p "(")
(smie-rule-parent))
((smie-rule-parent-p "->")
(smie-rule-parent (- elixir-smie-indent-basic)))))
(`(:after . "COMMA")
(cond
((and (smie-rule-parent-p ";")
(smie-rule-hanging-p))
(smie-rule-parent elixir-smie-indent-basic))
((and (smie-rule-parent-p "{")
(smie-rule-hanging-p))
(smie-rule-parent elixir-smie-indent-basic))
((and (smie-rule-parent-p "[")
(smie-rule-hanging-p))
0)
((smie-rule-parent-p "->")
(smie-rule-parent elixir-smie-indent-basic))
(t (smie-rule-parent elixir-smie-indent-basic))))
(`(:before . "OP")
(cond
((and (not (smie-rule-hanging-p))
Expand All @@ -341,38 +373,37 @@
(cons 'column (elixir-smie--previous-line-indentation)))
((and (not (smie-rule-hanging-p))
(smie-rule-prev-p "OP"))
-2)
(- elixir-smie-indent-basic))
((smie-rule-parent-p "def" "defp" "defmacro" "defmacrop")
(smie-rule-parent))
(t (smie-rule-parent))))
(`(:before . "def")
(cond
(t
(smie-rule-parent))))
(t (smie-rule-parent))))
(`(:before . "defp")
(cond
(t
(smie-rule-parent))))
(t (smie-rule-parent))))
(`(:before . "defmacro")
(cond
(t
(smie-rule-parent))))
(t (smie-rule-parent))))
(`(:before . "defmacrop")
(cond
(t
(smie-rule-parent))))
(t (smie-rule-parent))))
(`(:after . "OP")
(cond
((smie-rule-sibling-p) nil)
((smie-rule-hanging-p) (smie-rule-parent elixir-smie-indent-basic))
((smie-rule-hanging-p)
(smie-rule-parent elixir-smie-indent-basic))
((and (not (smie-rule-sibling-p))
(not (smie-rule-hanging-p))
(smie-rule-parent-p "do:"))
;; Dedent the line after an OP if it's after a "do:" token, which implies
;; a one-line function.
(smie-rule-parent
(- (+ elixir-smie-indent-basic elixir-smie-indent-basic))))
(t (smie-rule-parent))))
((smie-rule-parent-p ";")
(smie-rule-parent ))
(t (smie-rule-parent (- elixir-smie-indent-basic)))))
(`(:before . "MATCH-STATEMENT-DELIMITER")
(cond
((and (smie-rule-parent-p "do")
Expand Down Expand Up @@ -426,7 +457,11 @@
(t
(smie-rule-parent))))
(`(:before . "fn")
(smie-rule-parent))
(cond
((smie-rule-parent-p "(")
(smie-rule-parent))
(t (smie-rule-parent))
))
(`(:before . "for")
(cond
((elixir-smie-last-line-end-with-block-operator-p)
Expand All @@ -438,7 +473,7 @@
(smie-rule-parent))
((and (smie-rule-parent-p ";")
(not (smie-rule-hanging-p)))
(smie-rule-parent))
(smie-rule-parent elixir-smie-indent-basic))
;; Example
;;
;; hi = for i <- list, do: i
Expand Down Expand Up @@ -476,7 +511,15 @@
(smie-rule-parent elixir-smie-indent-basic))
(t elixir-smie-indent-basic)))
(`(:before . "end")
(smie-rule-parent))
(cond
((smie-rule-parent-p "(")
(smie-rule-parent))
(t (smie-rule-parent))))
(`(:before . "else:")
(cond
((smie-rule-parent-p ";")
(smie-rule-parent))
(t (smie-rule-parent))))
;; Closing paren on the other line
(`(:before . "(")
(cond
Expand All @@ -491,13 +534,19 @@
;; .....
((smie-rule-parent-p "do")
(smie-rule-parent))
((smie-rule-parent-p "OP")
(smie-rule-parent))
((smie-rule-parent-p ";")
(smie-rule-parent))
(t (smie-rule-parent))))
(`(:before . "[")
(cond
((smie-rule-hanging-p)
(smie-rule-parent))))
(`(:before . "{")
(cond
((smie-rule-parent-p "COMMA")
(smie-rule-parent))
;; Example
;;
;; case parse do
Expand All @@ -523,7 +572,7 @@
(if (elixir-smie-last-line-end-with-block-operator-p)
(smie-rule-parent elixir-smie-indent-basic)
(if (elixir-smie-last-line-start-with-block-operator-p)
(smie-rule-parent -2)
(smie-rule-parent (- elixir-smie-indent-basic))
(smie-rule-parent))))
((and (smie-rule-parent-p "OP")
(smie-rule-hanging-p))
Expand All @@ -536,14 +585,14 @@
(if (save-excursion
(move-end-of-line 1)
(looking-back elixir-smie--block-operator-regexp (- (point) 3) t))
(smie-rule-parent -2)
(smie-rule-parent (- elixir-smie-indent-basic))
elixir-smie-indent-basic))
((smie-rule-parent-p ";")
(if (save-excursion
(move-end-of-line 1)
(looking-back elixir-smie--block-operator-regexp (- (point) 3) t))
(smie-rule-parent -2)
elixir-smie-indent-basic))
(smie-rule-parent (- elixir-smie-indent-basic))
(smie-rule-parent)))
(t (smie-rule-parent elixir-smie-indent-basic))))
(`(:after . "{")
(cond
Expand Down Expand Up @@ -680,9 +729,11 @@
((and (smie-rule-parent-p "else")
(smie-rule-hanging-p))
(smie-rule-parent elixir-smie-indent-basic))
((smie-rule-parent-p "after" "catch" "def" "defmodule" "defp" "do" "else"
((smie-rule-parent-p "catch" "def" "defmodule" "defp" "do" "else"
"fn" "if" "rescue" "try" "unless" "defmacro" "defmacrop")
(smie-rule-parent))
((smie-rule-parent-p "after")
(smie-rule-parent elixir-smie-indent-basic))
;; Example
;;
;; case parse do
Expand All @@ -702,7 +753,26 @@
(smie-rule-hanging-p)
(elixir-smie-line-starts-with-do-colon-p))
(smie-rule-parent (- elixir-smie-indent-basic)))

((and (smie-rule-parent-p ";")
(smie-rule-hanging-p)
(save-excursion
(forward-line 1)
(looking-at "*.do:.*")))
(smie-rule-parent (- elixir-smie-indent-basic)))
((and (smie-rule-parent-p ";")
(save-excursion
(forward-line -1)
(move-end-of-line 1)
(looking-back ",$"))
(not (smie-rule-hanging-p)))
(smie-rule-parent elixir-smie-indent-basic))
((and (smie-rule-parent-p ";")
(smie-rule-hanging-p))
(if (save-excursion
(forward-line 1)
(looking-at "^.+do:.+$"))
(cons 'column elixir-smie-indent-basic)
(smie-rule-parent)))
((elixir-smie-current-line-start-with-pipe-operator-p)
(smie-rule-parent))
((smie-rule-parent-p "(")
Expand Down
60 changes: 31 additions & 29 deletions test/elixir-mode-indentation-test.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ end")

(elixir-def-indentation-test cond-comment
(:tags '(indentation))
"
"
def foo() do
cond do
yadda ->
Expand All @@ -658,7 +658,7 @@ badda -> # comment throws this off
end
end
"
"
"
def foo() do
cond do
yadda ->
Expand Down Expand Up @@ -822,12 +822,12 @@ end")

(elixir-def-indentation-test indent-inside-parens
(:tags '(indentation))
"
"
x = do_something(
:foo,
:bar
)"
"
"
x = do_something(
:foo,
:bar
Expand Down Expand Up @@ -874,17 +874,15 @@ end")

(elixir-def-indentation-test indent-inside-parens/5
(:tags '(indentation))
"
defmodule IndentPlayground do
"defmodule IndentPlayground do
def my_func(arr) do
Enum.map(arr, fn(x) ->
x * 2
end)
#back here
end
end"
"
defmodule IndentPlayground do
"defmodule IndentPlayground do
def my_func(arr) do
Enum.map(arr, fn(x) ->
x * 2
Expand Down Expand Up @@ -1145,19 +1143,23 @@ end")
(elixir-def-indentation-test indent-correct-with-multiple-one-line-macro-calls
(:tags '(indentation))
"
mymacro x1, do: [:x1]
defmodule MyMacros do
mymacro x1, do: [:x1]
mymacro x2, do: [:x2]
mymacro x3, do: [:x3]
mymacro x1, do: [:x1]
mymacro x2, do: [:x2]
mymacro x3, do: [:x3]
mymacro x1, do: [:x1]
mymacro x2, do: [:x2]
mymacro x3, do: [:x3]"
end"
"
mymacro x1, do: [:x1]
mymacro x2, do: [:x2]
mymacro x3, do: [:x3]
mymacro x1, do: [:x1]
mymacro x2, do: [:x2]
mymacro x3, do: [:x3]")
defmodule MyMacros do
mymacro x1, do: [:x1]
mymacro x2, do: [:x2]
mymacro x3, do: [:x3]
mymacro x1, do: [:x1]
mymacro x2, do: [:x2]
mymacro x3, do: [:x3]
end")

(elixir-def-indentation-test indent-binary-sequence
(:tags '(indentation))
Expand Down Expand Up @@ -1205,20 +1207,20 @@ end"
case asd do
<<c1::5, c2::5, c3::5, c4::5, c5::5, c6::5, c7::2>> ->
<<main::binary,
enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
enc.(c5)::8, enc.(c6)::8, enc.(bsl(c7, 3))::8, ?=>>
enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
enc.(c5)::8, enc.(c6)::8, enc.(bsl(c7, 3))::8, ?=>>
<<c1::5, c2::5, c3::5, c4::5, c5::4>> ->
<<main::binary,
enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
enc.(bsl(c5, 1))::8, ?=, ?=, ?=>>
enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
enc.(bsl(c5, 1))::8, ?=, ?=, ?=>>
<<c1::5, c2::5, c3::5, c4::1>> ->
<<main::binary,
enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(bsl(c4, 4))::8,
?=, ?=, ?=, ?=>>
enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(bsl(c4, 4))::8,
?=, ?=, ?=, ?=>>
<<c1::5, c2::3>> ->
<<main::binary,
enc.(c1)::8, enc.(bsl(c2, 2))::8, ?=, ?=,
?=, ?=, ?=, ?=>>
enc.(c1)::8, enc.(bsl(c2, 2))::8, ?=, ?=,
?=, ?=, ?=, ?=>>
<<>> ->
main
end")
Expand Down Expand Up @@ -1718,7 +1720,7 @@ hi =
")

(elixir-def-indentation-test indent-multiline-for
(:expected-result :failed :tags '(indentation))
(:tags '(indentation))
"
for {k, v} <- keyword,
v = process_value(v),
Expand Down Expand Up @@ -1788,7 +1790,7 @@ result =
")

(elixir-def-indentation-test indent-multiline-function-calls-without-parenthesis
(:expected-result :failed :tags '(indentation))
(:tags '(indentation))
"
some_method :arg1,
:arg2
Expand All @@ -1801,7 +1803,7 @@ other_method
")

(elixir-def-indentation-test indent-multiline-function-calls-without-parenthesis/2
(:expected-result :failed :tags '(indentation))
(:tags '(indentation))
"
some_method :arg1,
arg1: 1,
Expand Down

0 comments on commit 94bfd8e

Please sign in to comment.