branch: elpa/jade-mode
commit 97e1db63be9d66a09c05a4b63c84e70f3f7eac60
Author: Travis Jefferson <[email protected]>
Commit: Travis Jefferson <[email protected]>
fix error while fontifying pipe regions
- the tag regexp was the culprit who broke the jit-function call
- also fix my usage of \\t to match tab (turns out it's just \t)
- annnnd kinda hard to see in the diff but no need to use the
in-list eval notation for regexps like this -> ,"string", so
remove that!
---
jade-mode.el | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/jade-mode.el b/jade-mode.el
index b43b2ddb0c..a7a9af9518 100644
--- a/jade-mode.el
+++ b/jade-mode.el
@@ -81,13 +81,13 @@
(defvar jade-font-lock-keywords
`(
- (,"!!!\\|doctype\\( ?[A-Za-z0-9\-\_]*\\)?" 0 font-lock-comment-face) ;;
doctype
+ ("!!!\\|doctype\\( ?[A-Za-z0-9\-\_]*\\)?" 0 font-lock-comment-face) ;;
doctype
(,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
- (,"^[ {2,}]*[a-z0-9_:\\-]*" 0 font-lock-function-name-face) ;; tag name
- (,"^\\s-*\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
+ ("#\\(\\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
+ ("^\\s-*\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
;; remove highlighting from literal content following tag/class/id
;; e.g. tag Inner text
@@ -111,11 +111,7 @@
;; remove highlighting from lines opening with a pipe `|'
;; e.g. | keywords like for should not be highlighted here
;; | I'm not supposed to highlight single quotes either
- (,(concat "^\\s-*"
- "\\("
- "|"
- ".*"
- "\\)") 1 nil t)
+ (,(concat "^[ \t]*" "\\(" "|.*" "\\)") 1 nil t)
;; we abuse font-lock a bit here; these functions inject js-mode
;; highlighting under the guise of matching text for more standard
@@ -127,17 +123,16 @@
"Search for a tag declaration (up to LIMIT) which contains a paren
block, then highlight the region between the parentheses as
javascript."
- (when (re-search-forward (concat "^\\s-*" jade-tag-declaration-char-re "+"
"(") limit t)
+ (when (re-search-forward (concat "^[ \t]*" jade-tag-declaration-char-re "+"
"(") limit t)
(forward-char -1)
(let ((start (point))
(end (progn
- (forward-sexp)
- (1- (point)))))
- (jade-fontify-region-as-js start end)
- (forward-char -1)
+ (forward-sexp)
+ (1- (point)))))
+ (jade-fontify-region-as-js start end))
;; return some empty match data to appease the font-lock gods
- (looking-at "\\(\\)"))))
+ (looking-at "\\(\\)")))
(defun jade-highlight-js-after-tag (limit)
"Search for a valid js block, then highlight its contents with js-mode
syntax highlighting"
@@ -180,6 +175,7 @@ declaration"
(let ((table (make-syntax-table)))
(modify-syntax-entry ?\" "\"" table)
(modify-syntax-entry ?\' "\"" table)
+ (modify-syntax-entry ?_ "w" table)
table)
"Syntax table for `jade-mode'.")
