JS: Template strings: Increased bracket count of interpolations (#1845)

RunDevelopment · web-flow · commit c13d6e7d8dd5 · 2019-04-19T22:07:57.000+02:00
This increases the number of nested braces which can be matched by JS's template pattern to supported nested objects within interpolation expressions.
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -61,11 +61,11 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 
 Prism.languages.insertBefore('javascript', 'string', {
 	'template-string': {
-		pattern: /`(?:\\[\s\S]|\${[^}]+}|[^\\`])*`/,
+		pattern: /`(?:\\[\s\S]|\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}|[^\\`])*`/,
 		greedy: true,
 		inside: {
 			'interpolation': {
-				pattern: /\${[^}]+}/,
+				pattern: /\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}/,
 				inside: {
 					'interpolation-punctuation': {
 						pattern: /^\${|}$/,
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/examples/prism-javascript.html b/examples/prism-javascript.html
@@ -73,5 +73,8 @@ <h2>Known failures</h2>
 </p>
 
 <h3>String interpolation containing a closing brace</h3>
-<pre><code>`${ {foo:'bar'}.foo }`
+<pre><code>`${ /* } */ a + b }`
 `${ '}' }`</code></pre>
+
+<h3>String interpolation with deeply nested braces</h3>
+<pre><code>`${foo({ a: { b: { c: true } } })}`</code></pre>
diff --git a/prism.js b/prism.js
@@ -822,11 +822,11 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 
 Prism.languages.insertBefore('javascript', 'string', {
 	'template-string': {
-		pattern: /`(?:\\[\s\S]|\${[^}]+}|[^\\`])*`/,
+		pattern: /`(?:\\[\s\S]|\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}|[^\\`])*`/,
 		greedy: true,
 		inside: {
 			'interpolation': {
-				pattern: /\${[^}]+}/,
+				pattern: /\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}/,
 				inside: {
 					'interpolation-punctuation': {
 						pattern: /^\${|}$/,
diff --git a/tests/languages/javascript/template-string_feature.test b/tests/languages/javascript/template-string_feature.test
@@ -6,6 +6,9 @@ bar`
 "foo `a` `b` `c` `d` bar"
 "test // test" `template`
 
+console.log(`This is ${it.with({ type: false })}!`)
+`${ {foo:'bar'}.foo }`
+
 ----------------------------------------------------
 
 [
@@ -27,23 +30,63 @@ bar`
 		["string", "`"]
 	]],
 	["template-string", [
-        ["string", "`"],
-        ["interpolation", [
-            ["interpolation-punctuation", "${"],
-            ["function", "foo"],
-            ["punctuation", "("],
-            ["punctuation", ")"],
-            ["interpolation-punctuation", "}"]
-        ]],
-        ["string", "`"]
-    ]],
-    ["string", "\"foo `a` `b` `c` `d` bar\""],
-    ["string", "\"test // test\""],
-    ["template-string", [
-        ["string", "`template`"]
-    ]]
+		["string", "`"],
+		["interpolation", [
+			["interpolation-punctuation", "${"],
+			["function", "foo"],
+			["punctuation", "("],
+			["punctuation", ")"],
+			["interpolation-punctuation", "}"]
+		]],
+		["string", "`"]
+	]],
+	["string", "\"foo `a` `b` `c` `d` bar\""],
+	["string", "\"test // test\""],
+	["template-string", [
+		["string", "`template`"]
+	]],
+
+	"\r\n\r\nconsole",
+	["punctuation", "."],
+	["function", "log"],
+	["punctuation", "("],
+	["template-string", [
+		["string", "`This is "],
+		["interpolation", [
+			["interpolation-punctuation", "${"],
+			"it",
+			["punctuation", "."],
+			["function", "with"],
+			["punctuation", "("],
+			["punctuation", "{"],
+			" type",
+			["punctuation", ":"],
+			["boolean", "false"],
+			["punctuation", "}"],
+			["punctuation", ")"],
+			["interpolation-punctuation", "}"]
+		]],
+		["string", "!`"]
+	]],
+	["punctuation", ")"],
+
+	["template-string", [
+		["string", "`"],
+		["interpolation", [
+			["interpolation-punctuation", "${"],
+			["punctuation", "{"],
+			"foo",
+			["punctuation", ":"],
+			["string", "'bar'"],
+			["punctuation", "}"],
+			["punctuation", "."],
+			"foo ",
+			["interpolation-punctuation", "}"]
+		]],
+		["string", "`"]
+	]]
 ]
 
 ----------------------------------------------------
 
-Checks for single-line and multi-line template strings.
+Checks for single-line and multi-line template strings.
