Markup: Regexp optimisation + fix punctuation inside attr-value

PrismJS · Oct 22, 2017 · ea380c6 · ea380c6
1 parent f489a1e
commit ea380c6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 14 deletions.
diff --git a/components/prism-markup.js b/components/prism-markup.js
@@ -4,7 +4,7 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE[\s\S]+?>/i,
 	'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 	'tag': {
-		pattern: /<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\s\S])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		pattern: /<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,
@@ -14,9 +14,15 @@ Prism.languages.markup = {
 				}
 			},
 			'attr-value': {
-				pattern: /=(?:('|")[\s\S]*?(\1)|[^\s>]+)/i,
+				pattern: /=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+)/i,
 				inside: {
-					'punctuation': /[=>"']/
+					'punctuation': [
+						/^=/,
+						{
+							pattern: /(^|[^\\])["']/,
+							lookbehind: true
+						}
+					]
 				}
 			},
 			'punctuation': /\/?>/,

diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
diff --git a/prism.js b/prism.js
@@ -544,7 +544,7 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE[\s\S]+?>/i,
 	'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 	'tag': {
-		pattern: /<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\s\S])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		pattern: /<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,
@@ -554,9 +554,15 @@ Prism.languages.markup = {
 				}
 			},
 			'attr-value': {
-				pattern: /=(?:('|")[\s\S]*?(\1)|[^\s>]+)/i,
+				pattern: /=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+)/i,
 				inside: {
-					'punctuation': /[=>"']/
+					'punctuation': [
+						/^=/,
+						{
+							pattern: /(^|[^\\])["']/,
+							lookbehind: true
+						}
+					]
 				}
 			},
 			'punctuation': /\/?>/,

diff --git a/tests/languages/csharp+aspnet/directive_feature.test b/tests/languages/csharp+aspnet/directive_feature.test
@@ -35,8 +35,7 @@
         ["attr-value", [
             ["punctuation", "="],
             ["punctuation", "\""],
-            "ProductDetails.aspx?productID",
-            ["punctuation", "="],
+            "ProductDetails.aspx?productID=",
             ["directive tag", [
                 ["directive tag", "<%#:"],
                 "Item",

diff --git a/tests/languages/django/property_feature.test b/tests/languages/django/property_feature.test
@@ -25,11 +25,7 @@
 			["punctuation", "<"],
 			"a"
 		]],
-		["attr-name", ["href"]],
-		["attr-value", [
-			["punctuation", "="],
-			["punctuation", "\""]
-		]],
+		["attr-name", ["href=\""]],
 		["property", [
 			"{{ ",
 			["variable", "story"],

diff --git a/tests/languages/markup/tag_attribute_feature.test b/tests/languages/markup/tag_attribute_feature.test
@@ -4,6 +4,7 @@
 bar
 baz">
 <div foo:bar=42>
+<div foo="=\"=">
 
 ----------------------------------------------------
 
@@ -83,6 +84,23 @@ baz">
 			"42"
 		]],
 		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			"foo"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"=\\\"=",
+			["punctuation", "\""]
+		]],
+		["punctuation", ">"]
 	]]
 ]