Improved javascript regex highlight

components/prism-javascript.js

@@ -9,6 +9,24 @@ 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,.;})\]]))/,
+		inside: {
+			'regex-flags': {
+				pattern: /[gimyu]{1,5}$/,
+				alias: 'keyword'
+			},
+			'regex-group': {
+				pattern: /\[(?:\\\\|\\\]|[^\]])*\]/,
+				alias: 'escape'
+			},
+			'regex-escape': {
+				pattern: /\\./,
+				alias: 'escape'
+			},
+			'regex-punctuation': {
+				pattern: /[|^$*+(){}]|(?:\?(?![:!=<]))/,
+				alias: 'operator'
+			}
+		},
 		lookbehind: true,
 		greedy: true
 	},

prism.js

@@ -732,6 +732,24 @@ 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,.;})\]]))/,
+		inside: {
+			'regex-flags': {
+				pattern: /[gimyu]{1,5}$/,
+				alias: 'keyword'
+			},
+			'regex-group': {
+				pattern: /\[(?:\\\\|\\\]|[^\]])*\]/,
+				alias: 'escape'
+			},
+			'regex-escape': {
+				pattern: /\\./,
+				alias: 'escape'
+			},
+			'regex-punctuation': {
+				pattern: /[|^$*+(){}]|(?:\?(?![:!=<]))/,
+				alias: 'operator'
+			}
+		},
 		lookbehind: true,
 		greedy: true
 	},

tests/languages/javascript/regex_feature.test

@@ -5,21 +5,46 @@
 /foo\//
 1 / 4 + "/, not a regex";
 / '1' '2' '3' '4' '5' /
-[/foo/]
+[/foo/],
+/url\(path\)/,
+/\.jpg$|\.png$/
 
 ----------------------------------------------------
 
 [
-	["regex", "/foo bar/"], ["punctuation", ";"],
-	["regex", "/foo/gimyu"], ["punctuation", ","],
-	["regex", "/[\\[\\]]{2,4}(?:foo)*/"], ["punctuation", ";"],
-	["regex", "/foo\"test\"bar/"], ["punctuation", ";"],
-	["regex", "/foo\\//"],
+	["regex", ["/foo bar/"]], ["punctuation", ";"],
+	["regex", ["/foo/", ["regex-flags", "gimyu"]]], ["punctuation", ","],
+	["regex", [
+		"/",
+		["regex-group", "[\\[\\]]"],
+		["regex-punctuation", "{"],
+		"2,4",
+		["regex-punctuation", "}"],
+		["regex-punctuation", "("],
+		"?:foo",
+		["regex-punctuation", ")"],
+		["regex-punctuation", "*"],
+		"/"
+	]], ["punctuation", ";"],
+	["regex", ["/foo\"test\"bar/"]], ["punctuation", ";"],
+	["regex", ["/foo", ["regex-escape", "\\/"], "/"]],
 	["number", "1"], ["operator", "/"], ["number", "4"], ["operator", "+"], ["string", "\"/, not a regex\""], ["punctuation", ";"],
-	["regex", "/ '1' '2' '3' '4' '5' /"],
-	["punctuation", "["], ["regex", "/foo/"], ["punctuation", "]"]
+	["regex", ["/ '1' '2' '3' '4' '5' /"]],
+	["punctuation", "["], ["regex", ["/foo/"]], ["punctuation", "]"], ["punctuation", ","],
+	["regex", ["/url", ["regex-escape", "\\("], "path", ["regex-escape", "\\)"], "/"]], ["punctuation", ","],
+	["regex", [
+		"/",
+		["regex-escape", "\\."],
+		"jpg",
+		["regex-punctuation", "$"],
+		["regex-punctuation", "|"],
+		["regex-escape", "\\."],
+		"png",
+		["regex-punctuation", "$"],
+		"/"
+	]]
 ]
 
 ----------------------------------------------------
 
-Checks for regex.
+Checks for regex.

tests/languages/markup+javascript+csharp+aspnet/script_feature.test

@@ -39,7 +39,7 @@
 		["punctuation", ">"]
 	]],
 	["script", [
-		["regex", "/foo/"]
+		["regex", ["/foo/"]]
 	]],
 	["tag", [
 		["tag", [
@@ -54,4 +54,4 @@
 
 Checks for scripts containing C# code.
 Also checks that those don't break normal JS scripts.
-Note: Markup is loaded before Javascript so that scripts are added into grammar.
+Note: Markup is loaded before Javascript so that scripts are added into grammar.