#3289 Apply code-review suggestions/comments (renaming method, improving conditions)

Author: wdolek

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1130CodeFixProvider.cs

@@ -174,7 +174,7 @@ private static ImmutableArray<string> GetMethodInvocationArgumentList(SemanticMo
             var originalInvocableExpression = argumentListSyntax.Parent;
 
             var originalSymbolInfo = semanticModel.GetSymbolInfo(originalInvocableExpression);
-            var argumentIndex = SA1130UseLambdaSyntax.FindArgumentIndex(originalSymbolInfo, argumentSyntax, argumentListSyntax);
+            var argumentIndex = SA1130UseLambdaSyntax.FindParameterIndex(originalSymbolInfo, argumentSyntax, argumentListSyntax);
             var parameterList = SA1130UseLambdaSyntax.GetDelegateParameterList(originalSymbolInfo.Symbol, argumentIndex);
             return parameterList.Parameters.Select(p => p.Identifier.ToString()).ToImmutableArray();
         }

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1130UseLambdaSyntax.cs

@@ -96,12 +96,11 @@ internal static ParameterListSyntax GetDelegateParameterList(ISymbol symbol, int
             return SyntaxFactory.ParameterList(SyntaxFactory.SeparatedList(syntaxParameters));
         }
 
-        internal static int FindArgumentIndex(SymbolInfo originalSymbolInfo, ArgumentSyntax argumentSyntax, BaseArgumentListSyntax argumentListSyntax)
+        internal static int FindParameterIndex(SymbolInfo originalSymbolInfo, ArgumentSyntax argumentSyntax, BaseArgumentListSyntax argumentListSyntax)
         {
             // if delegate is passed as named argument of method try to find its position by argument name
-            if (originalSymbolInfo.Symbol.Kind == SymbolKind.Method
-                && originalSymbolInfo.Symbol is IMethodSymbol methodSymbol
-                && argumentSyntax.NameColon != null)
+            if (argumentSyntax.NameColon != null
+                && originalSymbolInfo.Symbol is IMethodSymbol methodSymbol)
             {
                 var calledMethodParameters = methodSymbol.Parameters;
                 var argumentIdentifier = argumentSyntax.NameColon.Name.Identifier.ValueText;
@@ -160,7 +159,7 @@ private static bool HandleMethodInvocation(SemanticModel semanticModel, Anonymou
                     return false;
                 }
 
-                var argumentIndex = FindArgumentIndex(originalSymbolInfo, argumentSyntax, argumentListSyntax);
+                var argumentIndex = FindParameterIndex(originalSymbolInfo, argumentSyntax, argumentListSyntax);
 
                 // Determine the parameter list from the method that is invoked, as delegates without parameters are allowed, but they cannot be replaced by a lambda without parameters.
                 var parameterList = GetDelegateParameterList(originalSymbolInfo.Symbol, argumentIndex);