JavaScript: Improve Regexp pattern

PrismJS · Apr 13, 2018 · 5b043cf · 5b043cf
1 parent 1bf73b0
commit 5b043cf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 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: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\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
@@ -731,7 +731,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\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
@@ -5,6 +5,7 @@
 /foo\//
 1 / 4 + "/, not a regex";
 / '1' '2' '3' '4' '5' /
+[/foo/]
 
 ----------------------------------------------------
 
@@ -15,7 +16,8 @@
 	["regex", "/foo\"test\"bar/"], ["punctuation", ";"],
 	["regex", "/foo\\//"],
 	["number", "1"], ["operator", "/"], ["number", "4"], ["operator", "+"], ["string", "\"/, not a regex\""], ["punctuation", ";"],
-	["regex", "/ '1' '2' '3' '4' '5' /"]
+	["regex", "/ '1' '2' '3' '4' '5' /"],
+	["punctuation", "["], ["regex", "/foo/"], ["punctuation", "]"]
 ]
 
 ----------------------------------------------------