[JavaScript] More regexp literal fixes

sublimehq · Feb 24, 2016 · d3baaed · d3baaed
1 parent 06ffdbb
commit d3baaed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/JavaScript/JavaScript.sublime-syntax b/JavaScript/JavaScript.sublime-syntax
@@ -366,14 +366,14 @@ contexts:
   literal-regexp:
     # Lookahead and prevent incorrect matches by finding a / following an
     # identifier or number. Not perfect, but stops most incorrect matches
-    - match: '(?=({{identifier}}|0[xob]\d+|\d+|\d*\.\d*(e[-+]?\d+)?)\s*/[^/])'
+    - match: '(?=({{identifier}}|0[xob]\d+|\d+|\d*\.\d*(e[-+]?\d+)?)\s*/[^/*])'
       push:
         - include: comments
         - match: '/'
           scope: keyword.operator.arithmetic.js
           pop: true
         - include: expressions-no-regexp
-    - match: '/(?=.+/[gimy]*(?!\s*[a-zA-Z0-9_$]))'
+    - match: '/(?=(?:[^/\\]|\\.)+/(?![/*])[gimy]*(?!\s*[a-zA-Z0-9_$]))'
       scope: punctuation.definition.string.begin.js
       push:
         - meta_scope: string.regexp.js

diff --git a/JavaScript/syntax_test_js.js b/JavaScript/syntax_test_js.js
@@ -499,3 +499,13 @@ var result = 200 / 400 + 500 /
 //               ^ keyword.operator.arithmetic
 //                           ^ keyword.operator.arithmetic
 100;
+
+var angle = 2*π / count // angle between circles
+//              ^ keyword.operator.arithmetic
+
+var angle = 2*π / count /* angle between circles */
+//              ^ keyword.operator.arithmetic
+
+a = /foo\/bar/g // Ensure handling of escape / in regex detection
+//    ^ string.regexp
+//       ^ constant.character.escape