branch: elpa/nix-mode
commit aee3dea8ecb1c38f2fe6dd266b02e2cb6e60652f
Author: Matthew Bauer <[email protected]>
Commit: Matthew Bauer <[email protected]>
Refactor font lock
---
nix-mode.el | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index 4015f0c9ed..5d432d5a64 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -58,6 +58,9 @@
(defconst nix-re-file-path
"[a-zA-Z0-9._\\+-]*\\(/[a-zA-Z0-9._\\+-]+\\)+")
+(defconst nix-re-url
+ "[a-zA-Z][a-zA-Z0-9\\+-\\.]*:[a-zA-Z0-9%/\\?:@&=\\+\\$,_\\.!~\\*'-]+")
+
(defconst nix-font-lock-keywords
`(
(,(regexp-opt nix-keywords 'symbols) . font-lock-keyword-face)
@@ -66,14 +69,14 @@
(,(regexp-opt nix-builtins 'symbols) . font-lock-builtin-face)
- ("[a-zA-Z][a-zA-Z0-9\\+-\\.]*:[a-zA-Z0-9%/\\?:@&=\\+\\$,_\\.!~\\*'-]+"
- . font-lock-constant-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-file-path
- . font-lock-constant-face)
+
(nix-syntax-match-antiquote 0 font-lock-preprocessor-face t)
)
"Font lock keywords for nix.")
