Better(?) way of dealing with breaking in VariableDeclarations

closes #47

Src/CSharpier.Tests/TestFiles/AnonymousObjectCreationExpression/AnonymousObjectCreationExpressions.cst

@@ -0,0 +1,13 @@
+public class ClassName
+{
+    public dynamic ShortValue = new { Property = true };
+
+    public dynamic LongValue = new
+    {
+        One = "One",
+        Two = "Two",
+        ThreeThreeThree = "ThreeThreeThree"
+    };
+
+    public dynamic Value = new { NoName };
+}

Src/CSharpier.Tests/TestFiles/AnonymousObjectCreationExpression/_AnonymousObjectCreationExpressionTests.cs

@@ -6,22 +6,9 @@ namespace CSharpier.Tests.TestFiles
     public class AnonymousObjectCreationExpressionTests : BaseTest
     {
         [Test]
-        public void BasicAnonymousObjectCreationExpression()
+        public void AnonymousObjectCreationExpressions()
         {
-            this.RunTest(
-                "AnonymousObjectCreationExpression",
-                "BasicAnonymousObjectCreationExpression"
-            );
-        }
-        [Test]
-        public void MultipleProperties()
-        {
-            this.RunTest("AnonymousObjectCreationExpression", "MultipleProperties");
-        }
-        [Test]
-        public void NoNames()
-        {
-            this.RunTest("AnonymousObjectCreationExpression", "NoNames");
+            this.RunTest("AnonymousObjectCreationExpression", "AnonymousObjectCreationExpressions");
         }
     }
 }

Src/CSharpier.Tests/TestFiles/Comments/SpecialCases.cst

@@ -10,12 +10,6 @@ class ClassName
         {
             // indent
         }
-
-        var x = new SomeClass
-        {
-            Property1 = true
-            // indent
-        };
     }
 
     void MethodName()

Src/CSharpier.Tests/TestFiles/ConditionalExpression/_ConditionalExpressionTests.cs

@@ -6,7 +6,7 @@ namespace CSharpier.Tests.TestFiles
     public class ConditionalExpressionTests : BaseTest
     {
         [Test]
-        public void BasicConditionalExpression()
+        public void ConditionalExpressions()
         {
             this.RunTest("ConditionalExpression", "ConditionalExpressions");
         }

Src/CSharpier.Tests/TestFiles/FieldDeclaration/BasicField.cst → Src/CSharpier.Tests/TestFiles/FieldDeclaration/FieldDeclarations.cst

@@ -30,4 +30,27 @@ public class ClassName
         Property4 = false,
         Property5 = false
     };
+
+    // leading comments
+    private static const string SomeName = "1";
+
+    public SomeClass SomeName; // trailing comments
+
+    public System.Text.StringBuilder NamespacedField;
+
+    public static Dictionary<Type, string> PropertiesByType
+        = new Dictionary<Type, string>();
+
+    public static Dictionary<
+        SomeLongTypeName,
+        SomeOtherLongTypeName_______________________________
+    > PropertiesByType = new Dictionary<
+        SomeLongTypeName,
+        SomeOtherLongTypeName_______________________________
+    >();
+}
+
+struct S
+{
+    fixed int field[10];
 }

Src/CSharpier.Tests/TestFiles/FieldDeclaration/_FieldDeclarationTests.cs

@@ -6,24 +6,9 @@ namespace CSharpier.Tests.TestFiles
     public class FieldDeclarationTests : BaseTest
     {
         [Test]
-        public void BasicField()
+        public void FieldDeclarations()
         {
-            this.RunTest("FieldDeclaration", "BasicField");
-        }
-        [Test]
-        public void FieldDeclarationComments()
-        {
-            this.RunTest("FieldDeclaration", "FieldDeclarationComments");
-        }
-        [Test]
-        public void FixedFieldWithSize()
-        {
-            this.RunTest("FieldDeclaration", "FixedFieldWithSize");
-        }
-        [Test]
-        public void NamespacedField()
-        {
-            this.RunTest("FieldDeclaration", "NamespacedField");
+            this.RunTest("FieldDeclaration", "FieldDeclarations");
         }
     }
 }

Src/CSharpier.Tests/TestFiles/ImplicitElementAccess/_ImplicitElementAccessTests.cs

@@ -6,9 +6,9 @@ namespace CSharpier.Tests.TestFiles
     public class ImplicitElementAccessTests : BaseTest
     {
         [Test]
-        public void BasicImplicitElementAccess()
+        public void ImplicitElementAccesses()
         {
-            this.RunTest("ImplicitElementAccess", "BasicImplicitElementAccess");
+            this.RunTest("ImplicitElementAccess", "ImplicitElementAccesses");
         }
     }
 }

Src/CSharpier.Tests/TestFiles/InitializerExpression/InitializerExpressions.cst

@@ -39,4 +39,13 @@ class ClassName
             longValue______________________________
         }
     };
+
+    void MethodName()
+    {
+        var x = new SomeClass
+        {
+            Property1 = true
+            // should indent
+        };
+    }
 }

Src/CSharpier.Tests/TestFiles/PropertyDeclaration/PropertyDeclarations.cst

@@ -54,7 +54,9 @@ public class ClassName
         set;
     }
 
-    public virtual ICollection<SomeObject> SomeLongNameThatForcesALineBreak { get; set; } =
+    public virtual ICollection<
+        SomeObject
+    > SomeLongNameThatForcesALineBreak { get; set; } =
         new HashSet<SomeObject>();
 
     public Dictionary<string, string> Properties { get; set; } =

