Sort static system usings above other static usings (#1174)

belav · web-flow · commit c81a5ea44d31 · 2024-02-17T11:12:34.000-06:00
* Sort static system usings above other static usings closes #1162 * formatting files
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsStaticSystemToTop.expected.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsStaticSystemToTop.expected.test
@@ -0,0 +1,4 @@
+using static System;
+using static System.Web;
+using static AWord;
+using static ZWord;
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsStaticSystemToTop.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives_SortsStaticSystemToTop.test
@@ -0,0 +1,4 @@
+using static ZWord;
+using static AWord;
+using static System.Web;
+using static System;
diff --git a/Src/CSharpier/SyntaxPrinter/UsingDirectives.cs b/Src/CSharpier/SyntaxPrinter/UsingDirectives.cs
@@ -140,6 +140,7 @@ FormattingContext context
         var systemUsings = new List<UsingData>();
         var aliasNameUsings = new List<UsingData>();
         var regularUsings = new List<UsingData>();
+        var staticSystemUsings = new List<UsingData>();
         var staticUsings = new List<UsingData>();
         var aliasUsings = new List<UsingData>();
         var directiveGroup = new List<UsingData>();
@@ -203,7 +204,14 @@ FormattingContext context
                 }
                 else if (usingDirective.StaticKeyword.RawSyntaxKind() != SyntaxKind.None)
                 {
-                    staticUsings.Add(usingData);
+                    if (usingDirective.Name is not null && IsSystemName(usingDirective.Name))
+                    {
+                        staticSystemUsings.Add(usingData);
+                    }
+                    else
+                    {
+                        staticUsings.Add(usingData);
+                    }
                 }
                 else if (usingDirective.Alias is not null)
                 {
@@ -230,6 +238,7 @@ FormattingContext context
         yield return systemUsings.OrderBy(o => o.Using, Comparer).ToList();
         yield return aliasNameUsings.OrderBy(o => o.Using, Comparer).ToList();
         yield return regularUsings.OrderBy(o => o.Using, Comparer).ToList();
+        yield return staticSystemUsings.OrderBy(o => o.Using, Comparer).ToList();
         yield return staticUsings.OrderBy(o => o.Using, Comparer).ToList();
         yield return aliasUsings.OrderBy(o => o.Using, Comparer).ToList();
         // we need the directive groups at the end, the #endif directive
