emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/jade-mode e9288f66dc 106/128: use named regexes in font-lo


From: ELPA Syncer
Subject: [nongnu] elpa/jade-mode e9288f66dc 106/128: use named regexes in font-lock-keywords list
Date: Sat, 29 Jan 2022 08:24:51 -0500 (EST)

branch: elpa/jade-mode
commit e9288f66dcca7799a15ffbbfa77572616bedc976
Author: Matthew Conway <matthew.f.conway@gmail.com>
Commit: Matthew Conway <matthew.f.conway@gmail.com>

    use named regexes in font-lock-keywords list
---
 jade-mode.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/jade-mode.el b/jade-mode.el
index 16d6fbccc7..85b1ea26ec 100644
--- a/jade-mode.el
+++ b/jade-mode.el
@@ -72,6 +72,9 @@
 (defvar jade-class-re "[.][a-zA-Z][0-9a-zA-Z_\\-]*"
   "Regexp used to match a class literal, e.g. .class, .class_name-123")
 
+(defvar jade-mixin-re "[+][a-zA-Z][0-9a-zA-Z_\\-]*"
+  "Regexp used to match a mixin name")
+
 (defvar jade-double-quote-string-re "[\"]\\(\\\\.\\|[^\"\n]\\)*[\"]"
   "Regexp used to match a double-quoted string literal")
 
@@ -84,11 +87,11 @@
 (defvar jade-font-lock-keywords
   `(
     (,jade-keywords . font-lock-keyword-face) ;; keywords
-    ("#\\(\\w\\|_\\|-\\)*" . font-lock-variable-name-face) ;; id
-    ("\\(?:^[ {2,}]*\\(?:[a-z0-9_:\\-]*\\)\\)?\\(#[A-Za-z0-9\-\_]*[^ ]\\)" 1 
font-lock-variable-name-face) ;; id
-    ("\\(?:^[ {2,}]*\\(?:[a-z0-9_:\\-]*\\)\\)?\\(\\.[A-Za-z0-9\-\_]*\\)" 1 
font-lock-type-face) ;; class name
-    ("^[ \t]*\\([a-zA-Z0-9]+\\)" 1 font-lock-function-name-face) ;; tag name
-    ("^[ \t]*\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
+    (,jade-id-re . font-lock-variable-name-face) ;; id
+    (,jade-class-re . font-lock-type-face) ;; class name
+    ("\\(-?//.*\\)" . font-lock-comment-face) ;; jade block comments
+    (,jade-tag-re . font-lock-function-name-face)
+    ;; tag name
 
     ;; remove highlighting from literal content following tag/class/id
     ;; e.g. tag Inner text



reply via email to

[Prev in Thread] Current Thread [Next in Thread]