Prefer breaking before when clause, instead of inside (#384)

* Prefer breaking before `when` clause, instead of inside Closes #382 * Use Group instead of GroupWithId
belav · Jul 29, 2021 · 14d69d6 · 14d69d6
1 parent dcb89b0
commit 14d69d6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/Src/CSharpier.Tests/TestFiles/SwitchExpression/SwitchExpressions.cst b/Src/CSharpier.Tests/TestFiles/SwitchExpression/SwitchExpressions.cst
@@ -33,6 +33,9 @@ class ClassName
                   andOtherParameters,
                   thatMakeThisLongEnoughToBreak___________________
               ),
+            VeryLongObject_______________________________________________________________
+                when count > 0
+              => CallSomeMethod(someValue),
             OneMore
               => "someStrings"
                   + "moreStrings"

diff --git a/Src/CSharpier.Tests/TestFiles/SwitchStatement/SwitchStatements.cst b/Src/CSharpier.Tests/TestFiles/SwitchStatement/SwitchStatements.cst
@@ -52,6 +52,8 @@ public class ClassName
         {
             case "A" when b > 50:
             case "B" when B < 50:
+            case "C______________________________________________________________________"
+                when C == 50:
             default:
             {
                 break;

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CasePatternSwitchLabel.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CasePatternSwitchLabel.cs
@@ -14,7 +14,7 @@ public static Doc Print(CasePatternSwitchLabelSyntax node)
             docs.Add(Token.PrintWithSuffix(node.Keyword, " "), Node.Print(node.Pattern));
             if (node.WhenClause != null)
             {
-                docs.Add(" ", Node.Print(node.WhenClause));
+                docs.Add(Node.Print(node.WhenClause));
             }
             docs.Add(Token.Print(node.ColonToken));
             return Doc.Concat(docs);

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/SwitchExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/SwitchExpression.cs
@@ -1,6 +1,4 @@
-using System.Linq;
 using CSharpier.DocTypes;
-using CSharpier.SyntaxPrinter;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace CSharpier.SyntaxPrinter.SyntaxNodePrinters
@@ -24,7 +22,7 @@ public static Doc Print(SwitchExpressionSyntax node)
                                 Doc.Group(
                                     Node.Print(o.Pattern),
                                     o.WhenClause != null
-                                        ? Doc.Concat(" ", Node.Print(o.WhenClause))
+                                        ? Node.Print(o.WhenClause)
                                         : Doc.Null,
                                     // use align 2 here to make sure that the => never lines up with statements above it
                                     // it makes this more readable for big ugly switch expressions

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/WhenClause.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/WhenClause.cs
@@ -7,9 +7,12 @@ public static class WhenClause
     {
         public static Doc Print(WhenClauseSyntax node)
         {
-            return Doc.Concat(
-                Token.PrintWithSuffix(node.WhenKeyword, " "),
-                Node.Print(node.Condition)
+            return Doc.Group(
+                Doc.Indent(
+                    Doc.Line,
+                    Token.PrintWithSuffix(node.WhenKeyword, " "),
+                    Node.Print(node.Condition)
+                )
             );
         }
     }