Merge pull request #3495 from bjornhellander/feature/tupleor

Updated SA1008 to handle tuples in logical patterns
DotNetAnalyzers · May 3, 2022 · 16b00dc · 16b00dc
2 parents e017492 + 7490969
commit 16b00dc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/SpacingRules/SA1008CSharp9UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/SpacingRules/SA1008CSharp9UnitTests.cs
@@ -64,5 +64,23 @@ void Method(int b)
                 FixedCode = fixedCode,
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(3476, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3476")]
+        public async Task TestLogicalTuplePatternAsync()
+        {
+            const string testCode = @"
+class C
+{
+    void Method((int, int) c)
+    {
+        _ = c is (1, 1) or (2, 2);
+        _ = c is (1, 1) and (1, 1);
+        _ = c is not (2, 2);
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs
@@ -11,6 +11,9 @@ internal static class SyntaxKindEx
     {
         public const SyntaxKind DotDotToken = (SyntaxKind)8222;
         public const SyntaxKind QuestionQuestionEqualsToken = (SyntaxKind)8284;
+        public const SyntaxKind OrKeyword = (SyntaxKind)8438;
+        public const SyntaxKind AndKeyword = (SyntaxKind)8439;
+        public const SyntaxKind NotKeyword = (SyntaxKind)8440;
         public const SyntaxKind ManagedKeyword = (SyntaxKind)8445;
         public const SyntaxKind UnmanagedKeyword = (SyntaxKind)8446;
         public const SyntaxKind NullableKeyword = (SyntaxKind)8486;

diff --git a/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1008OpeningParenthesisMustBeSpacedCorrectly.cs b/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1008OpeningParenthesisMustBeSpacedCorrectly.cs
@@ -188,6 +188,9 @@ private static void HandleOpenParenToken(SyntaxTreeAnalysisContext context, Synt
 
             case SyntaxKindEx.PositionalPatternClause:
                 haveLeadingSpace = prevToken.IsKind(SyntaxKind.IsKeyword)
+                    || prevToken.IsKind(SyntaxKindEx.OrKeyword)
+                    || prevToken.IsKind(SyntaxKindEx.AndKeyword)
+                    || prevToken.IsKind(SyntaxKindEx.NotKeyword)
                     || prevToken.IsKind(SyntaxKind.CommaToken);
                 break;