Skip to content

Fix after dot highlighting #252

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
Sep 10, 2015
Merged

Fix after dot highlighting #252

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
a8ddf18
Add keyword highlighting after dot tests(#250)
syohex Sep 10, 2015
bda0e8f
Do not highlight keywords after dot
syohex Sep 10, 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
18 changes: 12 additions & 6 deletions elixir-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,26 +130,30 @@
(zero-or-more (any "a-z" "A-Z" "0-9" "_" "\"" "'")))
(and "\"" (one-or-more (not (any "\""))) "\"")
(and "'" (one-or-more (not (any "'"))) "'"))))
(builtin . ,(rx symbol-start
(builtin . ,(rx (or line-start (not (any ".")))
symbol-start
(or "case" "cond" "for" "if" "unless" "try" "receive"
"raise" "quote" "unquote" "unquote_splicing" "throw"
"super")
symbol-end))
(builtin-declaration . ,(rx symbol-start
(builtin-declaration . ,(rx (or line-start (not (any ".")))
symbol-start
(or "def" "defp" "defmodule" "defprotocol"
"defmacro" "defmacrop" "defdelegate"
"defexception" "defstruct" "defimpl"
"defcallback")
symbol-end))
(builtin-namespace . ,(rx symbol-start
(builtin-namespace . ,(rx (or line-start (not (any ".")))
symbol-start
(or "import" "require" "use" "alias")
symbol-end))
;; Set aside code point syntax for `elixir-negation-face'.
(code-point . ,(rx symbol-start
"?"
anything
symbol-end))
(function-declaration . ,(rx symbol-start
(function-declaration . ,(rx (or line-start (not (any ".")))
symbol-start
(or "def" "defp")
symbol-end))
;; Match `@doc' or `@moduledoc' syntax, with or without triple quotes.
Expand All @@ -162,10 +166,12 @@
(identifiers . ,(rx (one-or-more (any "A-Z" "a-z" "_"))
(zero-or-more (any "A-Z" "a-z" "0-9" "_"))
(optional (or "?" "!"))))
(keyword . ,(rx symbol-start
(keyword . ,(rx (or line-start (not (any ".")))
symbol-start
(or "fn" "do" "end" "after" "else" "rescue" "catch")
symbol-end))
(keyword-operator . ,(rx symbol-start
(keyword-operator . ,(rx (or line-start (not (any ".")))
symbol-start
(or "not" "and" "or" "when" "in")
symbol-end))
;; Module and submodule names start with upper case letter. This
Expand Down
25 changes: 25 additions & 0 deletions test/elixir-mode-font-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,31 @@ some_expr"
(should (eq (elixir-test-face-at 6) 'font-lock-variable-name-face))
(should (eq (elixir-test-face-at 12) 'font-lock-variable-name-face))))

(ert-deftest elixir-mode-syntax-table/fontify-keyword-after-dot ()
"https://github.com/elixir-lang/emacs-elixir/issues/250"
:tags '(fontification syntax-table)
(elixir-test-with-temp-buffer
"Mix.raise
raise
Mix.def foo
Mix.import
import
Mix.after
after
Mix.when
when"
(should-not (eq (elixir-test-face-at 5) 'font-lock-keyword-face))
(should (eq (elixir-test-face-at 11) 'font-lock-keyword-face))
(should-not (eq (elixir-test-face-at 21) 'font-lock-keyword-face))
(should-not (eq (elixir-test-face-at 25) 'font-lock-function-name-face))
(should-not (eq (elixir-test-face-at 33) 'font-lock-keyword-face))
(should (eq (elixir-test-face-at 40) 'font-lock-keyword-face))

(should-not (eq (elixir-test-face-at 51) 'font-lock-keyword-face))
(should (eq (elixir-test-face-at 57) 'font-lock-keyword-face))
(should-not (eq (elixir-test-face-at 67) 'font-lock-keyword-face))
(should (eq (elixir-test-face-at 72) 'font-lock-keyword-face))))

(provide 'elixir-mode-font-test)

;;; elixir-mode-font-test.el ends here