Make long parenthesized expressions not always break.

closes #921
belav · Jan 7, 2024 · 75a8e1f · 75a8e1f
1 parent 1b481e2
commit 75a8e1f
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 21 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/ParenthesizedExpressions.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/ParenthesizedExpressions.test
@@ -1,16 +1,34 @@
-class ClassName
-{
-    void MethodName()
-    {
-        var x =
-            query
-            && (
-                currentChar == '='
-                || currentChar == '<'
-                || currentChar == '!'
-                || currentChar == '>'
-                || currentChar == '|'
-                || currentChar == '&'
-            );
-    }
-}
+var x =
+    query
+    && (
+        currentChar == '='
+        || currentChar == '<'
+        || currentChar == '!'
+        || currentChar == '>'
+        || currentChar == '|'
+        || currentChar == '&'
+    );
+
+// some comment won't break the next line
+(someObject as SomeType).CallMethod();
+
+(someObject as Exactly100____________________________________________________________).CallMethod();
+(someObject as SomeLongType___________________________________________________________)
+    .CallMethod();
+(someObject as SomeLongType________________________________________________________________________)
+    .CallMethod();
+
+(
+    someObject
+    as UnlikelyButThisIsWhatItWouldLookLike_________________________________________________
+)
+    .CallMethod();
+
+(
+    someObject
+    as UnlikelyButThisIsWhatItWouldLookLike_________________________________________________
+)
+    .CallMethod______________()
+    .CallMethod______________()
+    .CallMethod______________();
+
diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs
@@ -34,6 +34,7 @@ public static Doc PrintMemberChain(ExpressionSyntax node, FormattingContext cont
 
         var forceOneLine =
             groups.Count <= cutoff
+            && groups[0].First().Node is not ParenthesizedExpressionSyntax
             && (
                 groups
                     .Skip(shouldMergeFirstTwoGroups ? 1 : 0)

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/ParenthesizedExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/ParenthesizedExpression.cs
@@ -4,11 +4,14 @@ internal static class ParenthesizedExpression
 {
     public static Doc Print(ParenthesizedExpressionSyntax node, FormattingContext context)
     {
-        return Doc.Group(
-            Token.Print(node.OpenParenToken, context),
-            Doc.Indent(Doc.SoftLine, Node.Print(node.Expression, context)),
-            Doc.SoftLine,
-            Token.Print(node.CloseParenToken, context)
+        return Doc.Concat(
+            Token.PrintLeadingTrivia(node.OpenParenToken, context),
+            Doc.Group(
+                Token.PrintWithoutLeadingTrivia(node.OpenParenToken, context),
+                Doc.Indent(Doc.SoftLine, Node.Print(node.Expression, context)),
+                Doc.SoftLine,
+                Token.Print(node.CloseParenToken, context)
+            )
         );
     }
 }