Fixed review notes.

src/Features/CSharp/Portable/Diagnostics/Analyzers/CSharpTypeStyleDiagnosticAnalyzerBase.cs

@@ -38,7 +38,7 @@ public override bool OpenFileOnly(Workspace workspace)
 
         protected override void InitializeWorker(AnalysisContext context)
             => context.RegisterSyntaxNodeAction(
-                HandleVariableDeclaration, SyntaxKind.VariableDeclaration, SyntaxKind.ForEachStatement, SyntaxKind.Argument);
+                HandleVariableDeclaration, SyntaxKind.VariableDeclaration, SyntaxKind.ForEachStatement, SyntaxKind.DeclarationExpression);
 
         protected abstract bool IsStylePreferred(SemanticModel semanticModel, OptionSet optionSet, State state, CancellationToken cancellationToken);
         protected abstract bool TryAnalyzeVariableDeclaration(TypeSyntax typeName, SemanticModel semanticModel, OptionSet optionSet, CancellationToken cancellationToken, out TextSpan issueSpan);
@@ -92,22 +92,17 @@ private void HandleVariableDeclaration(SyntaxNodeAnalysisContext context)
                     shouldAnalyze = IsStylePreferred(semanticModel, optionSet, state, cancellationToken);
                 }
             }
-            else if (declarationStatement.IsKind(SyntaxKind.Argument))
+            else if (declarationStatement.IsKind(SyntaxKind.DeclarationExpression))
             {
-                shouldAnalyze = false;
-                declaredType = null;
-
-                if ((declarationStatement as ArgumentSyntax)?.Expression is DeclarationExpressionSyntax declaration)
-                {
-                    declaredType = declaration.Type;
+                var declaration = (DeclarationExpressionSyntax) declarationStatement;
+                declaredType = declaration.Type;
 
-                    shouldAnalyze = ShouldAnalyzeDeclarationExpression(declaration, semanticModel, cancellationToken);
+                shouldAnalyze = ShouldAnalyzeDeclarationExpression(declaration, semanticModel, cancellationToken);
 
-                    if (shouldAnalyze)
-                    {
-                        state = State.Generate(declarationStatement, semanticModel, optionSet, isVariableDeclarationContext: false, cancellationToken: cancellationToken);
-                        shouldAnalyze = IsStylePreferred(semanticModel, optionSet, state, cancellationToken);
-                    }
+                if (shouldAnalyze)
+                {
+                    state = State.Generate(declarationStatement, semanticModel, optionSet, isVariableDeclarationContext: true, cancellationToken: cancellationToken);
+                    shouldAnalyze = IsStylePreferred(semanticModel, optionSet, state, cancellationToken);
                 }
             }
             else

src/Features/CSharp/Portable/Diagnostics/Analyzers/CSharpUseExplicitTypeDiagnosticAnalyzer.cs

@@ -154,7 +154,6 @@ protected override bool ShouldAnalyzeDeclarationExpression(DeclarationExpression
             }
 
             // The base analyzer may impose further limitations
-
             return base.ShouldAnalyzeDeclarationExpression(declaration, semanticModel, cancellationToken);
         }
     }

src/Features/CSharp/Portable/Diagnostics/Analyzers/CSharpUseImplicitTypeDiagnosticAnalyzer.cs

@@ -197,7 +197,6 @@ protected override bool ShouldAnalyzeDeclarationExpression(DeclarationExpression
             }
 
             // The base analyzer may impose further limitations
-
             return base.ShouldAnalyzeDeclarationExpression(declaration, semanticModel, cancellationToken);
         }
     }