Closes #44. Do not remove spaces from string in FB_init.

Roald87 · Aug 19, 2020 · 7b6e5ac · 7b6e5ac
1 parent 24e5856
commit 7b6e5ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/TcBlack/VariableDeclaration.cs b/src/TcBlack/VariableDeclaration.cs
@@ -115,7 +115,11 @@ public TcDeclaration Tokenize()
 
         public string RemoveWhiteSpaceIfPossible(string str)
         {
-            string pattern = @"\s+(?=[^[\]]*\])|\s+(?=[^()]*\))";
+            string pattern = (
+                "\\s+(?=[^[]*\\])"
+                + "|(?<!['\"][^,]*)\\s+(?=[^(]*\\))"
+                + "|\\s+(?![^,]*['\"])(?=[^(]*\\))"
+            );
 
             return Regex.Replace(str, pattern, "").Trim();
         }

diff --git a/src/TcBlackTests/VariableDeclarationTests.cs b/src/TcBlackTests/VariableDeclarationTests.cs
@@ -213,6 +213,22 @@ private void AssertEquals(TcDeclaration expected, TcDeclaration actual)
             "SomeArray : ARRAY[- 10..(2*-14)/SYSTEM.Number] OF INT;",
             "SomeArray : ARRAY[-10..(2 * -14) / SYSTEM.Number] OF INT;"
         )]
+        [InlineData(
+            "fbInst : FB_WithName(Name:='Text with spaces', number := 4);",
+            "fbInst : FB_WithName(Name:='Text with spaces', number:=4);"
+        )]
+        [InlineData(
+            "fbInst : FB_WithName(  Name:= \"Another text with spaces\",  num:=3.14) ;",
+            "fbInst : FB_WithName(Name:=\"Another text with spaces\", num:=3.14);"
+        )]
+        [InlineData(
+            "fbInst : FB_Name( Name:= \"Text with ' quote\" , truth := FALSE);",
+            "fbInst : FB_Name(Name:=\"Text with ' quote\", truth:=FALSE);"
+        )]
+        [InlineData(
+            "fbInst : FB_Name(Name:='The other \" quote' );",
+            "fbInst : FB_Name(Name:='The other \" quote');"
+        )]
         public void FormatVariableDeclaration(string unformattedCode, string expected)
         {
             Global.indentation = "    ";