Addressed CR feedback.

Author: bexxx

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/OrderingRules/SA1206CodeFixProvider.cs

@@ -3,6 +3,7 @@
 
 namespace StyleCop.Analyzers.OrderingRules
 {
+    using System;
     using System.Collections.Generic;
     using System.Collections.Immutable;
     using System.Composition;
@@ -161,9 +162,8 @@ private class FixAll : DocumentBasedFixAllProvider
 
             protected override string CodeActionTitle => OrderingResources.ModifierOrderCodeFix;
 
-            protected override async Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document)
+            protected override async Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
             {
-                var diagnostics = await fixAllContext.GetDocumentDiagnosticsAsync(document).ConfigureAwait(false);
                 if (diagnostics.IsEmpty)
                 {
                     return null;

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/DeclarationModifiersHelper.cs

@@ -129,50 +129,50 @@ internal static SyntaxNode WithModifiers(this SyntaxNode node, SyntaxTokenList m
         {
             switch (node.Kind())
             {
-                case SyntaxKind.MethodDeclaration:
-                    return ((MethodDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.MethodDeclaration:
+                return ((MethodDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.ConstructorDeclaration:
-                    return ((ConstructorDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.ConstructorDeclaration:
+                return ((ConstructorDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.OperatorDeclaration:
-                    return ((OperatorDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.OperatorDeclaration:
+                return ((OperatorDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.ConversionOperatorDeclaration:
-                    return ((ConversionOperatorDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.ConversionOperatorDeclaration:
+                return ((ConversionOperatorDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.PropertyDeclaration:
-                    return ((PropertyDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.PropertyDeclaration:
+                return ((PropertyDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.EventDeclaration:
-                    return ((EventDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.EventDeclaration:
+                return ((EventDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.IndexerDeclaration:
-                    return ((IndexerDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.IndexerDeclaration:
+                return ((IndexerDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.ClassDeclaration:
-                    return ((ClassDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.ClassDeclaration:
+                return ((ClassDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.StructDeclaration:
-                    return ((StructDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.StructDeclaration:
+                return ((StructDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.InterfaceDeclaration:
-                    return ((InterfaceDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.InterfaceDeclaration:
+                return ((InterfaceDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.EnumDeclaration:
-                    return ((EnumDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.EnumDeclaration:
+                return ((EnumDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.DelegateDeclaration:
-                    return ((DelegateDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.DelegateDeclaration:
+                return ((DelegateDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.FieldDeclaration:
-                    return ((FieldDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.FieldDeclaration:
+                return ((FieldDeclarationSyntax)node).WithModifiers(modifiers);
 
-                case SyntaxKind.EventFieldDeclaration:
-                    return ((EventFieldDeclarationSyntax)node).WithModifiers(modifiers);
+            case SyntaxKind.EventFieldDeclaration:
+                return ((EventFieldDeclarationSyntax)node).WithModifiers(modifiers);
 
-                default:
-                    return node;
+            default:
+                return node;
             }
         }
     }

StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1206DeclarationKeywordsMustFollowOrder.cs

@@ -5,6 +5,7 @@ namespace StyleCop.Analyzers.OrderingRules
 {
     using System;
     using System.Collections.Immutable;
+    using Helpers;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -79,48 +80,10 @@ public override void Initialize(AnalysisContext context)
 
         private static void HandleDeclaration(SyntaxNodeAnalysisContext context)
         {
-            var modifiers = GetModifiersFromDeclaration(context.Node);
+            var modifiers = DeclarationModifiersHelper.GetModifiers(context.Node as MemberDeclarationSyntax);
             CheckModifiersOrderAndReportDiagnostics(context, modifiers);
         }
 
-        // TODO: Can this be merged with DeclarationModifiersHelper.GetModifiersFromDeclaration?
-        private static SyntaxTokenList GetModifiersFromDeclaration(SyntaxNode node)
-        {
-            SyntaxTokenList result = default(SyntaxTokenList);
-
-            switch (node.Kind())
-            {
-                case SyntaxKind.ClassDeclaration:
-                case SyntaxKind.StructDeclaration:
-                case SyntaxKind.InterfaceDeclaration:
-                    result = ((BaseTypeDeclarationSyntax)node).Modifiers;
-                    break;
-                case SyntaxKind.EnumDeclaration:
-                    result = ((EnumDeclarationSyntax)node).Modifiers;
-                    break;
-                case SyntaxKind.DelegateDeclaration:
-                    result = ((DelegateDeclarationSyntax)node).Modifiers;
-                    break;
-                case SyntaxKind.FieldDeclaration:
-                case SyntaxKind.EventFieldDeclaration:
-                    result = ((BaseFieldDeclarationSyntax)node).Modifiers;
-                    break;
-                case SyntaxKind.PropertyDeclaration:
-                case SyntaxKind.EventDeclaration:
-                case SyntaxKind.IndexerDeclaration:
-                    result = ((BasePropertyDeclarationSyntax)node).Modifiers;
-                    break;
-                case SyntaxKind.MethodDeclaration:
-                case SyntaxKind.ConstructorDeclaration:
-                case SyntaxKind.OperatorDeclaration:
-                case SyntaxKind.ConversionOperatorDeclaration:
-                    result = ((BaseMethodDeclarationSyntax)node).Modifiers;
-                    break;
-            }
-
-            return result;
-        }
-
         private static void CheckModifiersOrderAndReportDiagnostics(SyntaxNodeAnalysisContext context, SyntaxTokenList modifiers)
         {
             var previousModifierType = ModifierType.None;