Skip to content

module syntax highlighting also works correctly with & #233

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 2 commits into from
Aug 5, 2015
Merged

module syntax highlighting also works correctly with & #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a2140
remove legacy regex for syntax highlighting
tonini Aug 5, 2015
1e85220
`&` char should also be colored as part of the module
tonini Aug 5, 2015
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
16 changes: 1 addition & 15 deletions elixir-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
;; Finally, like other identifiers, it can be terminated with either `?'
;; or `!'.
(module-names . ,(rx symbol-start
(optional "%")
(optional (or "%" "&"))
(one-or-more (any "A-Z"))
(zero-or-more (any "A-Z" "a-z" "_" "0-9"))
(zero-or-more
Expand All @@ -184,24 +184,10 @@
(zero-or-more (any "A-Z" "a-z" "_" "0-9"))))
(optional (or "!" "?"))
symbol-end))
(operators1 . ,(rx symbol-start
(or "<" ">" "+" "-" "*" "/" "!" "^" "&")
symbol-end))
(operators2 . ,(rx symbol-start
(or
"==" "!=" "<=" ">=" "&&" "||" "<>" "++" "--" "|>" "=~"
"->" "<-" "|" "." "=")
symbol-end))
(operators3 . ,(rx symbol-start
(or "<<<" ">>>" "|||" "&&&" "^^^" "~~~" "===" "!==")
symbol-end))
(pseudo-var . ,(rx symbol-start
(or "_" "__MODULE__" "__DIR__" "__ENV__" "__CALLER__"
"__block__" "__aliases__")
symbol-end))
(punctuation . ,(rx symbol-start
(or "\\" "<<" ">>" "=>" "(" ")" ":" ";" "" "[" "]")
symbol-end))
(sigils . ,(rx "~" (or "B" "C" "R" "S" "b" "c" "r" "s" "w")))))

(defmacro elixir-rx (&rest sexps)
Expand Down
5 changes: 4 additions & 1 deletion test/elixir-mode-font-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ match=~r/foo/"
"defmodule Application.Behavior do
use Application.Behaviour
Stand.Alone.call
%RuntimeError{message: msg}"
%RuntimeError{message: msg}
&Enum"
(should (eq (elixir-test-face-at 1) 'font-lock-keyword-face))
(should (eq (elixir-test-face-at 11) 'font-lock-type-face))
(should (eq (elixir-test-face-at 22) 'font-lock-type-face))
Expand All @@ -61,6 +62,8 @@ match=~r/foo/"
(should (eq (elixir-test-face-at 53) 'font-lock-type-face))
(should (eq (elixir-test-face-at 68) 'font-lock-type-face))
(should (eq (elixir-test-face-at 72) 'font-lock-type-face))
(should (eq (elixir-test-face-at 114) 'font-lock-type-face))
(should (eq (elixir-test-face-at 117) 'font-lock-type-face))
;; no face for function call
(should (eq (elixir-test-face-at 79) nil))
(should (eq (elixir-test-face-at 84) 'font-lock-type-face))
Expand Down