From a746604c9f6a38c63edfbae41fb69df9d9f95ed7 Mon Sep 17 00:00:00 2001
From: Bela VanderVoort <twobitbela@gmail.com>
Date: Tue, 10 Jan 2023 18:18:17 -0600
Subject: [PATCH] Put generic constraints on new line (#786)

closes #527
---
 .../TestFiles/ClassDeclarations.cst           |  6 +++--
 .../TestFiles/ClassDeclarations_Tabs.cst      |  6 +++--
 .../TestFiles/DelegateDeclarations.cst        |  3 ++-
 .../TypeParameterConstraintClauses.cst        | 24 ++++++++++++-------
 .../SyntaxPrinter/ConstraintClauses.cs        |  3 +--
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations.cst
index cb1401330..2980e6eae 100644
--- a/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations.cst
+++ b/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations.cst
@@ -14,7 +14,8 @@ 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,
@@ -32,7 +33,8 @@ 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>,
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations_Tabs.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations_Tabs.cst
index 7fa066428..7b2c65197 100644
--- a/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations_Tabs.cst
+++ b/Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations_Tabs.cst
@@ -14,7 +14,8 @@ 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,
@@ -32,7 +33,8 @@ 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>,
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/DelegateDeclarations.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/DelegateDeclarations.cst
index 333276b1a..87948bd2f 100644
--- a/Src/CSharpier.Tests/FormattingTests/TestFiles/DelegateDeclarations.cst
+++ b/Src/CSharpier.Tests/FormattingTests/TestFiles/DelegateDeclarations.cst
@@ -2,5 +2,6 @@ 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;
 }
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/TypeParameterConstraintClauses.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/TypeParameterConstraintClauses.cst
index 233fc0b83..cbc19f140 100644
--- a/Src/CSharpier.Tests/FormattingTests/TestFiles/TypeParameterConstraintClauses.cst
+++ b/Src/CSharpier.Tests/FormattingTests/TestFiles/TypeParameterConstraintClauses.cst
@@ -1,10 +1,14 @@
-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;
         }
@@ -31,7 +35,8 @@ class ClassName<T> where T : class
     public static ReturnType<T> MethodName<T, U>(
         string longParameter_______________________,
         string longParameter_______________________
-    ) where T : class
+    )
+        where T : class
     {
         return;
     }
@@ -39,7 +44,8 @@ class ClassName<T> where T : class
     public static ReturnType<T> MethodName<T, U>(
         string longParameter_______________________,
         string longParameter_______________________
-    ) where T : class { }
+    )
+        where T : class { }
 
     public static ReturnType<T> MethodName<T, U>(
         string longParameter_______________________,
@@ -59,9 +65,11 @@ class ClassName<T> where T : class
         where U : class { }
 }
 
-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()
diff --git a/Src/CSharpier/SyntaxPrinter/ConstraintClauses.cs b/Src/CSharpier/SyntaxPrinter/ConstraintClauses.cs
index 6413e02df..84dd6c938 100644
--- a/Src/CSharpier/SyntaxPrinter/ConstraintClauses.cs
+++ b/Src/CSharpier/SyntaxPrinter/ConstraintClauses.cs
@@ -13,12 +13,11 @@ FormattingContext context
         {
             return Doc.Null;
         }
-        var prefix = constraintClausesList.Count >= 2 ? Doc.HardLine : Doc.Line;
         var body = Doc.Join(
             Doc.HardLine,
             constraintClausesList.Select(o => TypeParameterConstraintClause.Print(o, context))
         );
 
-        return Doc.Group(Doc.Indent(prefix, body));
+        return Doc.Group(Doc.Indent(Doc.HardLine, body));
     }
 }