JavaScript: Improve Regex matching

PrismJS · Mar 26, 2018 · 172d351 · 172d351
1 parent 9084481
commit 172d351
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -8,7 +8,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
+		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true,
 		greedy: true
 	},

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/prism.js b/prism.js
@@ -734,7 +734,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
+		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true,
 		greedy: true
 	},

diff --git a/tests/languages/javascript/regex_feature.test b/tests/languages/javascript/regex_feature.test
@@ -1,18 +1,18 @@
-/foo bar/
+/foo bar/;
 /foo/gimyu,
 /[\[\]]{2,4}(?:foo)*/;
-/foo"test"bar/
+/foo"test"bar/;
 /foo\//
 1 / 4 + "/, not a regex";
 / '1' '2' '3' '4' '5' /
 
 ----------------------------------------------------
 
 [
-	["regex", "/foo bar/"],
+	["regex", "/foo bar/"], ["punctuation", ";"],
 	["regex", "/foo/gimyu"], ["punctuation", ","],
 	["regex", "/[\\[\\]]{2,4}(?:foo)*/"], ["punctuation", ";"],
-	["regex", "/foo\"test\"bar/"],
+	["regex", "/foo\"test\"bar/"], ["punctuation", ";"],
 	["regex", "/foo\\//"],
 	["number", "1"], ["operator", "/"], ["number", "4"], ["operator", "+"], ["string", "\"/, not a regex\""], ["punctuation", ";"],
 	["regex", "/ '1' '2' '3' '4' '5' /"]