indent comments on close bracket. (#1062)

closes #1059
belav · Dec 10, 2023 · d9b0a88 · d9b0a88
1 parent 935e36c
commit d9b0a88
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/CollectionExpressions.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/CollectionExpressions.test
@@ -65,6 +65,20 @@ CallMethod(
     ]
 );
 
+CallMethod(
+    [
+        // some comment
+    ]
+);
+
+CallMethod(
+    [
+        1,
+        // some comment
+        // and more
+    ]
+);
+
 class MyClass
 {
     private readonly List<string> _items;

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CollectionExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CollectionExpression.cs
@@ -46,7 +46,13 @@ or EqualsValueClauseSyntax
                     ? Doc.HardLine
                     : Doc.IfBreak(Doc.Line, Doc.Null)
                 : Doc.Null,
-            Token.Print(node.CloseBracketToken, context)
+            node.CloseBracketToken.LeadingTrivia.Any(o => o.IsComment())
+                ? Doc.Concat(
+                    Doc.Indent(Token.PrintLeadingTrivia(node.CloseBracketToken, context)),
+                    Doc.HardLine
+                )
+                : Doc.Null,
+            Token.PrintWithoutLeadingTrivia(node.CloseBracketToken, context)
         );
         return Doc.Group(result);
     }

diff --git a/Src/CSharpier/SyntaxPrinter/Token.cs b/Src/CSharpier/SyntaxPrinter/Token.cs
@@ -93,7 +93,10 @@ is InterpolatedStringExpressionSyntax
 
     public static Doc PrintLeadingTrivia(SyntaxToken syntaxToken, FormattingContext context)
     {
-        var isClosingBrace = syntaxToken.RawSyntaxKind() == SyntaxKind.CloseBraceToken;
+        var isClosingBrace =
+            syntaxToken.RawSyntaxKind() == SyntaxKind.CloseBraceToken
+            || syntaxToken.Parent is CollectionExpressionSyntax
+                && syntaxToken.RawSyntaxKind() == SyntaxKind.CloseBracketToken;
 
         var printedTrivia = PrivatePrintLeadingTrivia(
             syntaxToken.LeadingTrivia,