More edgecases in compilation unit (#556)

closes #551
belav · Jan 21, 2022 · 90d6ef5 · 90d6ef5
1 parent fdc71f0
commit 90d6ef5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/CompilationUnitIfDirectiveEdgeCase6.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/CompilationUnitIfDirectiveEdgeCase6.cst
@@ -0,0 +1,5 @@
+using System;
+
+[assembly: SomeAttribute]
+
+namespace Namespace { }
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/CompilationUnitIfDirectiveEdgeCase7.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/CompilationUnitIfDirectiveEdgeCase7.cst
@@ -0,0 +1,8 @@
+using System;
+
+#if DEBUG
+[assembly: SomeAttribute]
+
+#endif
+
+namespace Namespace { }
diff --git a/Src/CSharpier/SyntaxPrinter/NamespaceLikePrinter.cs b/Src/CSharpier/SyntaxPrinter/NamespaceLikePrinter.cs
@@ -67,15 +67,26 @@ node is CompilationUnitSyntax compilationUnitSyntax
 
         if (usings.Any() || (!usings.Any() && externs.Any()))
         {
-            if (members[0].GetLeadingTrivia().Any(o => o.IsDirective))
+            var directiveTrivia = members[0].GetLeadingTrivia().Where(o => o.IsDirective).ToArray();
+
+            if (directiveTrivia.Any())
             {
-                docs.Add(ExtraNewLines.Print(members[0]));
+                if (
+                    (
+                        node is not CompilationUnitSyntax { AttributeLists: { Count: > 0 } }
+                        && directiveTrivia.All(o => o.Kind() is SyntaxKind.EndIfDirectiveTrivia)
+                    ) || !directiveTrivia.All(o => o.Kind() is SyntaxKind.EndIfDirectiveTrivia)
+                )
+                {
+                    docs.Add(ExtraNewLines.Print(members[0]));
+                }
             }
-            else
+            else if (node is not CompilationUnitSyntax { AttributeLists: { Count: > 0 } })
             {
                 docs.Add(Doc.HardLine);
             }
         }
+
         docs.AddRange(MembersWithForcedLines.Print(node, members));
     }
 }