C#: Fixed adjacent string interpolations (#2402)

PrismJS · Jun 7, 2020 · 2a2e79e · 2a2e79e
1 parent 939a17c
commit 2a2e79e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/components/prism-csharp.js b/components/prism-csharp.js
@@ -316,7 +316,7 @@
 	function createInterpolationInside(interpolation, interpolationRound) {
 		return {
 			'interpolation': {
-				pattern: re(/([^{](?:\{\{)*)<<0>>/.source, [interpolation]),
+				pattern: re(/((?:^|[^{])(?:\{\{)*)<<0>>/.source, [interpolation]),
 				lookbehind: true,
 				inside: {
 					'format-string': {

diff --git a/components/prism-csharp.min.js b/components/prism-csharp.min.js
diff --git a/tests/languages/csharp/interpolation-string_feature.test b/tests/languages/csharp/interpolation-string_feature.test
@@ -1,5 +1,6 @@
 $"Hello, {{ {name} }}! Today is {date.DayOfWeek}, it's {date:HH:mm} now."
 $"{a,5} and {b + "" /* foo ":} */:format} {h(a, b)}"
+$"{1}{2}{3}"
 
 @$"
 "
@@ -87,6 +88,31 @@ $@"{
 		]],
 		["string", "\""]
 	]],
+	["interpolation-string", [
+		["string", "$\""],
+		["interpolation", [
+			["punctuation", "{"],
+			["expression", [
+				["number", "1"]
+			]],
+			["punctuation", "}"]
+		]],
+		["interpolation", [
+			["punctuation", "{"],
+			["expression", [
+				["number", "2"]
+			]],
+			["punctuation", "}"]
+		]],
+		["interpolation", [
+			["punctuation", "{"],
+			["expression", [
+				["number", "3"]
+			]],
+			["punctuation", "}"]
+		]],
+		["string", "\""]
+	]],
 	["interpolation-string", [
 		["string", "@$\"\n\""]
 	]],