CSS: Fixed url() containing "@" (#2272)

This fixes URLs that contain the "@" character.
PrismJS · Mar 26, 2020 · 504a63b · 504a63b
1 parent 57eebce
commit 504a63b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/components/prism-css.js b/components/prism-css.js
@@ -18,6 +18,7 @@
 		},
 		'url': {
 			pattern: RegExp('url\\((?:' + string.source + '|[^\n\r()]*)\\)', 'i'),
+			greedy: true,
 			inside: {
 				'function': /^url/i,
 				'punctuation': /^\(|\)$/

diff --git a/components/prism-css.min.js b/components/prism-css.min.js
diff --git a/prism.js b/prism.js
@@ -863,6 +863,7 @@ Prism.languages.svg = Prism.languages.markup;
 		},
 		'url': {
 			pattern: RegExp('url\\((?:' + string.source + '|[^\n\r()]*)\\)', 'i'),
+			greedy: true,
 			inside: {
 				'function': /^url/i,
 				'punctuation': /^\(|\)$/

diff --git a/tests/languages/css/url_feature.test b/tests/languages/css/url_feature.test
@@ -6,6 +6,9 @@ bar.png')
 url("foo\
 bar.png")
 
+@import url("https://cdn.jsdelivr.net/npm/prismj1.19.0/themes/prism-dark.css");
+@import url("https://cdn.jsdelivr.net/npm/prismjs/themes/prism-dark.css");
+
 ----------------------------------------------------
 
 [
@@ -38,6 +41,26 @@ bar.png")
 		["punctuation", "("],
 		"\"foo\\\r\nbar.png\"",
 		["punctuation", ")"]
+	]],
+	["atrule", [
+		["rule", "@import"],
+		["url", [
+			["function", "url"],
+			["punctuation", "("],
+			"\"https://cdn.jsdelivr.net/npm/prismj1.19.0/themes/prism-dark.css\"",
+			["punctuation", ")"]
+		]],
+		["punctuation", ";"]
+	]],
+	["atrule", [
+		["rule", "@import"],
+		["url", [
+			["function", "url"],
+			["punctuation", "("],
+			"\"https://cdn.jsdelivr.net/npm/prismjs/themes/prism-dark.css\"",
+			["punctuation", ")"]
+		]],
+		["punctuation", ";"]
 	]]
 ]