Simplify

dotnet · Dec 2, 2024 · 05b4a00 · 05b4a00
1 parent bb87c6f
commit 05b4a00
Showing 1 changed file with 14 additions and 20 deletions.
diff --git a/...UtilitiesAndExtensions/Compiler/CSharp/Utilities/TypeStyle/CSharpUseImplicitTypeHelper.cs b/...UtilitiesAndExtensions/Compiler/CSharp/Utilities/TypeStyle/CSharpUseImplicitTypeHelper.cs
@@ -46,30 +46,36 @@ public override TypeStyleResult AnalyzeTypeName(
 
     public override bool ShouldAnalyzeVariableDeclaration(VariableDeclarationSyntax variableDeclaration, CancellationToken cancellationToken)
     {
+        // If the type is already 'var' or 'ref var', this analyzer has no work to do
         var type = variableDeclaration.Type.StripRefIfNeeded();
         if (type.IsVar)
-        {
-            // If the type is already 'var' or 'ref var', this analyzer has no work to do
             return false;
-        }
 
         // The base analyzer may impose further limitations
         return base.ShouldAnalyzeVariableDeclaration(variableDeclaration, cancellationToken);
     }
 
     protected override bool ShouldAnalyzeForEachStatement(ForEachStatementSyntax forEachStatement, SemanticModel semanticModel, CancellationToken cancellationToken)
     {
-        var type = forEachStatement.Type;
-        if (type.IsVar || (type.Kind() == SyntaxKind.RefType && ((RefTypeSyntax)type).Type.IsVar))
-        {
-            // If the type is already 'var', this analyze has no work to do
+        // If the type is already 'var' or 'ref var', this analyzer has no work to do
+        var type = forEachStatement.Type.StripRefIfNeeded();
+        if (type.IsVar)
             return false;
-        }
 
         // The base analyzer may impose further limitations
         return base.ShouldAnalyzeForEachStatement(forEachStatement, semanticModel, cancellationToken);
     }
 
+    protected override bool ShouldAnalyzeDeclarationExpression(DeclarationExpressionSyntax declaration, SemanticModel semanticModel, CancellationToken cancellationToken)
+    {
+        // If the type is already 'var' or 'ref var', this analyzer has no work to do
+        if (declaration.Type.StripRefIfNeeded().IsVar)
+            return false;
+
+        // The base analyzer may impose further limitations
+        return base.ShouldAnalyzeDeclarationExpression(declaration, semanticModel, cancellationToken);
+    }
+
     protected override bool IsStylePreferred(in State state)
     {
         var stylePreferences = state.TypeStylePreference;
@@ -329,16 +335,4 @@ internal static ExpressionSyntax GetInitializerExpression(ExpressionSyntax initi
         current = (current as CheckedExpressionSyntax)?.Expression ?? current;
         return current.WalkDownParentheses();
     }
-
-    protected override bool ShouldAnalyzeDeclarationExpression(DeclarationExpressionSyntax declaration, SemanticModel semanticModel, CancellationToken cancellationToken)
-    {
-        if (declaration.Type.IsVar)
-        {
-            // If the type is already 'var', this analyze has no work to do
-            return false;
-        }
-
-        // The base analyzer may impose further limitations
-        return base.ShouldAnalyzeDeclarationExpression(declaration, semanticModel, cancellationToken);
-    }
 }