Sort global System usings before other global usings (#1004)

vipentti · web-flow · commit eb567079b7aa · 2023-11-14T20:07:48.000-06:00
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsGlobalSystemToTop.expected.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsGlobalSystemToTop.expected.test
@@ -0,0 +1,4 @@
+global using System;
+global using System.Web;
+global using AWord;
+global using ZWord;
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsGlobalSystemToTop.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsGlobalSystemToTop.test
@@ -0,0 +1,4 @@
+global using ZWord;
+global using AWord;
+global using System.Web;
+global using System;
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsMixedCorrectly.expected.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsMixedCorrectly.expected.test
@@ -0,0 +1,8 @@
+global using System;
+global using System.Web;
+global using AWord;
+global using ZWord;
+using System;
+using System.Web;
+using AWord;
+using ZWord;
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsMixedCorrectly.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsMixedCorrectly.test
@@ -0,0 +1,8 @@
+global using ZWord;
+using ZWord;
+global using AWord;
+using AWord;
+global using System.Web;
+using System.Web;
+global using System;
+using System;
diff --git a/Src/CSharpier/SyntaxPrinter/UsingDirectives.cs b/Src/CSharpier/SyntaxPrinter/UsingDirectives.cs
@@ -134,6 +134,7 @@ private static IEnumerable<List<UsingData>> GroupUsings(
         FormattingContext context
     )
     {
+        var globalSystemUsings = new List<UsingData>();
         var globalUsings = new List<UsingData>();
         var globalAliasUsings = new List<UsingData>();
         var systemUsings = new List<UsingData>();
@@ -187,9 +188,18 @@ FormattingContext context
 
                 if (usingDirective.GlobalKeyword.RawSyntaxKind() != SyntaxKind.None)
                 {
-                    (usingDirective.Alias is not null ? globalAliasUsings : globalUsings).Add(
-                        usingData
-                    );
+                    if (usingDirective.Alias is not null)
+                    {
+                        globalAliasUsings.Add(usingData);
+                    }
+                    else if (usingDirective.Name is not null && IsSystemName(usingDirective.Name))
+                    {
+                        globalSystemUsings.Add(usingData);
+                    }
+                    else
+                    {
+                        globalUsings.Add(usingData);
+                    }
                 }
                 else if (usingDirective.StaticKeyword.RawSyntaxKind() != SyntaxKind.None)
                 {
@@ -214,6 +224,7 @@ FormattingContext context
             }
         }
 
+        yield return globalSystemUsings.OrderBy(o => o.Using, Comparer).ToList();
         yield return globalUsings.OrderBy(o => o.Using, Comparer).ToList();
         yield return globalAliasUsings.OrderBy(o => o.Using, Comparer).ToList();
         yield return systemUsings.OrderBy(o => o.Using, Comparer).ToList();

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ private static IEnumerable<List<UsingData>> GroupUsings(`
`134`	`134`	`FormattingContext context`
`135`	`135`	`)`
`136`	`136`	`{`
	`137`	`+ var globalSystemUsings = new List<UsingData>();`
`137`	`138`	`var globalUsings = new List<UsingData>();`
`138`	`139`	`var globalAliasUsings = new List<UsingData>();`
`139`	`140`	`var systemUsings = new List<UsingData>();`
`@@ -187,9 +188,18 @@ FormattingContext context`
`187`	`188`
`188`	`189`	`if (usingDirective.GlobalKeyword.RawSyntaxKind() != SyntaxKind.None)`
`189`	`190`	`{`
`190`		`- (usingDirective.Alias is not null ? globalAliasUsings : globalUsings).Add(`
`191`		`- usingData`
`192`		`- );`
	`191`	`+ if (usingDirective.Alias is not null)`
	`192`	`+ {`
	`193`	`+ globalAliasUsings.Add(usingData);`
	`194`	`+ }`
	`195`	`+ else if (usingDirective.Name is not null && IsSystemName(usingDirective.Name))`
	`196`	`+ {`
	`197`	`+ globalSystemUsings.Add(usingData);`
	`198`	`+ }`
	`199`	`+ else`
	`200`	`+ {`
	`201`	`+ globalUsings.Add(usingData);`
	`202`	`+ }`
`193`	`203`	`}`
`194`	`204`	`else if (usingDirective.StaticKeyword.RawSyntaxKind() != SyntaxKind.None)`
`195`	`205`	`{`
`@@ -214,6 +224,7 @@ FormattingContext context`
`214`	`224`	`}`
`215`	`225`	`}`
`216`	`226`
	`227`	`+ yield return globalSystemUsings.OrderBy(o => o.Using, Comparer).ToList();`
`217`	`228`	`yield return globalUsings.OrderBy(o => o.Using, Comparer).ToList();`
`218`	`229`	`yield return globalAliasUsings.OrderBy(o => o.Using, Comparer).ToList();`
`219`	`230`	`yield return systemUsings.OrderBy(o => o.Using, Comparer).ToList();`