Skip to content

~s is sigil, not attribute #267

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
Oct 15, 2015
Merged

~s is sigil, not attribute #267

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
9 changes: 2 additions & 7 deletions elixir-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@
symbol-start
(or "def" "defp")
symbol-end))
;; Match `@doc' or `@moduledoc' syntax, with or without triple quotes.
(heredocs . ,(rx symbol-start
(or "@doc" "@moduledoc" "~s")
symbol-end))
;; The first character of an identifier must be a letter or an underscore.
;; After that, they may contain any alphanumeric character + underscore.
;; Additionally, the final character may be either `?' or `!'.
Expand Down Expand Up @@ -317,9 +313,8 @@ is used to limit the scan."
(elixir-match-interpolation 0 font-lock-variable-name-face t)

;; Module attributes
(,(elixir-rx (group (or heredocs
(and "@" (1+ identifiers)))))
1 elixir-attribute-face)
(,(elixir-rx (and "@" (1+ identifiers)))
0 elixir-attribute-face)

;; Keywords
(,(elixir-rx (group (or builtin builtin-declaration builtin-namespace
Expand Down
7 changes: 4 additions & 3 deletions test/elixir-mode-font-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ match=~r/foo/"
(elixir-test-with-temp-buffer
"asdfg = ~s{Capitalized noncapitalized}"
(should (eq (elixir-test-face-at 1) 'font-lock-variable-name-face))
(should (eq (elixir-test-face-at 9) 'elixir-attribute-face))
(should (eq (elixir-test-face-at 9) 'font-lock-builtin-face))
(should (eq (elixir-test-face-at 12) 'font-lock-string-face))
(should (eq (elixir-test-face-at 26) 'font-lock-string-face))
;; no face for regex delimiters
Expand Down Expand Up @@ -159,8 +159,8 @@ end"
:tags '(fontification heredoc syntax-table)
(elixir-test-with-temp-buffer
"~s\"\"\""
(should (eq (elixir-test-face-at 1) 'elixir-attribute-face))
(should (eq (elixir-test-face-at 2) 'elixir-attribute-face))
(should (eq (elixir-test-face-at 1) 'font-lock-builtin-face))
(should (eq (elixir-test-face-at 2) 'font-lock-builtin-face))
(should (eq (elixir-test-face-at 3) 'font-lock-string-face))))

(ert-deftest elixir-mode-syntax-table/fontify-atoms ()
Expand Down Expand Up @@ -329,6 +329,7 @@ foo
(should-not (eq (elixir-test-face-at 23) 'font-lock-string-face))

(should-not (eq (elixir-test-face-at 25) 'font-lock-string-face)) ; ~s()
(should (eq (elixir-test-face-at 25) 'font-lock-builtin-face)) ; ~s()
(should-not (eq (elixir-test-face-at 29) 'font-lock-string-face))

(should-not (eq (elixir-test-face-at 31) 'font-lock-string-face)) ; ~r[]
Expand Down