Include new line before comments that end a block

closes #513
belav · Dec 20, 2021 · 1086bc1 · 1086bc1
1 parent dcd11ca
commit 1086bc1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/Comments.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/Comments.cst
@@ -89,3 +89,15 @@ public class ClassName
     // regular comment does not cause breaking
     IReadOnlyList<IArgument> ICommand.Arguments => Arguments;
 }
+
+class ClassName
+{
+    void MethodName()
+    {
+        var x = 1;
+
+        // keep line before this
+    }
+
+    // keep line before this
+}
diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/BaseTypeDeclaration.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/BaseTypeDeclaration.cs
@@ -119,14 +119,7 @@ public static Doc Print(BaseTypeDeclarationSyntax node)
                 Token.Print(node.OpenBraceToken),
                 members,
                 Doc.HardLine,
-                node.CloseBraceToken.LeadingTrivia.Any(
-                    o => o.Kind() == SyntaxKind.DisabledTextTrivia
-                )
-                  ? Doc.Concat(
-                        Token.PrintLeadingTriviaWithNewLines(node.CloseBraceToken.LeadingTrivia),
-                        Token.PrintWithoutLeadingTrivia(node.CloseBraceToken)
-                    )
-                  : Token.Print(node.CloseBraceToken)
+                Token.Print(node.CloseBraceToken)
             );
         }
         else if (node.OpenBraceToken.Kind() != SyntaxKind.None)

diff --git a/Src/CSharpier/SyntaxPrinter/Token.cs b/Src/CSharpier/SyntaxPrinter/Token.cs
@@ -89,14 +89,15 @@ is InterpolatedStringExpressionSyntax
 
     public static Doc PrintLeadingTrivia(SyntaxToken syntaxToken)
     {
-        var indentTrivia = syntaxToken.Kind() == SyntaxKind.CloseBraceToken;
+        var isClosingBrace = syntaxToken.Kind() == SyntaxKind.CloseBraceToken;
 
         var printedTrivia = PrivatePrintLeadingTrivia(
             syntaxToken.LeadingTrivia,
-            skipLastHardline: indentTrivia
+            includeInitialNewLines: isClosingBrace,
+            skipLastHardline: isClosingBrace
         );
 
-        return indentTrivia && printedTrivia != Doc.Null
+        return isClosingBrace && printedTrivia != Doc.Null
           ? Doc.Concat(Doc.Indent(printedTrivia), Doc.HardLine)
           : printedTrivia;
     }