Merge pull request #244 from edmz/true_false_nil

True,false, nil are highlighted as atoms
elixir-editors · Sep 3, 2015 · f899bc7 · f899bc7
2 parents 60aeb48 + 83cd1f1
commit f899bc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/elixir-mode.el b/elixir-mode.el
@@ -367,7 +367,7 @@ 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 (or atoms "true" "false" "nil"))
                  (zero-or-more space)
                  (optional "="))
      1 elixir-atom-face)

diff --git a/test/elixir-mode-font-test.el b/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)