JSX: Regexp optimisation + handle spread operator as a whole

PrismJS · Oct 22, 2017 · 28de4e2 · 28de4e2
1 parent 8fc1b03
commit 28de4e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/components/prism-jsx.js b/components/prism-jsx.js
@@ -3,23 +3,23 @@
 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\.:-]+(?:=(?:("|')(\\?[\s\S])*?\1|[^\s'">=]+|(\{[\s\S]*?\})))?|\{\.{3}\w+\}))*\s*\/?>/i;
+Prism.languages.jsx.tag.pattern= /<\/?[\w.:-]+\s*(?:\s+(?:[\w\.:-]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+|(?:\{[^}]*\})))?|\{\.{3}\w+\}))*\s*\/?>/i;
 
-Prism.languages.jsx.tag.inside['attr-value'].pattern = /=(?!\{)(?:('|")[\s\S]*?(\1)|[^\s>]+)/i;
+Prism.languages.jsx.tag.inside['attr-value'].pattern = /=(?!\{)(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">]+)/i;
 
 Prism.languages.insertBefore('inside', 'attr-name', {
 	'spread': {
 		pattern: /\{\.{3}\w+\}/,
 		inside: {
-			'punctuation': /\{|\}|\./,
+			'punctuation': /[{}]|\.{3}/,
 			'attr-value': /\w+/
 		}
 	}
 }, Prism.languages.jsx.tag);
 
 var jsxExpression = Prism.util.clone(Prism.languages.jsx);
 
-delete jsxExpression.punctuation
+delete jsxExpression.punctuation;
 
 jsxExpression = Prism.languages.insertBefore('jsx', 'operator', {
   'punctuation': /=(?={)|[{}[\];(),.:]/

diff --git a/components/prism-jsx.min.js b/components/prism-jsx.min.js
diff --git a/tests/languages/jsx/tag_feature.test b/tests/languages/jsx/tag_feature.test
@@ -49,9 +49,7 @@ var myElement = <MyComponent someProperty={true} />;
 		]],
 		["spread", [
 			["punctuation", "{"],
-			["punctuation", "."],
-			["punctuation", "."],
-			["punctuation", "."],
+			["punctuation", "..."],
 			["attr-value", "foo"],
 			["punctuation", "}"]
 		]],