Reduce indentations for nested loops (#920)

* Reduce indentations for nested loops closes #867 * Keep indention for nested loops of mixed types --------- Co-authored-by: Lasath Fernando <devel@lasath.org>
belav · Jul 6, 2023 · 65fbc9d · 65fbc9d
1 parent c80bab8
commit 65fbc9d
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 3 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/NestedLoops.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/NestedLoops.test
@@ -0,0 +1,82 @@
+public class ClassName
+{
+    public void MethodName()
+    {
+        foreach (var subsequence in sequence)
+        foreach (var item in subsequence)
+            item.DoSomething();
+
+        foreach (var item in subsequence)
+            while (item.IsSomething())
+                item.DoSomething();
+
+        foreach (var item in sequence)
+            do item.DoSomething();
+            while (false);
+
+        foreach (var item in sequence)
+            for (; ; )
+                item.DoSomething();
+
+        foreach (var subsequence in sequence)
+        {
+            foreach (var item in subsequence)
+            {
+                item.DoSomething();
+                item.DoSomething();
+            }
+        }
+
+        await foreach (var subsequence in sequence)
+        await foreach (var item in subsequence)
+            item.DoSomething();
+
+        foreach (var subsequence in sequence)
+        await foreach (var item in subsequence)
+        {
+            item.DoSomething();
+            item.DoSomething();
+        }
+
+        while (true)
+            foreach (var item in sequence)
+                item.DoSomething();
+
+        while (true)
+        while (true)
+            do Console.WriteLine();
+            while (false);
+
+        while (true)
+            for (; ; )
+                Console.WriteLine();
+
+        while (true)
+        {
+            foreach (var item in sequence)
+                item.DoSomething();
+        }
+
+        for (; ; )
+            foreach (var item in sequence)
+                item.DoSomething();
+
+        for (; ; )
+            while (true)
+                Console.WriteLine();
+
+        for (; ; )
+            do Console.WriteLine();
+            while (false);
+
+        for (; ; )
+        for (; ; )
+            item.DoSomething();
+
+        for (; ; )
+        {
+            for (; ; )
+                Console.WriteLine();
+        }
+    }
+}
diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CommonForEachStatement.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CommonForEachStatement.cs
@@ -38,7 +38,12 @@ ForEachVariableStatementSyntax forEachVariable
                 ),
                 Token.Print(node.CloseParenToken, context)
             ),
-            OptionalBraces.Print(node.Statement, context)
+            node.Statement switch
+            {
+                CommonForEachStatementSyntax
+                    => Doc.Group(Doc.HardLine, Node.Print(node.Statement, context)),
+                _ => OptionalBraces.Print(node.Statement, context)
+            }
         );
 
         return docs;

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/ForStatement.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/ForStatement.cs
@@ -41,7 +41,11 @@ public static Doc Print(ForStatementSyntax node, FormattingContext context)
                 ),
                 Token.Print(node.CloseParenToken, context)
             ),
-            OptionalBraces.Print(node.Statement, context)
+            node.Statement switch
+            {
+                ForStatementSyntax => Doc.Group(Doc.HardLine, Node.Print(node.Statement, context)),
+                _ => OptionalBraces.Print(node.Statement, context)
+            }
         };
 
         return Doc.Concat(docs);

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/WhileStatement.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/WhileStatement.cs
@@ -16,7 +16,12 @@ public static Doc Print(WhileStatementSyntax node, FormattingContext context)
                 ),
                 Token.Print(node.CloseParenToken, context)
             ),
-            OptionalBraces.Print(node.Statement, context)
+            node.Statement switch
+            {
+                WhileStatementSyntax
+                    => Doc.Group(Doc.HardLine, Node.Print(node.Statement, context)),
+                _ => OptionalBraces.Print(node.Statement, context)
+            }
         );
 
         return result;