Merge pull request #1739 from sharwell/sa1113-cleanup

SA1113 cleanup

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1113CommaMustBeOnSameLineAsPreviousParameter.cs

@@ -50,12 +50,17 @@ internal class SA1113CommaMustBeOnSameLineAsPreviousParameter : DiagnosticAnalyz
         private static readonly DiagnosticDescriptor Descriptor =
             new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.ReadabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
 
+        private static readonly ImmutableArray<SyntaxKind> BaseMethodDeclarationKinds =
+            ImmutableArray.Create(
+                SyntaxKind.MethodDeclaration,
+                SyntaxKind.ConstructorDeclaration,
+                SyntaxKind.OperatorDeclaration);
+
         private static readonly ImmutableArray<SyntaxKind> ConstructorInitializerKinds =
             ImmutableArray.Create(SyntaxKind.BaseConstructorInitializer, SyntaxKind.ThisConstructorInitializer);
 
         private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
-        private static readonly Action<SyntaxNodeAnalysisContext> MethodDeclarationAction = HandleMethodDeclaration;
-        private static readonly Action<SyntaxNodeAnalysisContext> ConstructorDeclarationAction = HandleConstructorDeclaration;
+        private static readonly Action<SyntaxNodeAnalysisContext> BaseMethodDeclarationAction = HandleBaseMethodDeclaration;
         private static readonly Action<SyntaxNodeAnalysisContext> InvocationExpressionAction = HandleInvocationExpression;
         private static readonly Action<SyntaxNodeAnalysisContext> ObjectCreationExpressionAction = HandleObjectCreationExpression;
         private static readonly Action<SyntaxNodeAnalysisContext> IndexerDeclarationAction = HandleIndexerDeclaration;
@@ -65,7 +70,6 @@ internal class SA1113CommaMustBeOnSameLineAsPreviousParameter : DiagnosticAnalyz
         private static readonly Action<SyntaxNodeAnalysisContext> ParenthesizedLambdaExpressionAction = HandleParenthesizedLambdaExpression;
         private static readonly Action<SyntaxNodeAnalysisContext> AttributeAction = HandleAttribute;
         private static readonly Action<SyntaxNodeAnalysisContext> AttributeListAction = HandleAttributeList;
-        private static readonly Action<SyntaxNodeAnalysisContext> OperatorDeclarationAction = HandleOperatorDeclaration;
         private static readonly Action<SyntaxNodeAnalysisContext> ArrayCreationExpressionAction = HandleArrayCreationExpression;
         private static readonly Action<SyntaxNodeAnalysisContext> ConstructorInitializerAction = HandleConstructorInitializer;
 
