Fixed evaluating default cases in switches for enums

=> release
sundews · Mar 6, 2024 · 067a403 · 067a403
1 parent c15da01
commit 067a403
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 35 deletions.
diff --git a/Source/Sundew.DiscriminatedUnions.Analyzer/SwitchExpression/UnionSwitchExpressionAnalyzer.cs b/Source/Sundew.DiscriminatedUnions.Analyzer/SwitchExpression/UnionSwitchExpressionAnalyzer.cs
@@ -38,7 +38,8 @@ public void Analyze(OperationAnalysisContext operationAnalysisContext)
             nullCase != null);
 
         if (switchExpressionOperation.Arms
-                .SingleOrDefault(x => x.Pattern is IDiscardPatternOperation) is { } switchExpressionArmOperation)
+                .SingleOrDefault(x => x.Pattern is IDiscardPatternOperation) is { } switchExpressionArmOperation
+            && nonNullableUnionType.TypeKind != TypeKind.Enum)
         {
             operationAnalysisContext.ReportDiagnostic(Diagnostic.Create(
                 DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule,

diff --git a/Source/Sundew.DiscriminatedUnions.Analyzer/SwitchStatement/UnionSwitchStatementAnalyzer.cs b/Source/Sundew.DiscriminatedUnions.Analyzer/SwitchStatement/UnionSwitchStatementAnalyzer.cs
@@ -40,10 +40,13 @@ public void Analyze(OperationAnalysisContext operationAnalysisContext)
         {
             if (CanSwitchReachEnd(switchOperation))
             {
-                operationAnalysisContext.ReportDiagnostic(Diagnostic.Create(
-                    DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule,
-                    defaultSwitchCaseOperation.Syntax.GetLocation(),
-                    nonNullableUnionType));
+                if (nonNullableUnionType.TypeKind != TypeKind.Enum)
+                {
+                    operationAnalysisContext.ReportDiagnostic(Diagnostic.Create(
+                        DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule,
+                        defaultSwitchCaseOperation.Syntax.GetLocation(),
+                        nonNullableUnionType));
+                }
             }
             else
             {

diff --git a/Source/Sundew.DiscriminatedUnions.Tester/Program.cs b/Source/Sundew.DiscriminatedUnions.Tester/Program.cs
@@ -9,7 +9,6 @@ namespace Sundew.DiscriminatedUnions.Tester;
 
 using System;
 using System.Collections.Generic;
-using System.Net.Mail;
 using TestData;
 
 public static class Program

diff --git a/...undew.DiscriminatedUnions.Tests/SwitchExpression/Enums/AllCasesNotHandledAnalyzerTests.cs b/...undew.DiscriminatedUnions.Tests/SwitchExpression/Enums/AllCasesNotHandledAnalyzerTests.cs
@@ -45,10 +45,7 @@ await VerifyCS.VerifyAnalyzerAsync(
             test,
             VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchAllCasesNotHandledRule)
                 .WithArguments("'On', 'Off'", Resources.Cases, TestData.UnionsState, Resources.Are)
-                .WithSpan(17, 16, 21, 14),
-            VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule)
-                .WithArguments(TestData.UnionsState)
-                .WithSpan(20, 17, 20, 27));
+                .WithSpan(17, 16, 21, 14));
     }
 
     [TestMethod]

diff --git a/...minatedUnions.Tests/SwitchExpression/Enums/SwitchShouldNotHaveDefaultCaseAnalyzerTests.cs b/...minatedUnions.Tests/SwitchExpression/Enums/SwitchShouldNotHaveDefaultCaseAnalyzerTests.cs
@@ -20,7 +20,7 @@ namespace Sundew.DiscriminatedUnions.Tests.SwitchExpression.Enums;
 public class SwitchShouldNotHaveDefaultCaseAnalyzerTests
 {
     [TestMethod]
-    public async Task Given_SwitchExpression_When_DefaultCaseIsHandled_Then_SwitchShouldNotHaveDefaultCaseIsReported()
+    public async Task Given_SwitchExpression_When_DefaultCaseIsHandled_Then_SwitchShouldNotReportAnyDiagnostics()
     {
         var test = $@"#nullable enable
 {TestData.Usings}
@@ -43,10 +43,6 @@ public bool Switch(State state)
 {TestData.ValidEnumUnion}
 ";
 
-        await VerifyCS.VerifyAnalyzerAsync(
-            test,
-            VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule)
-                .WithArguments(TestData.UnionsState)
-                .WithSpan(23, 17, 23, 27));
+        await VerifyCS.VerifyAnalyzerAsync(test);
     }
 }
