JSX: Fix highlighting of attributes containing spaces

PrismJS · Mar 2, 2017 · 867ea42 · 867ea42
1 parent 0a3d2a9
commit 867ea42
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/components/prism-jsx.js b/components/prism-jsx.js
@@ -5,7 +5,7 @@ var javascript = Prism.util.clone(Prism.languages.javascript);
 Prism.languages.jsx = Prism.languages.extend('markup', javascript);
 Prism.languages.jsx.tag.pattern= /<\/?[\w\.:-]+\s*(?:\s+(?:[\w\.:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+|(\{[\w\W]*?\})))?|\{\.{3}\w+\})\s*)*\/?>/i;
 
-Prism.languages.jsx.tag.inside['attr-value'].pattern = /=[^\{](?:('|")[\w\W]*?(\1)|[^\s>]+)/i;
+Prism.languages.jsx.tag.inside['attr-value'].pattern = /=(?!\{)(?:('|")[\w\W]*?(\1)|[^\s>]+)/i;
 
 Prism.languages.insertBefore('inside', 'attr-name', {
 	'spread': {

diff --git a/components/prism-jsx.min.js b/components/prism-jsx.min.js
diff --git a/tests/languages/jsx/issue1103.test b/tests/languages/jsx/issue1103.test
@@ -0,0 +1,29 @@
+var myDivElement = <div foo="bar baz" />;
+
+----------------------------------------------------
+
+[
+	["keyword", "var"],
+	" myDivElement ",
+	["operator", "="],
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", ["foo"]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"bar baz",
+			["punctuation", "\""]
+		]],
+		["punctuation", "/>"]
+	]],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks that quoted attribute values can contain spaces.
+See #1103.