@@ -81,8 +85,7 @@ public override void Initialize(AnalysisContext context)
 
         private static void HandleCompilationStart(CompilationStartAnalysisContext context)
         {
-            context.RegisterSyntaxNodeActionHonorExclusions(MethodDeclarationAction, SyntaxKind.MethodDeclaration);
-            context.RegisterSyntaxNodeActionHonorExclusions(ConstructorDeclarationAction, SyntaxKind.ConstructorDeclaration);
+            context.RegisterSyntaxNodeActionHonorExclusions(BaseMethodDeclarationAction, BaseMethodDeclarationKinds);
             context.RegisterSyntaxNodeActionHonorExclusions(InvocationExpressionAction, SyntaxKind.InvocationExpression);
             context.RegisterSyntaxNodeActionHonorExclusions(ObjectCreationExpressionAction, SyntaxKind.ObjectCreationExpression);
             context.RegisterSyntaxNodeActionHonorExclusions(IndexerDeclarationAction, SyntaxKind.IndexerDeclaration);
@@ -92,21 +95,20 @@ private static void HandleCompilationStart(CompilationStartAnalysisContext conte
             context.RegisterSyntaxNodeActionHonorExclusions(ParenthesizedLambdaExpressionAction, SyntaxKind.ParenthesizedLambdaExpression);
             context.RegisterSyntaxNodeActionHonorExclusions(AttributeAction, SyntaxKind.Attribute);
             context.RegisterSyntaxNodeActionHonorExclusions(AttributeListAction, SyntaxKind.AttributeList);
-            context.RegisterSyntaxNodeActionHonorExclusions(OperatorDeclarationAction, SyntaxKind.OperatorDeclaration);
             context.RegisterSyntaxNodeActionHonorExclusions(ArrayCreationExpressionAction, SyntaxKind.ArrayCreationExpression);
             context.RegisterSyntaxNodeActionHonorExclusions(ConstructorInitializerAction, ConstructorInitializerKinds);
         }
 
         private static void HandleArrayCreationExpression(SyntaxNodeAnalysisContext context)
         {
-            var arrayCreation = (ArrayCreationExpressionSyntax)context.Node;
+            var arrayCreationExpression = (ArrayCreationExpressionSyntax)context.Node;
 
-            if (arrayCreation.Type == null)
+            if (arrayCreationExpression.Type == null)
             {
                 return;
             }
 
-            foreach (var arrayRankSpecifierSyntax in arrayCreation.Type.RankSpecifiers)
+            foreach (var arrayRankSpecifierSyntax in arrayCreationExpression.Type.RankSpecifiers)
             {
                 var sizes = arrayRankSpecifierSyntax.Sizes;
                 if (sizes.Count < 2)
@@ -121,12 +123,6 @@ private static void HandleArrayCreationExpression(SyntaxNodeAnalysisContext cont
             }
         }
 
-        private static void HandleOperatorDeclaration(SyntaxNodeAnalysisContext context)
-        {
-            var operatorDeclaration = (OperatorDeclarationSyntax)context.Node;
-            HandleBaseParameterListSyntax(context, operatorDeclaration.ParameterList);
-        }
-
         private static void HandleAttributeList(SyntaxNodeAnalysisContext context)
         {
             var attributeList = (AttributeListSyntax)context.Node;
@@ -158,8 +154,8 @@ private static void HandleAttribute(SyntaxNodeAnalysisContext context)
 
         private static void HandleParenthesizedLambdaExpression(SyntaxNodeAnalysisContext context)
         {
-            var lambdaExpression = (ParenthesizedLambdaExpressionSyntax)context.Node;
-            HandleBaseParameterListSyntax(context, lambdaExpression.ParameterList);
+            var parenthesizedLambdaExpression = (ParenthesizedLambdaExpressionSyntax)context.Node;
+            HandleBaseParameterListSyntax(context, parenthesizedLambdaExpression.ParameterList);
         }
 
         private static void HandleDelegateDeclaration(SyntaxNodeAnalysisContext context)
@@ -170,26 +166,26 @@ private static void HandleDelegateDeclaration(SyntaxNodeAnalysisContext context)
 
         private static void HandleAnonymousMethodExpression(SyntaxNodeAnalysisContext context)
         {
-            var anonymousMethod = (AnonymousMethodExpressionSyntax)context.Node;
-            HandleBaseParameterListSyntax(context, anonymousMethod.ParameterList);
+            var anonymousMethodExpression = (AnonymousMethodExpressionSyntax)context.Node;
+            HandleBaseParameterListSyntax(context, anonymousMethodExpression.ParameterList);
         }
 
         private static void HandleElementAccessExpression(SyntaxNodeAnalysisContext context)
         {
-            var elementAccess = (ElementAccessExpressionSyntax)context.Node;
-            HandleBaseArgumentListSyntax(context, elementAccess.ArgumentList);
+            var elementAccessExpression = (ElementAccessExpressionSyntax)context.Node;
+            HandleBaseArgumentListSyntax(context, elementAccessExpression.ArgumentList);
         }
 
         private static void HandleIndexerDeclaration(SyntaxNodeAnalysisContext context)
         {
-            var constructorDeclaration = (IndexerDeclarationSyntax)context.Node;
-            HandleBaseParameterListSyntax(context, constructorDeclaration.ParameterList);
+            var indexerDeclaration = (IndexerDeclarationSyntax)context.Node;
+            HandleBaseParameterListSyntax(context, indexerDeclaration.ParameterList);
         }
 
         private static void HandleObjectCreationExpression(SyntaxNodeAnalysisContext context)
         {
-            var invocationEpression = (ObjectCreationExpressionSyntax)context.Node;
-            HandleBaseArgumentListSyntax(context, invocationEpression.ArgumentList);
+            var objectCreationExpression = (ObjectCreationExpressionSyntax)context.Node;
+            HandleBaseArgumentListSyntax(context, objectCreationExpression.ArgumentList);
         }
 
         private static void HandleInvocationExpression(SyntaxNodeAnalysisContext context)
@@ -198,16 +194,10 @@ private static void HandleInvocationExpression(SyntaxNodeAnalysisContext context
             HandleBaseArgumentListSyntax(context, invocationEpression.ArgumentList);
         }
 
-        private static void HandleConstructorDeclaration(SyntaxNodeAnalysisContext context)
-        {
-            var constructorDeclaration = (ConstructorDeclarationSyntax)context.Node;
-            HandleBaseParameterListSyntax(context, constructorDeclaration.ParameterList);
-        }
-
-        private static void HandleMethodDeclaration(SyntaxNodeAnalysisContext context)
+        private static void HandleBaseMethodDeclaration(SyntaxNodeAnalysisContext context)
         {
-            var methodDeclaration = (MethodDeclarationSyntax)context.Node;
-            HandleBaseParameterListSyntax(context, methodDeclaration.ParameterList);
+            var baseMethodDeclaration = (BaseMethodDeclarationSyntax)context.Node;
+            HandleBaseParameterListSyntax(context, baseMethodDeclaration.ParameterList);
         }
 
         private static void HandleConstructorInitializer(SyntaxNodeAnalysisContext context)