diff --git a/...Sundew.DiscriminatedUnions.Tests/SwitchStatement/Enums/AllCasesNotHandledAnalyzerTests.cs b/...Sundew.DiscriminatedUnions.Tests/SwitchStatement/Enums/AllCasesNotHandledAnalyzerTests.cs
@@ -75,9 +75,6 @@ await VerifyCS.VerifyAnalyzerAsync(
             test,
             VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchAllCasesNotHandledRule)
                 .WithArguments("'None', 'Off'", Resources.Cases, TestData.UnionsState, Resources.Are)
-                .WithSpan(17, 9, 23, 10),
-            VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule)
-                .WithArguments(TestData.UnionsState)
-                .WithSpan(21, 13, 22, 23));
+                .WithSpan(17, 9, 23, 10));
     }
 }
diff --git a/...iminatedUnions.Tests/SwitchStatement/Enums/SwitchShouldNotHaveDefaultCaseAnalyzerTests.cs b/...iminatedUnions.Tests/SwitchStatement/Enums/SwitchShouldNotHaveDefaultCaseAnalyzerTests.cs
@@ -20,7 +20,7 @@ namespace Sundew.DiscriminatedUnions.Tests.SwitchStatement.Enums;
 public class SwitchShouldNotHaveDefaultCaseAnalyzerTests
 {
     [TestMethod]
-    public async Task Given_SwitchStatement_When_DefaultCaseIsHandled_Then_SwitchShouldNotHaveDefaultCaseIsReported()
+    public async Task Given_SwitchStatement_When_DefaultCaseIsHandled_Then_SwitchShouldNotReportAnyDiagnostics()
     {
         var test = $@"#nullable enable
 {TestData.Usings}
@@ -47,15 +47,11 @@ public void Switch(State state)
 {TestData.ValidEnumUnion}
 ";
 
-        await VerifyCS.VerifyAnalyzerAsync(
-            test,
-            VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule)
-                .WithArguments(TestData.UnionsState)
-                .WithSpan(26, 13, 27, 23));
+        await VerifyCS.VerifyAnalyzerAsync(test);
     }
 
     [TestMethod]
-    public async Task Given_SwitchStatement_When_ValueMayBeNullAndDefaultCaseIsHandled_Then_SwitchShouldNotHaveDefaultCaseIsReported()
+    public async Task Given_SwitchStatement_When_ValueMayBeNullAndDefaultCaseIsHandled_Then_SwitchNotAllCasesAreHandledIsReported()
     {
         var test = $@"{TestData.Usings}
 
@@ -83,17 +79,14 @@ public void Switch(State? state)
 
         await VerifyCS.VerifyAnalyzerAsync(
             test,
-            VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule)
-                .WithArguments(TestData.UnionsState)
-                .WithSpan(25, 13, 26, 23),
             VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchAllCasesNotHandledRule)
                 .WithArguments("'null'", Resources.Case, TestData.UnionsState + '?', Resources.Is)
                 .WithSpan(17, 9, 27, 10));
     }
 
     [TestMethod]
     public async Task
-        Given_SwitchStatement_When_DefaultCaseIsHandledAndNotAllCasesAreHandled_Then_AllCasesNotHandledAndSwitchShouldNotHaveDefaultCaseAreReported()
+        Given_SwitchStatement_When_DefaultCaseIsHandledAndNotAllCasesAreHandled_Then_AllCasesNotHandledIsReported()
     {
         var test = $@"{TestData.Usings}
 
@@ -119,9 +112,6 @@ await VerifyCS.VerifyAnalyzerAsync(
             test,
             VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchAllCasesNotHandledRule)
                 .WithArguments("'On', 'Off'", Resources.Cases, TestData.UnionsState, Resources.Are)
-                .WithSpan(17, 9, 23, 10),
-            VerifyCS.Diagnostic(DiscriminatedUnionsAnalyzer.SwitchShouldNotHaveDefaultCaseRule)
-                .WithArguments(TestData.UnionsState)
-                .WithSpan(21, 13, 22, 23));
+                .WithSpan(17, 9, 23, 10));
     }
 }