Processed review comments

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1133CodeFixProvider.cs

@@ -51,7 +51,7 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
         private static async Task<Document> GetTransformedDocumentAsync(Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
         {
             var syntaxRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-            var violatingAttribute = (AttributeSyntax)syntaxRoot.FindNode(diagnostic.Location.SourceSpan);
+            var violatingAttribute = (AttributeSyntax)syntaxRoot.FindNode(diagnostic.Location.SourceSpan).Parent;
             var attributeList = (AttributeListSyntax)violatingAttribute.Parent;
             var newAttributeLists = new List<AttributeListSyntax>();
 
@@ -61,7 +61,7 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
 
             for (var i = 0; i < attributeList.Attributes.Count; i++)
             {
-                var newAttributes = SyntaxFactory.SeparatedList(new[] { attributeList.Attributes[i] });
+                var newAttributes = SyntaxFactory.SingletonSeparatedList(attributeList.Attributes[i]);
                 var newAttributeList = SyntaxFactory.AttributeList(attributeList.Target, newAttributes);
 
                 newAttributeList = (i == 0)

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1133UnitTests.cs

@@ -103,6 +103,69 @@ public void TestMethod()
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that multiple attribute list are handled correctly.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task VerifyThatMultipleAttributeListsAreHandledCorrectlyAsync()
+        {
+            var testCode = @"using System.ComponentModel;
+
+[EditorBrowsable(EditorBrowsableState.Never), DesignOnly(true)]
+#if false
+[DataObject(true), Browsable(true)]
+#else
+[DataObject(true), Browsable(false)]
+#endif
+public class TestClass
+{
+    /// <summary>
+    /// Test method.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never), DesignOnly(true), DisplayName(""Test"")] // test comment
+    public void TestMethod()
+    {
+    }
+}
+";
+
+            var fixedTestCode = @"using System.ComponentModel;
+
+[EditorBrowsable(EditorBrowsableState.Never)]
+[DesignOnly(true)]
+#if false
+[DataObject(true), Browsable(true)]
+#else
+[DataObject(true)]
+[Browsable(false)]
+#endif
+public class TestClass
+{
+    /// <summary>
+    /// Test method.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [DesignOnly(true)]
+    [DisplayName(""Test"")] // test comment
+    public void TestMethod()
+    {
+    }
+}
+";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic().WithLocation(3, 47),
+                this.CSharpDiagnostic().WithLocation(7, 20),
+                this.CSharpDiagnostic().WithLocation(14, 51)
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override CodeFixProvider GetCSharpCodeFixProvider()
         {

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1133DoNotCombineAttributes.cs

@@ -52,7 +52,7 @@ private static void HandleAttributeList(SyntaxNodeAnalysisContext context)
 
             if (attributeList.Attributes.Count > 1)
             {
-                context.ReportDiagnostic(Diagnostic.Create(Descriptor, attributeList.Attributes[1].GetLocation()));
+                context.ReportDiagnostic(Diagnostic.Create(Descriptor, attributeList.Attributes[1].Name.GetLocation()));
             }
         }
     }