Fixing some issues with collection expressions (#1037)

closes #1002 closes #1009
belav · Nov 22, 2023 · b12ec2b · b12ec2b
1 parent d2e6431
commit b12ec2b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/Src/CSharpier.Playground/Properties/launchSettings.json b/Src/CSharpier.Playground/Properties/launchSettings.json
@@ -4,7 +4,7 @@
       "commandName": "Executable",
       "executablePath": "dotnet",
       "comments": "hot reload was not reloading any changes to the csharpier project, just to playground",
-      "commandLineArgs": "watch run no-hot-reload",
+      "commandLineArgs": "watch run --no-hot-reload",
       "workingDirectory": "$(ProjectDir)",
       "launchBrowser": true,
       "environmentVariables": {

diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/CollectionExpressions.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/CollectionExpressions.test
@@ -1,6 +1,8 @@
-int[] a =  [ 1, 2, 3, 4, 5, 6, 7, 8 ];
+List<int> ids = [];
 
-Span<int> b =  [ 'a', 'b', 'c', 'd', 'e', 'f', 'h', 'i' ];
+int[] a = [1, 2, 3, 4, 5, 6, 7, 8];
+
+Span<int> b = ['a', 'b', 'c', 'd', 'e', 'f', 'h', 'i'];
 
 string[] c =
 [

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CollectionExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/CollectionExpression.cs
@@ -6,9 +6,12 @@ public static Doc Print(CollectionExpressionSyntax node, FormattingContext conte
     {
         Doc separator = node.Parent
             is AssignmentExpressionSyntax
-                or EqualsValueClauseSyntax { Parent: not PropertyDeclarationSyntax }
+                or EqualsValueClauseSyntax
+                {
+                    Parent: not (PropertyDeclarationSyntax or VariableDeclaratorSyntax)
+                }
             ? Doc.Line
-            : Doc.Null;
+            : Doc.IfBreak(Doc.Line, Doc.Null);
 
         var alwaysBreak =
             node.Elements.FirstOrDefault()
@@ -17,19 +20,21 @@ is AssignmentExpressionSyntax
         var result = Doc.Concat(
             separator,
             Token.Print(node.OpenBracketToken, context),
-            Doc.Indent(
-                alwaysBreak ? Doc.HardLine : Doc.Line,
-                SeparatedSyntaxList.Print(
-                    node.Elements,
-                    Node.Print,
-                    alwaysBreak ? Doc.HardLine : Doc.Line,
-                    context
+            node.Elements.Any()
+                ? Doc.Indent(
+                    alwaysBreak ? Doc.HardLine : Doc.IfBreak(Doc.Line, Doc.Null),
+                    SeparatedSyntaxList.Print(
+                        node.Elements,
+                        Node.Print,
+                        alwaysBreak ? Doc.HardLine : Doc.Line,
+                        context
+                    )
                 )
-            ),
+                : Doc.Null,
             node.Elements.Any()
                 ? alwaysBreak
                     ? Doc.HardLine
-                    : Doc.Line
+                    : Doc.IfBreak(Doc.Line, Doc.Null)
                 : Doc.Null,
             Token.Print(node.CloseBracketToken, context)
         );