Merge pull request #291 from kmvi/fix-290

Fix template string parsing
nilproject · Aug 26, 2023 · 6221057 · 6221057
2 parents 97cb9ce + 9981382
commit 6221057
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/NiL.JS/Expressions/TemplateString.cs b/NiL.JS/Expressions/TemplateString.cs
@@ -81,6 +81,7 @@ public static Expression Parse(ParseInfo state, ref int index, TemplateStringMod
                 if (state.Code[pos] == '$')
                 {
                     pos += 2;
+                    Tools.SkipSpaces(state.Code, ref pos);
                     expressions.Add((Expression)ExpressionTree.Parse(state, ref pos));
 
                     Tools.SkipSpaces(state.Code, ref pos);

diff --git a/Tests/StringInterpolationTests.cs b/Tests/StringInterpolationTests.cs
@@ -52,5 +52,17 @@ public void StringInterpolationAllowsSubstititions()
 
             Assert.AreEqual("This is a string such as 1234", stringValue.Value);
         }
+
+        [TestMethod]
+        public void StringInterpolationAllowsWhitespaces()
+        {
+            var context = new Context();
+            var code = @"var a=1234; `This is a string such as ${   
+    
+a   }`";
+            var stringValue = context.Eval(code);
+
+            Assert.AreEqual("This is a string such as 1234", stringValue.Value);
+        }
     }
 }