Merge pull request #3733 from bjornhellander/feature/sa1119-switch-ex…

…pr-call Update SA1119 to allow parenthesized switch expressions followed by an invocation
DotNetAnalyzers · Nov 28, 2023 · 73f64f7 · 73f64f7
2 parents 081e2d0 + 8dd785a
commit 73f64f7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/....Analyzers/StyleCop.Analyzers.Test.CSharp8/MaintainabilityRules/SA1119CSharp8UnitTests.cs b/....Analyzers/StyleCop.Analyzers.Test.CSharp8/MaintainabilityRules/SA1119CSharp8UnitTests.cs
@@ -219,6 +219,25 @@ public unsafe string TestMethod(int n, byte* a, byte* b)
             await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        [WorkItem(3730, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3730")]
+        public async Task TestSwitchExpressionFollowedByInvocationAsync()
+        {
+            string testCode = @"
+using System;
+
+public class Foo
+{
+    public string TestMethod(int n, Func<string> a, Func<string> b)
+    {
+        return (n switch { 1 => a, 2 => b })();
+    }
+}
+";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestStackAllocExpressionInExpressionAsync()
         {

diff --git a/...tyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs b/...tyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs
@@ -239,6 +239,7 @@ private static bool IsSwitchOrWithExpressionWithRequiredParentheses(Parenthesize
                 MemberAccessExpressionSyntax memberAccessExpression => memberAccessExpression.Expression == outerExpression,
                 ConditionalAccessExpressionSyntax conditionalAccessExpression => conditionalAccessExpression.Expression == outerExpression,
                 ElementAccessExpressionSyntax elementAccessExpression => elementAccessExpression.Expression == outerExpression,
+                InvocationExpressionSyntax invocationExpression => invocationExpression.Expression == outerExpression,
                 _ => false,
             };
         }