Sort by additional keywords

Fixes #8
craigktreasure · Oct 3, 2023 · 3b3929c · 3b3929c
1 parent 21045c0
commit 3b3929c
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 1 deletion.
diff --git a/src/MemberOrder/MemberOrder/MemberOrderAnalyzer.cs b/src/MemberOrder/MemberOrder/MemberOrderAnalyzer.cs
@@ -168,11 +168,21 @@ public static int GetSpecialKeywordOrder(MemberDeclarationSyntax member)
             return 0;
         }
 
-        if (member.Modifiers.Any(SyntaxKind.StaticKeyword))
+        if (member.Modifiers.Any(SyntaxKind.StaticKeyword) && member.Modifiers.Any(SyntaxKind.ReadOnlyKeyword))
         {
             return 1;
         }
 
+        if (member.Modifiers.Any(SyntaxKind.StaticKeyword))
+        {
+            return 2;
+        }
+
+        if (member.Modifiers.Any(SyntaxKind.ReadOnlyKeyword))
+        {
+            return 3;
+        }
+
         return 99;
     }
 

diff --git a/tests/MemberOrder/MemberOrder.CodeFixes.Tests/MemberOrderCodeFixProviderTests.cs b/tests/MemberOrder/MemberOrder.CodeFixes.Tests/MemberOrderCodeFixProviderTests.cs
@@ -63,15 +63,19 @@ public async Task CodeFix_FieldsOutOfSpecialKeywordOrder_Reordered()
         class MyClass
         {
             public int myPublicField;
+            public readonly int myPublicReadonlyField = 1;
             public static int myPublicStaticField;
+            public static readonly int myPublicStaticReadonlyField;
             public const int myPublicConstantField = 0;
         }";
 
         string fixtest = @"
         class MyClass
         {
             public const int myPublicConstantField = 0;
+            public static readonly int myPublicStaticReadonlyField;
             public static int myPublicStaticField;
+            public readonly int myPublicReadonlyField = 1;
             public int myPublicField;
         }";
 

diff --git a/tests/MemberOrder/MemberOrder.Tests/MemberOrderUnitTests.cs b/tests/MemberOrder/MemberOrder.Tests/MemberOrderUnitTests.cs
@@ -170,6 +170,40 @@ private void MyPrivateMethodB() { }
         await VerifyCS.VerifyAnalyzerAsync(test);
     }
 
+    [TestMethod]
+    public async Task Analyzer_Class_KeywordsInOrder_NoDiagnostics()
+    {
+        string test = @"
+        public class MyClass
+        {
+            // Fields
+            public const int myPublicConstantField = 0;
+            public static readonly int myPublicStaticReadonlyField;
+            public static int myPublicStaticField;
+            public readonly int myPublicReadonlyField = 1;
+            public int myPublicField;
+
+            // Properties
+            public static int MyPublicStaticProperty { get; set; }
+            public int MyPublicProperty { get; set; }
+
+            // Delegates
+            public delegate void MyPublicDelegate();
+
+            // Events and event fields
+            public static event MyPublicDelegate MyPublicStaticEvent { add { } remove { } }
+            public static event MyPublicDelegate MyPublicStaticEventField;
+            public event MyPublicDelegate MyPublicEvent { add { } remove { } }
+            public event MyPublicDelegate MyPublicEventField;
+
+            // Methods
+            public static void MyPublicStaticMethod() { }
+            public void MyPublicMethod() { }
+        }";
+
+        await VerifyCS.VerifyAnalyzerAsync(test);
+    }
+
     [TestMethod]
     public async Task Analyzer_Class_ConstructorBeforeIndexer_SingleDiagnostic()
     {