JS: Improved regex detection (#2465)

PrismJS · Jul 18, 2020 · 4f55052 · 4f55052
1 parent 16fbe3e
commit 4f55052
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -26,7 +26,7 @@ Prism.languages.javascript['class-name'][0].pattern = /(\b(?:class|interface|ext
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
+		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\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
@@ -1468,7 +1468,7 @@ Prism.languages.javascript['class-name'][0].pattern = /(\b(?:class|interface|ext
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
+		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
 		lookbehind: true,
 		greedy: true
 	},

diff --git a/tests/languages/javascript/regex_feature.test b/tests/languages/javascript/regex_feature.test
@@ -11,6 +11,8 @@
 
 let a = /regex/m // comment
 let b = condition ? /regex/ : /another one/
+return /regex/;
+yield /regex/;
 
 ----------------------------------------------------
 
@@ -38,7 +40,13 @@ let b = condition ? /regex/ : /another one/
 	["operator", "?"],
 	["regex", "/regex/"],
 	["operator", ":"],
-	["regex", "/another one/"]
+	["regex", "/another one/"],
+	["keyword", "return"],
+	["regex", "/regex/"],
+	["punctuation", ";"],
+	["keyword", "yield"],
+	["regex", "/regex/"],
+	["punctuation", ";"]
 ]
 
 ----------------------------------------------------