Uniformly treat const as (also) static and readonly

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1203ConstantsMustAppearBeforeFields.cs

@@ -82,8 +82,9 @@ private static void HandleTypeDeclaration(SyntaxNodeAnalysisContext context, Sty
                 }
 
                 AccessLevel currentAccessLevel = MemberOrderHelper.GetAccessLevelForOrdering(field, field.Modifiers);
-                bool currentFieldReadonly = field.Modifiers.Any(SyntaxKind.ReadOnlyKeyword);
-                bool currentFieldStatic = field.Modifiers.Any(SyntaxKind.StaticKeyword);
+                bool currentFieldConstant = field.Modifiers.Any(SyntaxKind.ConstKeyword);
+                bool currentFieldReadonly = currentFieldConstant || field.Modifiers.Any(SyntaxKind.ReadOnlyKeyword);
+                bool currentFieldStatic = currentFieldConstant || field.Modifiers.Any(SyntaxKind.StaticKeyword);
                 bool compareConst = true;
                 for (int j = 0; compareConst && j < constantIndex; j++)
                 {
@@ -123,8 +124,6 @@ private static void HandleTypeDeclaration(SyntaxNodeAnalysisContext context, Sty
                     }
                 }
 
-                bool currentFieldConstant = field.Modifiers.Any(SyntaxKind.ConstKeyword);
-
                 if (compareConst)
                 {
                     if (!previousFieldConstant && currentFieldConstant)

StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1204StaticElementsMustAppearBeforeInstanceElements.cs

@@ -115,13 +115,13 @@ private static void HandleMemberList(SyntaxNodeAnalysisContext context, Immutabl
             foreach (var member in members)
             {
                 var modifiers = member.GetModifiers();
-                var currentMemberStatic = modifiers.Any(SyntaxKind.StaticKeyword);
 
                 var currentSyntaxKind = member.Kind();
                 currentSyntaxKind = currentSyntaxKind == SyntaxKind.EventFieldDeclaration ? SyntaxKind.EventDeclaration : currentSyntaxKind;
                 var currentAccessLevel = MemberOrderHelper.GetAccessLevelForOrdering(member, modifiers);
                 bool currentMemberConstant = modifiers.Any(SyntaxKind.ConstKeyword);
-                bool currentMemberReadonly = modifiers.Any(SyntaxKind.ReadOnlyKeyword);
+                bool currentMemberReadonly = currentMemberConstant || modifiers.Any(SyntaxKind.ReadOnlyKeyword);
+                bool currentMemberStatic = currentMemberConstant || modifiers.Any(SyntaxKind.StaticKeyword);
                 bool compareStatic = true;
                 for (int j = 0; compareStatic && j < staticIndex; j++)
                 {

StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1214ReadonlyElementsMustAppearBeforeNonReadonlyElements.cs

@@ -81,8 +81,8 @@ private static void HandleTypeDeclaration(SyntaxNodeAnalysisContext context, Sty
                 var modifiers = member.GetModifiers();
                 var currentAccessLevel = MemberOrderHelper.GetAccessLevelForOrdering(member, modifiers);
                 bool currentFieldConst = modifiers.Any(SyntaxKind.ConstKeyword);
-                bool currentFieldStatic = modifiers.Any(SyntaxKind.StaticKeyword);
-                bool currentFieldReadonly = modifiers.Any(SyntaxKind.ReadOnlyKeyword);
+                bool currentFieldStatic = currentFieldConst || modifiers.Any(SyntaxKind.StaticKeyword);
+                bool currentFieldReadonly = currentFieldConst || modifiers.Any(SyntaxKind.ReadOnlyKeyword);
                 if (previousField == null)
                 {
                     previousField = field;