branch: elpa/jade-mode
commit 544be1a87d237c19674f748f3ebfa9c3c7c5622a
Author: Travis Jefferson <[email protected]>
Commit: Travis Jefferson <[email protected]>
match full tag decl. and un-hl subsequent content
- we can probably clean up some of the class/id/tag highlighters,
since we're matching those in order to un-highlight now
---
example.jade | 3 ++-
jade-mode.el | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/example.jade b/example.jade
index ba438263e6..95ebbf300d 100644
--- a/example.jade
+++ b/example.jade
@@ -5,7 +5,7 @@ html(lang="en")
body.bp
#container
#header
- h1.page-title= My.awesome. page #is awesome#
+ h1.page-title My.awesome. page #is awesome#
#nav
ul#nav_list something sweet
li
@@ -23,6 +23,7 @@ html(lang="en")
= 'this one' + "and this should too"
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
#footer
#copywrite-text= locals
diff --git a/jade-mode.el b/jade-mode.el
index d1ab4ea46d..d6f8e14891 100644
--- a/jade-mode.el
+++ b/jade-mode.el
@@ -40,6 +40,15 @@ For detail, see `comment-dwim'."
"include" "yield" "mixin") 'words))
"Jade keywords.")
+(defvar jade-tag-re "[a-z][a-z0-9]*"
+ "Regexp used to match a basic html tag, e.g. link, a, div")
+
+(defvar jade-id-re "#[a-zA-Z][0-9a-zA-Z_\\-]*"
+ "Regexp used to match an ID literal, e.g. #id, #id-one_23")
+
+(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-double-quote-string-re "[\"]\\(\\\\.\\|[^\"\n]\\)*[\"]"
"Regexp used to match a double-quoted string literal")
@@ -66,6 +75,25 @@ For detail, see `comment-dwim'."
(,"^[ {2,}]*[a-z0-9_:\\-]*" 0 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
+ ;; tag#id.class INNER text
+ (,(concat "^\\s-*"
+
+ ;; start with a basic html tag, an ID, or a class
+ "\\(" jade-tag-re "\\|" jade-id-re "\\|" jade-class-re "\\)"
+
+ ;; followed by zero or more of either an ID or a class
+ "\\(" jade-id-re "\\|" jade-class-re "\\)*"
+
+ ;; then an optional set of parens with JS inside
+ ;; TODO highlight JS in a meaningful way
+ "\\(" "(.*)" "\\)?"
+
+ ;; then a space (not an equals sign), and match the rest of the
line
+ ;; and remove any font-lock faces applied
+ "[ ]\\(.+\\)") 4 nil t)
+
;; 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