Src/CSharpier.Tests/TestFiles/QueryExpression/QueryExpressions.cst

@@ -4,6 +4,13 @@ class ClassName
     {
         var query1 = from c in customers select c;
         query1 = from c in customers select c into d select d;
+        query1 =
+            from c in customers
+            join c1 in customers11111111111111111111111111111
+                on c1.GetHashCode() equals c.GetHashCode()
+                into e
+            select c into d
+            select d;
 
         var query2 = from Customer c in customers select c;
 

Src/CSharpier.Tests/TestFiles/SwitchExpression/SwitchWithRecursivePattern.cst → Src/CSharpier.Tests/TestFiles/SwitchExpression/SwitchExpressions.cst

@@ -1,7 +1,15 @@
 class ClassName
 {
-    void MethodName()
+    int MethodName()
     {
+        return 1 switch
+        {
+            1 => 100,
+            2 => 200,
+            3 when false => 300,
+            _ => throw new global::System.Exception()
+        };
+
         var newState = (GetState(), action, hasKey) switch
         {
             (DoorState.Closed, Action.Open, _) => DoorState.Opened,

Src/CSharpier.Tests/TestFiles/SwitchExpression/_SwitchExpressionTests.cs

@@ -6,14 +6,9 @@ namespace CSharpier.Tests.TestFiles
     public class SwitchExpressionTests : BaseTest
     {
         [Test]
-        public void BasicSwitchExpression()
+        public void SwitchExpressions()
         {
-            this.RunTest("SwitchExpression", "BasicSwitchExpression");
-        }
-        [Test]
-        public void SwitchWithRecursivePattern()
-        {
-            this.RunTest("SwitchExpression", "SwitchWithRecursivePattern");
+            this.RunTest("SwitchExpression", "SwitchExpressions");
         }
     }
 }

Src/CSharpier/CommandLineFormatter.cs

@@ -254,6 +254,7 @@ private async Task FormatFile(string file, CancellationToken cancellationToken)
                 && result.Code != fileReaderResult.FileContents
             ) {
                 // purposely avoid async here, that way the file completely writes if the process gets cancelled while running.
+                // ReSharper disable once MethodHasAsyncOverloadWithCancellation
                 this.FileSystem.File.WriteAllText(file, result.Code, fileReaderResult.Encoding);
             }
         }

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/AssignmentExpression.cs

@@ -12,8 +12,9 @@ public static Doc Print(AssignmentExpressionSyntax node)
                 Node.Print(node.Left),
                 " ",
                 Token.Print(node.OperatorToken),
-                node.Right is QueryExpressionSyntax ? Doc.Null : " ",
-                Node.Print(node.Right)
+                node.Right is QueryExpressionSyntax
+                    ? Doc.Indent(Doc.Line, Node.Print(node.Right))
+                    : Doc.Concat(" ", Node.Print(node.Right))
             );
         }
     }

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/BaseFieldDeclaration.cs

@@ -19,7 +19,7 @@ public static Doc Print(BaseFieldDeclarationSyntax node)
                 docs.Add(Token.PrintWithSuffix(eventFieldDeclarationSyntax.EventKeyword, " "));
             }
 
-            docs.Add(Node.Print(node.Declaration), Token.Print(node.SemicolonToken));
+            docs.Add(VariableDeclaration.Print(node.Declaration), Token.Print(node.SemicolonToken));
             return Doc.Concat(docs);
         }
     }

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/EqualsValueClause.cs

@@ -18,14 +18,15 @@ public static Doc Print(EqualsValueClauseSyntax node)
                 separator = Doc.Null;
             }
             else if (
-                node.Value is AnonymousObjectCreationExpressionSyntax
-                || node.Value is AnonymousMethodExpressionSyntax
-                || node.Value is ConditionalExpressionSyntax
-                || node.Value is ObjectCreationExpressionSyntax
-                || node.Value is InitializerExpressionSyntax
-                || node.Value is ParenthesizedLambdaExpressionSyntax
-                || node.Value is InvocationExpressionSyntax
-                || node.Value is SwitchExpressionSyntax
+                node.Value
+                    is AnonymousObjectCreationExpressionSyntax
+                        or AnonymousMethodExpressionSyntax
+                        or ConditionalExpressionSyntax
+                        or ObjectCreationExpressionSyntax
+                        or InitializerExpressionSyntax
+                        or ParenthesizedLambdaExpressionSyntax
+                        or InvocationExpressionSyntax
+                        or SwitchExpressionSyntax
             ) {
                 separator = " ";
             }

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/QueryExpression.cs

@@ -7,8 +7,7 @@ public static class QueryExpression
     {
         public static Doc Print(QueryExpressionSyntax node)
         {
-            return Doc.Indent(
-                Doc.Line,
+            return Doc.Concat(
                 FromClause.Print(node.FromClause),
                 Doc.Line,
                 QueryBody.Print(node.Body)

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/TypeArgumentList.cs

@@ -11,7 +11,11 @@ public static Doc Print(TypeArgumentListSyntax node)
         {
             return Doc.Concat(
                 Token.Print(node.LessThanToken),
-                Doc.Indent(SeparatedSyntaxList.Print(node.Arguments, Node.Print, Doc.Line)),
+                Doc.Indent(
+                    Doc.SoftLine,
+                    SeparatedSyntaxList.Print(node.Arguments, Node.Print, Doc.Line)
+                ),
+                Doc.SoftLine,
                 Token.Print(node.GreaterThanToken)
             );
         }