branch: elpa/jade-mode
commit ce2400711d1d46122cefd2c954e2df8c870188d3
Author: Matthew Conway <[email protected]>
Commit: Matthew Conway <[email protected]>
get mixin parameters to highlight correctly
---
example.jade | 1 +
jade-mode.el | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/example.jade b/example.jade
index a19782edd7..1795a304e0 100644
--- a/example.jade
+++ b/example.jade
@@ -28,6 +28,7 @@ html(lang="en", class = ['classOne', 'classTwo'].join(','))
span this one shouldn't higlight strings or... .other #things if else
| this one shouldn't highlight strings, and the same goes for
.keywords #ok ?
div#paren.content.example(style = 'float: left;') Content .here
#should be plain if for
+ +help("if this is .bolded #that's bad, we want a string","a second arg
or else");
div.examples#javascript
- var a = 1;
- var helperFunction = function (a) { return (a === 1 ? 'singular' :
'plural'); };
diff --git a/jade-mode.el b/jade-mode.el
index 85b1ea26ec..69505357fe 100644
--- a/jade-mode.el
+++ b/jade-mode.el
@@ -81,7 +81,7 @@
(defvar jade-single-quote-string-re "[']\\(\\\\.\\|[^'\n]\\)*[']"
"Regexp used to match a single-quoted string literal")
-(defvar jade-tag-declaration-char-re "[-a-zA-Z0-9_.#]"
+(defvar jade-tag-declaration-char-re "[-a-zA-Z0-9_.#+]"
"Regexp used to match a character in a tag declaration")
(defvar jade-font-lock-keywords
@@ -89,7 +89,7 @@
(,jade-keywords . font-lock-keyword-face) ;; keywords
(,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
+ ("\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
(,jade-tag-re . font-lock-function-name-face)
;; tag name
