Fixing a few more edge cases with trailing comments caught by csharpi… (

#1319) …er-repos formatting
belav · Aug 17, 2024 · f2fa42d · f2fa42d
1 parent 6af0e81
commit f2fa42d
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 43 deletions.
diff --git a/.github/workflows/format_repositories.yml b/.github/workflows/format_repositories.yml
@@ -18,4 +18,4 @@ jobs:
           repository: belav/csharpier-repos
           path: csharpier-repos
       - run: dotnet build csharpier/Src/CSharpier.Cli/CSharpier.Cli.csproj -c release
-      - run: dotnet csharpier/Src/CSharpier.Cli/bin/release/net7.0/dotnet-csharpier.dll csharpier-repos --skip-write
+      - run: dotnet csharpier/Src/CSharpier.Cli/bin/release/net8.0/dotnet-csharpier.dll csharpier-repos --skip-write
diff --git a/Src/CSharpier.Tests/DisabledTextComparerTests.cs b/Src/CSharpier.Tests/DisabledTextComparerTests.cs
@@ -46,6 +46,25 @@ public enum Enum
         Squash(before).Should().Be(Squash(after));
     }
 
+    [Test]
+    public void Squash_Should_Work_For_Trailing_Comma_With_Attribute()
+    {
+        var before = """
+            [
+                SomeAttribute,
+            ]
+            public class ClassName { }
+            """;
+
+        var after = """
+            [SomeAttribute]
+            public class ClassName { }
+
+            """;
+
+        Squash(before).Should().Be(Squash(after));
+    }
+
     [Test]
     public void Squash_Should_Work_With_Pointer_Stuff()
     {

diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/CollectionExpressions.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/CollectionExpressions.test
@@ -86,24 +86,6 @@ CallMethod(_ =>
     ]
 );
 
-int[] someArray =
-[
-    1
-#if DEBUG
-    ,
-    2
-#endif
-];
-
-int[] someArray =
-[
-    1
-#if !DEBUG
-    ,
-    2
-#endif
-];
-
 class MyClass
 {
     private readonly List<string> _items;

diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/EnumDeclarations.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/EnumDeclarations.test
@@ -11,25 +11,3 @@ public enum E
     B = A,
     C = 2 + A,
 }
-
-public enum EnumWithDirective
-{
-    A,
-    B = A,
-    C = 2 + A
-#if DEBUG
-    ,
-    D = 4,
-#endif
-}
-
-public enum EnumWithDirective2
-{
-    A,
-    B = A,
-    C = 2 + A,
-#if DEBUG
-    D = 4,
-#endif
-    E = 5,
-}
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/TrailingComma_Directives.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/TrailingComma_Directives.test
@@ -0,0 +1,81 @@
+int[] someArray =
+[
+    1
+#if DEBUG
+    ,
+    2
+#endif
+];
+
+int[] someArray =
+[
+    1
+#if !DEBUG
+    ,
+    2
+#endif
+];
+
+int[] someArray =
+[
+    1,
+#if DEBUG
+    2
+#endif
+];
+
+int[] someArray =
+[
+    1,
+#if !DEBUG
+    2
+#endif
+];
+
+public class ClassName
+{
+    private SomeCollection someCollection = new SomeCollection()
+    {
+        new SomeValue(),
+#if DEBUG
+        new SomeValue(),
+        new SomeValue()
+#endif
+    };
+
+    private SomeCollection someCollection = new SomeCollection()
+    {
+        new SomeValue()
+#if DEBUG
+        ,
+        new SomeValue(),
+        new SomeValue()
+#endif
+    };
+}
+
+public enum SomeEnum
+{
+    Value1
+#if DEBUG
+    ,
+    Value2,
+#endif
+}
+
+public enum SomeEnum
+{
+    Value1,
+#if DEBUG
+    Value2,
+#endif
+}
+
+public enum SomeEnum
+{
+    Value1,
+#if DEBUG
+    Value2,
+#endif
+    Value3,
+}
diff --git a/Src/CSharpier/DisabledTextComparer.cs b/Src/CSharpier/DisabledTextComparer.cs
@@ -95,7 +95,7 @@ is not (
 
             // this removes trailing commas so that added trailing commas inside #if blocks don't result
             // in validation failures
-            if (nextChar is '}' && result.Length > 1 && result[^2] is ',')
+            if (nextChar is '}' or ']' && result.Length > 1 && result[^2] is ',')
             {
                 result[^2] = nextChar;
                 result.Length -= 1;

diff --git a/Src/CSharpier/SyntaxPrinter/SeparatedSyntaxList.cs b/Src/CSharpier/SyntaxPrinter/SeparatedSyntaxList.cs
@@ -61,7 +61,12 @@ private static Doc Print<T>(
             {
                 var trailingSeparatorToken = list.GetSeparator(x);
                 // when the trailing separator has trailing comments, we have to print it normally to prevent it from collapsing
-                if (trailingSeparatorToken.TrailingTrivia.Any(o => o.IsComment()))
+                // when the closing token has a directive, we can't assume the comma should be added/removed so just print it normally
+                if (
+                    trailingSeparatorToken.TrailingTrivia.Any(o => o.IsComment())
+                    || closingToken != null
+                        && closingToken.Value.LeadingTrivia.Any(o => o.IsDirective)
+                )
                 {
                     docs.Add(Token.Print(trailingSeparatorToken, context));
                 }