package

ap0ught · Sep 6, 2011 · 1041f1a · 1041f1a
1 parent 86344d9
commit 1041f1a
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 15 deletions.
diff --git a/build/demo/kitchen-sink-uncompressed.js b/build/demo/kitchen-sink-uncompressed.js
@@ -16732,6 +16732,9 @@ var JavaScriptHighlightRules = function() {
         "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
         "const|yield|import|get|set").split("|")
     );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
 
     var buildinConstants = lang.arrayToMap(
         ("null|Infinity|NaN|undefined").split("|")
@@ -16792,6 +16795,10 @@ var JavaScriptHighlightRules = function() {
             }, {
                 token : "constant.language.boolean",
                 regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : kwBeforeRe,
+                next : "regex_allowed"
             }, {
                 token : function(value) {
                     if (value == "this")

diff --git a/build/demo/kitchen-sink.js b/build/demo/kitchen-sink.js
diff --git a/build/src/mode-groovy.js b/build/src/mode-groovy.js
diff --git a/build/src/mode-html.js b/build/src/mode-html.js
diff --git a/build/src/mode-java.js b/build/src/mode-java.js
diff --git a/build/src/mode-javascript.js b/build/src/mode-javascript.js
diff --git a/build/src/mode-markdown.js b/build/src/mode-markdown.js
diff --git a/build/src/mode-scala.js b/build/src/mode-scala.js
diff --git a/build/src/mode-svg.js b/build/src/mode-svg.js
diff --git a/build/textarea/src/mode-groovy.js b/build/textarea/src/mode-groovy.js
diff --git a/build/textarea/src/mode-html.js b/build/textarea/src/mode-html.js
diff --git a/build/textarea/src/mode-java.js b/build/textarea/src/mode-java.js
diff --git a/build/textarea/src/mode-javascript.js b/build/textarea/src/mode-javascript.js
diff --git a/build/textarea/src/mode-markdown.js b/build/textarea/src/mode-markdown.js
diff --git a/build/textarea/src/mode-scala.js b/build/textarea/src/mode-scala.js
diff --git a/build/textarea/src/mode-svg.js b/build/textarea/src/mode-svg.js