Regex: Changed how languages embed regexes (#2532)

Author: RunDevelopment

components.js

@@ -73,6 +73,7 @@
 			"title": "JavaScript",
 			"require": "clike",
 			"modify": "markup",
+			"optional": "regex",
 			"alias": "js",
 			"option": "default"
 		},
@@ -210,7 +211,7 @@
 				"oscript": "OneScript"
 			},
 			"owner": "Diversus23"
-		},		
+		},
 		"c": {
 			"title": "C",
 			"require": "clike",
@@ -969,14 +970,6 @@
 		},
 		"regex": {
 			"title": "Regex",
-			"modify": [
-				"actionscript",
-				"coffeescript",
-				"flow",
-				"javascript",
-				"typescript",
-				"vala"
-			],
 			"owner": "RunDevelopment"
 		},
 		"renpy": {
@@ -1181,6 +1174,7 @@
 		"vala": {
 			"title": "Vala",
 			"require": "clike",
+			"optional": "regex",
 			"owner": "TemplarVolk"
 		},
 		"vbnet": {

components.json

@@ -28,7 +28,17 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
 		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
 		lookbehind: true,
-		greedy: true
+		greedy: true,
+		inside: {
+			'regex-source': {
+				pattern: /^(\/)[\s\S]+(?=\/[a-z]*$)/,
+				lookbehind: true,
+				alias: 'language-regex',
+				inside: Prism.languages.regex
+			},
+			'regex-flags': /[a-z]+$/,
+			'regex-delimiter': /^\/|\/$/
+		}
 	},
 	// This must be declared before keyword because we use "function" inside the look-forward
 	'function-variable': {

components/prism-javascript.js

@@ -101,27 +101,4 @@
 		}
 	};
 
-
-	[
-		'actionscript',
-		'coffescript',
-		'flow',
-		'javascript',
-		'typescript',
-		'vala'
-	].forEach(function (lang) {
-		var grammar = Prism.languages[lang];
-		if (grammar) {
-			grammar['regex'].inside = {
-				'language-regex': {
-					pattern: /^(\/)[\s\S]+(?=\/[a-z]*$)/i,
-					lookbehind: true,
-					inside: Prism.languages.regex
-				},
-				'regex-flags': /[a-z]+$/i,
-				'regex-delimiter': /^\/|\/$/,
-			};
-		}
-	});
-
 }(Prism))

components/prism-javascript.min.js

@@ -69,6 +69,16 @@ Prism.languages.insertBefore('vala','string', {
 Prism.languages.insertBefore('vala', 'keyword', {
 	'regex': {
 		pattern: /\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[imsx]{0,4}(?=\s*(?:$|[\r\n,.;})\]]))/,
-		greedy: true
+		greedy: true,
+		inside: {
+			'regex-source': {
+				pattern: /^(\/)[\s\S]+(?=\/[a-z]*$)/,
+				lookbehind: true,
+				alias: 'language-regex',
+				inside: Prism.languages.regex
+			},
+			'regex-flags': /[a-z]+$/,
+			'regex-delimiter': /^\/|\/$/
+		}
 	}
 });

components/prism-regex.js

@@ -1474,7 +1474,17 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
 		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
 		lookbehind: true,
-		greedy: true
+		greedy: true,
+		inside: {
+			'regex-source': {
+				pattern: /^(\/)[\s\S]+(?=\/[a-z]*$)/,
+				lookbehind: true,
+				alias: 'language-regex',
+				inside: Prism.languages.regex
+			},
+			'regex-flags': /[a-z]+$/,
+			'regex-delimiter': /^\/|\/$/
+		}
 	},
 	// This must be declared before keyword because we use "function" inside the look-forward
 	'function-variable': {

components/prism-regex.min.js

@@ -5,7 +5,7 @@
 [
 	["regex", [
 		["regex-delimiter", "/"],
-		["language-regex", [
+		["regex-source", [
 			"a",
 			["quantifier", "+"],
 			["group", ["(?:"]],