Merge pull request #1016 from ajaxorg/mode/jade

Fix JS highlight rules embedded in Jade

lib/ace/mode/jade_highlight_rules.js

@@ -120,11 +120,11 @@ var JadeHighlightRules = function() {
             "token": [ "storage.type.function.jade", "entity.name.function.jade"],
             "regex": "^(\\s*mixin)( [\\w\\-]+)"
         },
-       /* {
+        {
             "token": "source.js.embedded.jade",
-            "regex": "^\\s*-|=|!=",
+            "regex": "^\\s*(?:-|=|!=)",
-            "next": "js_code"
+            "next": "js-start"
-        },*/
+        },
         /*{
             "token": "entity.name.tag.script.jade",
             "regex": "^\\s*script",
@@ -220,6 +220,20 @@ var JadeHighlightRules = function() {
         }
     ],
     "tag_attributes": [ 
+        {
+            "token" : "string",
+            "regex" : "'(?=.)",
+            "next"  : "qstring"
+        }, 
+        {
+            "token" : "string",
+            "regex" : '"(?=.)',
+            "next"  : "qqstring"
+        },
+        {
+            "token": "entity.other.attribute-name.jade",
+            "regex": "\\b[a-zA-Z\\-:]+"
+        },
         {
             "token": ["entity.other.attribute-name.jade", "punctuation"],
             "regex": "\\b([a-zA-Z:\\.-]+)(=)",
@@ -284,6 +298,12 @@ var JadeHighlightRules = function() {
         }
     ]
 };
+
+    this.embedRules(JavaScriptHighlightRules, "js-", [{
+        token: "text",
+        regex: ".$",
+        next: "start"
+    }]);
 /*
     this.embedRules(MarkdownHighlightRules, "markdown-", [{
        token : "support.function",