Better print generic methods and constructors

Src/CSharpier.Tests/TestFiles/ClassDeclaration/ClassDeclarations.cst

@@ -14,8 +14,7 @@ public class ThisIsSomeLongNameAndItShouldFormatWell1
       AndYetAnotherLongClassName,
       AndStillOneMore { }
 
-public class SimpleGeneric<T>
-    where T : new() { }
+public class SimpleGeneric<T> where T : new() { }
 
 public class LongTypeConstraints<T>
     where T : SomeLongNameThatJustKeepsGoing,
@@ -33,8 +32,7 @@ public class LongerClassNameWithLotsOfGenerics<
     TThirdLongName__________________
 > : SomeBaseClass<TLongName> { }
 
-public class SimpleGeneric<T> : BaseClass<T>
-    where T : new() { }
+public class SimpleGeneric<T> : BaseClass<T> where T : new() { }
 
 public class ThisIsSomeLongNameAndItShouldFormatWell2<T, T2, T3>
     : AnotherLongClassName<T>,

Src/CSharpier.Tests/TestFiles/ConstructorDeclaration/ConstructorDeclarations.cst

@@ -22,11 +22,20 @@ public class BasicClass
 
 public class Initializers : BasicClass
 {
-    public Initializers()
-        : this(true) { }
+    public Initializers() : this(true) { }
 
-    public Initializers(string value)
-        : base(value) { }
+    public Initializers(string value) : base(value) { }
+
+    public Initializers(
+        string parameter1,
+        string parameter2,
+        string parameter3,
+        string parameter4
+    ) : base(false)
+    {
+        _parameter1 = parameter1;
+        _parameter2 = parameter2;
+    }
 }
 
 public class Exactly80

Src/CSharpier.Tests/TestFiles/DelegateDeclaration/DelegateDeclarations.cst

@@ -2,6 +2,5 @@ class ClassName
 {
     delegate void Delegate();
 
-    delegate void Delegate<[System.Obsolete()] out T>()
-        where T : struct;
+    delegate void Delegate<[System.Obsolete()] out T>() where T : struct;
 }

Src/CSharpier.Tests/TestFiles/ObnoxiousEdgeCases/ObnoxiousEdgeCases.cst

@@ -60,8 +60,7 @@ class ClassName
             DynamicallyAccessedMemberTypes.PublicConstructors)]
         TAccountClaimsPrincipalFactory>(
         this IRemoteAuthenticationBuilder<RemoteAuthenticationState, RemoteUserAccount> builder
-    )
-        where TAccountClaimsPrincipalFactory : AccountClaimsPrincipalFactory<RemoteUserAccount> =>
+    ) where TAccountClaimsPrincipalFactory : AccountClaimsPrincipalFactory<RemoteUserAccount> =>
         builder.AddAccountClaimsPrincipalFactory<
             RemoteAuthenticationState,
             RemoteUserAccount,

Src/CSharpier.Tests/TestFiles/TypeParameterConstraintClause/TypeParameterConstraintClauses.cst

@@ -1,25 +1,28 @@
-delegate void Delegate<T>()
-    where T : struct;
+delegate void Delegate<T>() where T : struct;
 
-class ClassName<T>
-    where T : class
+class ClassName<T> where T : class
 {
-    void MethodName<T>()
-        where T : class
+    void MethodName<T>() where T : class
     {
-        void LocalFunction<T>()
-            where T : class
+        void LocalFunction<T>() where T : class
         {
             return;
         }
     }
+
+    public static ReturnType<T> MethodName<T, U>(
+        string parameter1,
+        string parameter2
+    ) where T : class
+      where U : class
+    {
+        return;
+    }
 }
 
-interface InterfaceName<T>
-    where T : class { }
+interface InterfaceName<T> where T : class { }
 
-struct Struct<T>
-    where T : class { }
+struct Struct<T> where T : class { }
 
 class ClassName<N, C, T, TT, L>
     where N : new()

Src/CSharpier/SyntaxPrinter/ConstraintClauses.cs

@@ -16,19 +16,40 @@ public static Doc Print(IEnumerable<TypeParameterConstraintClauseSyntax> constra
             {
                 return Doc.Null;
             }
+            else if (constraintClausesList.Count == 1)
+            {
+                return Doc.Group(
+                    Doc.Indent(
+                        Doc.Line,
+                        Doc.Join(
+                            Doc.Line,
+                            constraintClausesList.Select(TypeParameterConstraintClause.Print)
+                        )
+                    )
+                );
+            }
 
-            var docs = new List<Doc>
+            if (constraintClausesList[0].Parent is MethodDeclarationSyntax)
             {
-                Doc.Indent(
-                    Doc.HardLine,
-                    Doc.Join(
-                        Doc.HardLine,
-                        constraintClausesList.Select(TypeParameterConstraintClause.Print)
+                return Doc.Concat(
+                    " ",
+                    Doc.Align(
+                        2,
+                        Doc.Join(
+                            Doc.HardLine,
+                            constraintClausesList.Select(TypeParameterConstraintClause.Print)
+                        )
                     )
-                )
-            };
+                );
+            }
 
-            return Doc.Concat(docs);
+            return Doc.Indent(
+                Doc.HardLine,
+                Doc.Join(
+                    Doc.HardLine,
+                    constraintClausesList.Select(TypeParameterConstraintClause.Print)
+                )
+            );
         }
     }
 }

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/BaseMethodDeclaration.cs

@@ -168,6 +168,8 @@ public static Doc Print(CSharpSyntaxNode node)
             {
                 docs.Add(
                     groupId != null
+                    && constraintClauses.Count() < 2
+                    && constructorInitializer == null
                         ? Block.PrintWithConditionalSpace(body, groupId)
                         : Block.Print(body)
                 );

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/ConstructorInitializer.cs

@@ -8,8 +8,8 @@ public static class ConstructorInitializer
     {
         public static Doc Print(ConstructorInitializerSyntax node)
         {
-            return Doc.Indent(
-                Doc.HardLine,
+            return Doc.Concat(
+                " ",
                 Token.PrintWithSuffix(node.ColonToken, " "),
                 Token.Print(node.ThisOrBaseKeyword),
                 ArgumentList.Print(node.ArgumentList)