branch: elpa/nix-mode
commit 65d0b6471ff42305d64c36f994647c322f926129
Author: Matthew Bauer <[email protected]>
Commit: Matthew Bauer <[email protected]>
Add more font lock constants.
---
nix-mode.el | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index fce22ed70e..4c06319404 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -61,22 +61,21 @@
(defconst nix-re-url
"[a-zA-Z][a-zA-Z0-9\\+-\\.]*:[a-zA-Z0-9%/\\?:@&=\\+\\$,_\\.!~\\*'-]+")
+(defconst nix-re-bracket-path
+ "<[a-zA-Z0-9._\\+-]+\\(/[a-zA-Z0-9._\\+-]+\\)*>")
+
+(defconst nix-re-variable-assign
+ "\\<\\([a-zA-Z_][a-zA-Z0-9_'\-\.]*\\)[ \t]*=")
+
(defconst nix-font-lock-keywords
`(
(,(regexp-opt nix-keywords 'symbols) . font-lock-keyword-face)
-
(,(regexp-opt nix-warning-keywords 'symbols) . font-lock-warning-face)
-
(,(regexp-opt nix-builtins 'symbols) . font-lock-builtin-face)
-
(,nix-re-url . font-lock-constant-face)
(,nix-re-file-path . font-lock-constant-face)
-
- ("\\<\\([a-zA-Z_][a-zA-Z0-9_'\-\.]*\\)[ \t]*="
- (1 font-lock-variable-name-face nil nil))
- ("<[a-zA-Z0-9._\\+-]+\\(/[a-zA-Z0-9._\\+-]+\\)*>"
- . font-lock-constant-face)
-
+ (,nix-re-variable-assign 1 font-lock-variable-name-face)
+ (,nix-re-bracket-path . font-lock-constant-face)
(nix-syntax-match-antiquote 0 font-lock-preprocessor-face t))
"Font lock keywords for nix.")
