highlight "or" as keyword (#44)

nix-community · Sep 16, 2024 · 5c04f8f · 5c04f8f
1 parent 9fa9326
commit 5c04f8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/nix-ts-mode.el b/nix-ts-mode.el
@@ -98,11 +98,8 @@
        @font-lock-keyword-face))
 
      ;; "or" is technically an operator, but we fontify it as a keyword
-     ((identifier) @font-lock-keyword-face
-      (:match
-       ,(rx-to-string
-         `(seq bol "or" eol))
-       @font-lock-keyword-face)))
+     (select_expression
+      ("or" @font-lock-keyword-face)))
 
    :language 'nix
    :feature 'string

diff --git a/test/nix-ts-mode-font-lock-test.el b/test/nix-ts-mode-font-lock-test.el
@@ -79,6 +79,7 @@ let
   pkgs = {
     test = \"\";
   };
+  a = x.y or z;
 in rec {
   inherit pkgs;
   test = with pkgs; test;
@@ -87,7 +88,8 @@ in rec {
 		 ("inherit" font-lock-keyword-face)
 		 ("in" font-lock-keyword-face)
 		 ("with" font-lock-keyword-face)
-		 ("rec" font-lock-keyword-face))))
+		 ("rec" font-lock-keyword-face)
+		 ("or" font-lock-keyword-face))))
 
 
 (ert-deftest nix-ts-error ()