fix extra space being added in invocation that is inside verbatim str… (

#1373) …ing literal that has line breaks closes #1358
belav · Nov 4, 2024 · 42622cd · 42622cd
1 parent 9475d2f
commit 42622cd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/StringLiterals.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/StringLiterals.test
@@ -183,5 +183,9 @@ SomeVerbatimString
 SomeVerbatimString
 ".CallMethod().CallMethod().CallMethod()
         );
+
+        var someStringWithLineBreakAndLongValue =
+            $@"
+        {someValue.GetValue().Name} someLongText________________________________________________________________";
     }
 }
diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs
@@ -34,30 +34,30 @@ public static Doc PrintMemberChain(ExpressionSyntax node, FormattingContext cont
         var cutoff = shouldMergeFirstTwoGroups ? 3 : 2;
 
         var forceOneLine =
-            groups.Count <= cutoff
-            && (
-                groups
-                    .Skip(shouldMergeFirstTwoGroups ? 1 : 0)
-                    .Any(o =>
-                        o.Last().Node
-                            is not (
-                                InvocationExpressionSyntax
-                                or ElementAccessExpressionSyntax
-                                or PostfixUnaryExpressionSyntax
-                                {
-                                    Operand: InvocationExpressionSyntax
-                                }
-                            )
+            (
+                groups.Count <= cutoff
+                && (
+                    groups
+                        .Skip(shouldMergeFirstTwoGroups ? 1 : 0)
+                        .Any(o =>
+                            o.Last().Node
+                                is not (
+                                    InvocationExpressionSyntax
+                                    or ElementAccessExpressionSyntax
+                                    or PostfixUnaryExpressionSyntax
+                                    {
+                                        Operand: InvocationExpressionSyntax
+                                    }
+                                )
+                        )
+                    // if the last group contains just a !, make sure it doesn't end up on a new line
+                    || (
+                        groups.Last().Count == 1
+                        && groups.Last()[0].Node is PostfixUnaryExpressionSyntax
                     )
-                // if the last group contains just a !, make sure it doesn't end up on a new line
-                || (
-                    groups.Last().Count == 1
-                    && groups.Last()[0].Node is PostfixUnaryExpressionSyntax
                 )
-            );
-
-        if (
-            forceOneLine
+            )
+            || node.HasParent(typeof(InterpolatedStringExpressionSyntax))
             // this handles the case of a multiline string being part of an invocation chain
             // conditional groups don't propagate breaks so we need to avoid the conditional group
             || groups[0]
@@ -78,8 +78,9 @@ is LiteralExpressionSyntax
                             Token.Text.Length: > 0
                         } literalExpressionSyntax
                         && literalExpressionSyntax.Token.Text.Contains('\n')
-                )
-        )
+                );
+
+        if (forceOneLine)
         {
             return Doc.Group(oneLine);
         }