Markup addInline improvements (#1798)

This makes some minor improvements to the new `addInline` function of markup.

Author: RunDevelopment

components/prism-markup.js

@@ -63,7 +63,20 @@ Object.defineProperty(Prism.languages.markup.tag, 'addInlined', {
 	 * addInlined('style', 'css');
 	 */
 	value: function addInlined(tagName, lang) {
-		var inside = {};
+		var includedCdataInside = {};
+		includedCdataInside['language-' + lang] = {
+			pattern: /(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,
+			lookbehind: true,
+			inside: Prism.languages[lang]
+		};
+		includedCdataInside['cdata'] = /^<!\[CDATA\[|\]\]>$/i;
+
+		var inside = {
+			'included-cdata': {
+				pattern: /<!\[CDATA\[[\s\S]*?\]\]>/i,
+				inside: includedCdataInside
+			}
+		};
 		inside['language-' + lang] = {
 			pattern: /[\s\S]+/,
 			inside: Prism.languages[lang]
@@ -74,20 +87,7 @@ Object.defineProperty(Prism.languages.markup.tag, 'addInlined', {
 			pattern: RegExp(/(<__[\s\S]*?>)(?:<!\[CDATA\[[\s\S]*?\]\]>\s*|[\s\S])*?(?=<\/__>)/.source.replace(/__/g, tagName), 'i'),
 			lookbehind: true,
 			greedy: true,
-			inside: {
-				'included-cdata': {
-					pattern: /<!\[CDATA\[[\s\S]*?\]\]>/i,
-					inside: {
-						'content': {
-							pattern: /(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,
-							lookbehind: true,
-							inside: inside
-						},
-						'cdata': /^<!\[CDATA\[|\]\]>$/i
-					}
-				},
-				rest: inside
-			}
+			inside: inside
 		};
 
 		Prism.languages.insertBefore('markup', 'cdata', def);

components/prism-markup.min.js

@@ -627,7 +627,20 @@ Object.defineProperty(Prism.languages.markup.tag, 'addInlined', {
 	 * addInlined('style', 'css');
 	 */
 	value: function addInlined(tagName, lang) {
-		var inside = {};
+		var includedCdataInside = {};
+		includedCdataInside['language-' + lang] = {
+			pattern: /(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,
+			lookbehind: true,
+			inside: Prism.languages[lang]
+		};
+		includedCdataInside['cdata'] = /^<!\[CDATA\[|\]\]>$/i;
+
+		var inside = {
+			'included-cdata': {
+				pattern: /<!\[CDATA\[[\s\S]*?\]\]>/i,
+				inside: includedCdataInside
+			}
+		};
 		inside['language-' + lang] = {
 			pattern: /[\s\S]+/,
 			inside: Prism.languages[lang]
@@ -638,20 +651,7 @@ Object.defineProperty(Prism.languages.markup.tag, 'addInlined', {
 			pattern: RegExp(/(<__[\s\S]*?>)(?:<!\[CDATA\[[\s\S]*?\]\]>\s*|[\s\S])*?(?=<\/__>)/.source.replace(/__/g, tagName), 'i'),
 			lookbehind: true,
 			greedy: true,
-			inside: {
-				'included-cdata': {
-					pattern: /<!\[CDATA\[[\s\S]*?\]\]>/i,
-					inside: {
-						'content': {
-							pattern: /(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,
-							lookbehind: true,
-							inside: inside
-						},
-						'cdata': /^<!\[CDATA\[|\]\]>$/i
-					}
-				},
-				rest: inside
-			}
+			inside: inside
 		};
 
 		Prism.languages.insertBefore('markup', 'cdata', def);

prism.js

@@ -67,16 +67,14 @@ foo {
 		]],
 		["included-cdata", [
 			["cdata", "<![CDATA["],
-			["content", [
-				["language-css", [
-					["selector", "foo"],
-					["punctuation", "{"],
-					["property", "bar"],
-					["punctuation", ":"],
-					" baz",
-					["punctuation", ";"],
-					["punctuation", "}"]
-				]]
+			["language-css", [
+				["selector", "foo"],
+				["punctuation", "{"],
+				["property", "bar"],
+				["punctuation", ":"],
+				" baz",
+				["punctuation", ";"],
+				["punctuation", "}"]
 			]],
 			["cdata", "]]>"]
 		]],

tests/languages/markup!+css/css_inclusion.test

@@ -88,14 +88,12 @@ let foo = '</script>';
 		]],
 		["included-cdata", [
 			["cdata", "<![CDATA["],
-			["content", [
-				["language-javascript", [
-					["keyword", "let"],
-					" foo ",
-					["operator", "="],
-					["string", "'</script>'"],
-					["punctuation", ";"]
-				]]
+			["language-javascript", [
+				["keyword", "let"],
+				" foo ",
+				["operator", "="],
+				["string", "'</script>'"],
+				["punctuation", ";"]
 			]],
 			["cdata", "]]>"]
 		]],