Merge pull request #221 from elixir-lang/issue-218

highlight atoms correctly in a pattern match

Author: tonini

elixir-mode.el

@@ -358,14 +358,6 @@ is used to limit the scan."
                  (group identifiers))
      2 font-lock-function-name-face)
 
-    ;; Variable definitions
-    (,(elixir-rx (group identifiers)
-                 (one-or-more space)
-                 "="
-                 (or (one-or-more space)
-                     (one-or-more "\n")))
-     1 font-lock-variable-name-face)
-
     ;; Sigils
     (,(elixir-rx (group sigils))
      1 font-lock-builtin-face)
@@ -429,9 +421,19 @@ is used to limit the scan."
      1 font-lock-type-face)
 
     ;; Atoms and singleton-like words like true/false/nil.
-    (,(elixir-rx (group atoms))
+    (,(elixir-rx (group atoms)
+                 (zero-or-more space)
+                 (optional "="))
      1 elixir-atom-face)
 
+    ;; Variable definitions
+    (,(elixir-rx (group identifiers)
+                 (zero-or-more space)
+                 "="
+                 (or (zero-or-more space)
+                     (one-or-more "\n")))
+     1 font-lock-variable-name-face)
+
     ;; Map keys
     (,(elixir-rx (group (and (one-or-more identifiers) ":")))
      1 elixir-atom-face)

test/elixir-mode-font-test.el

@@ -21,10 +21,12 @@ buffer."
 (ert-deftest elixir-mode-syntax-table/fontify-regex ()
   :tags '(fontification syntax-table)
   (elixir-test-with-temp-buffer
-   "match = ~r/foo/"
+   "match = ~r/foo/
+match=~r/foo/"
    (should (eq (elixir-test-face-at 1) 'font-lock-variable-name-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 18) 'font-lock-variable-name-face))
    ;; no face for regex delimiters
    (should (eq (elixir-test-face-at 15) nil))))
 
@@ -188,6 +190,13 @@ some_expr"
     (should (eq (elixir-test-face-at 19) 'font-lock-string-face))
     (should (eq (elixir-test-face-at 31) 'font-lock-string-face))))
 
+(ert-deftest elixir-mode-syntax-table/fontify-atom-in-pattern-match ()
+  :tags '(fontification atom syntax-table)
+  (elixir-test-with-temp-buffer
+   ":any = into_to_type(type)
+:another=into_to_type(type)"
+   (should (eq (elixir-test-face-at 3) 'elixir-atom-face))))
+
 (ert-deftest elixir-mode-syntax-table/fontify-assignment-with-pattern/1 ()
   :expected-result :failed
   :tags '(fontification syntax-table)