Skip to content

Commit 86abd58

Browse files
committed
Merge pull request #136 from elixir-lang/expand-block-rx-def
Expand def of block operator regex to include non-newlines.
2 parents 7693331 + 2d0ff51 commit 86abd58

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

elixir-smie.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
">=" "<" ">" "&&" "||" "<>" "++" "--" "//" "/>" "=~" "|>")))
121121

122122
(defvar elixir-smie--block-operator-regexp
123-
(rx "->"))
123+
(rx "->" (0+ nonl)))
124124

125125
(defvar elixir-smie--spaces-til-eol-regexp
126126
(rx (and (1+ space) eol))

test/elixir-mode-indentation-test.el

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,7 @@ end"
497497
end
498498
end")
499499

500-
(elixir-def-indentation-test cond-comment
501-
(:expected-result :failed)
500+
(elixir-def-indentation-test cond-comment ()
502501
"
503502
def foo() do
504503
cond do
@@ -599,8 +598,7 @@ def foo do #comment
599598
end")
600599

601600
(elixir-def-indentation-test indent-single-line-match
602-
(:expected-result :failed
603-
:tags '(indentation))
601+
(:tags '(indentation))
604602
"
605603
case x do
606604
a -> b

0 commit comments

Comments
 (0)