Merge pull request #3158 from dymanoid/sa1008-tuple-parameter-attribute

Fix SA1008 for attributed tuple parameters

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/SpacingRules/SA1008CSharp7UnitTests.cs

@@ -978,5 +978,65 @@ public void TestMethod(params (string name, string value)[] options)
 
             await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(3117, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3117")]
+        public async Task TestTupleParameterAttributesAsync()
+        {
+            var testCode = @"
+namespace TestNamespace
+{
+    class NotNullAttribute : System.Attribute { }
+    class CustomAttribute : System.Attribute { }
+
+    class TestClass
+    {
+        void TestMethod1([NotNull] (string, string) tuple) { }
+
+        void TestMethod2([NotNull, Custom] (string, string) tuple) { }
+
+        void TestMethod3([NotNull][Custom] (string, string) tuple) { }
+
+        void TestMethod4([NotNull]{|#0:(|}string, string) tuple) { }
+
+        void TestMethod5([NotNull, Custom]{|#1:(|}string, string) tuple) { }
+
+        void TestMethod6([NotNull][Custom]{|#2:(|}string, string) tuple) { }
+    }
+}
+";
+
+            var fixedCode = @"
+namespace TestNamespace
+{
+    class NotNullAttribute : System.Attribute { }
+    class CustomAttribute : System.Attribute { }
+
+    class TestClass
+    {
+        void TestMethod1([NotNull] (string, string) tuple) { }
+
+        void TestMethod2([NotNull, Custom] (string, string) tuple) { }
+
+        void TestMethod3([NotNull][Custom] (string, string) tuple) { }
+
+        void TestMethod4([NotNull] (string, string) tuple) { }
+
+        void TestMethod5([NotNull, Custom] (string, string) tuple) { }
+
+        void TestMethod6([NotNull][Custom] (string, string) tuple) { }
+    }
+}
+";
+
+            DiagnosticResult[] expectedDiagnostics =
+            {
+                Diagnostic(DescriptorPreceded).WithLocation(0),
+                Diagnostic(DescriptorPreceded).WithLocation(1),
+                Diagnostic(DescriptorPreceded).WithLocation(2),
+            };
+
+            await VerifyCSharpFixAsync(testCode, expectedDiagnostics, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1008OpeningParenthesisMustBeSpacedCorrectly.cs

@@ -233,9 +233,11 @@ private static void HandleOpenParenToken(SyntaxTreeAnalysisContext context, Synt
             case SyntaxKindEx.TupleType:
                 // Comma covers tuple types in parameters and nested within other tuple types.
                 // 'out', 'ref', 'in', 'params' parameters are covered by IsKeywordKind.
+                // Attributes of parameters are covered by checking the previous token's parent.
                 // Return types are handled by a helper.
                 haveLeadingSpace = prevToken.IsKind(SyntaxKind.CommaToken)
                     || SyntaxFacts.IsKeywordKind(prevToken.Kind())
+                    || prevToken.Parent.IsKind(SyntaxKind.AttributeList)
                     || ((TypeSyntax)token.Parent).GetContainingNotEnclosingType().IsReturnType();
                 break;
             }