true, false and nil are highlighted as atoms

Author: edmz

elixir-mode.el

@@ -123,7 +123,6 @@
                                 (* ?\\ ?\\)
                                 ;; Match single or triple quotes of any kind.
                                 (group (or "\"" "\"\"\"" "'" "'''")))))
-      (true-false-nil . ,(rx (or "true" "false" "nil")))
       (atoms . ,(rx ":"
                     (or
                      (and
@@ -367,14 +366,8 @@ is used to limit the scan."
     (,(elixir-rx (group module-names))
      1 font-lock-type-face)
 
-    ;; True, false, nil
-    (,(elixir-rx (group true-false-nil)
-                 (zero-or-more space)
-                 (optional "="))
-     1 elixir-atom-face)
-    
     ;; Atoms and singleton-like words like true/false/nil.
-    (,(elixir-rx (group atoms)
+    (,(elixir-rx (group (or atoms "true" "false" "nil"))
                  (zero-or-more space)
                  (optional "="))
      1 elixir-atom-face)

test/elixir-mode-font-test.el

@@ -169,14 +169,21 @@ end"
       ":oriole
 :andale
 :ms2pid
-:CapitalizedAtom"
+:CapitalizedAtom
+true
+false
+nil
+"
     (should (eq (elixir-test-face-at 3) 'elixir-atom-face))
     (should (eq (elixir-test-face-at 5) 'elixir-atom-face))
     (should (eq (elixir-test-face-at 10) 'elixir-atom-face))
     (should (eq (elixir-test-face-at 13) 'elixir-atom-face))
     (should (eq (elixir-test-face-at 18) 'elixir-atom-face))
     (should (eq (elixir-test-face-at 23) 'elixir-atom-face))
-    (should (eq (elixir-test-face-at 26) 'elixir-atom-face))))
+    (should (eq (elixir-test-face-at 26) 'elixir-atom-face))
+    (should (eq (elixir-test-face-at 43) 'elixir-atom-face))
+    (should (eq (elixir-test-face-at 48) 'elixir-atom-face))
+    (should (eq (elixir-test-face-at 54) 'elixir-atom-face))))
 
 (ert-deftest elixir-mode-syntax-table/fontify-map-keys ()
   :tags '(fontification map syntax-table)