Markup: Make tags greedy. Fix #1356

PrismJS · Mar 14, 2018 · af834be · af834be
1 parent f0e6249
commit af834be
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/components/prism-markup.js b/components/prism-markup.js
@@ -5,6 +5,7 @@ Prism.languages.markup = {
 	'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 	'tag': {
 		pattern: /<\/?(?!\d)[^\s>\/=$<%]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		greedy: true,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,

diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
diff --git a/prism.js b/prism.js
@@ -570,6 +570,7 @@ Prism.languages.markup = {
 	'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 	'tag': {
 		pattern: /<\/?(?!\d)[^\s>\/=$<%]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		greedy: true,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,

diff --git a/tests/languages/jsx/issue1356.test b/tests/languages/jsx/issue1356.test
@@ -0,0 +1,32 @@
+<a href="//localhost">link</a>
+
+----------------------------------------------------
+
+[
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"a"
+		]],
+		["attr-name", ["href"]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"//localhost",
+			["punctuation", "\""]
+		]],
+		["punctuation", ">"]
+	]],
+	"link",
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			"a"
+		]],
+		["punctuation", ">"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for tags containing "//". See #1356.