simplify checks

dotnet · Jun 15, 2024 · df30535 · df30535
1 parent 0e9e49f
commit df30535
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/Analyzers/Core/Analyzers/PopulateSwitch/AbstractPopulateSwitchDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/PopulateSwitch/AbstractPopulateSwitchDiagnosticAnalyzer.cs
@@ -76,8 +76,15 @@ private void AnalyzeOperation(OperationAnalysisContext context)
 
     private bool SwitchIsIncomplete(
         TSwitchOperation operation,
-        out bool missingCases, out bool missingDefaultCase)
+        out bool missingCases,
+        out bool missingDefaultCase)
     {
+        missingCases = false;
+        missingDefaultCase = false;
+
+        if (HasExhaustiveNullAndTypeCheckCases(operation))
+            return false;
+
         if (!IsBooleanSwitch(operation, out missingCases, out missingDefaultCase))
         {
             var missingEnumMembers = GetMissingEnumMembers(operation);
@@ -86,13 +93,7 @@ private bool SwitchIsIncomplete(
             missingDefaultCase = !HasDefaultCase(operation);
         }
 
-        if (missingCases)
-            return true;
-
-        if (HasExhaustiveNullAndTypeCheckCases(operation))
-            return false;
-
-        return missingDefaultCase;
+        return missingCases || missingDefaultCase;
     }
 
     private bool IsBooleanSwitch(TSwitchOperation operation, out bool missingCases, out bool missingDefaultCase)