Updated after CR

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1134UnitTests.cs

@@ -138,6 +138,42 @@ public async Task VerifyMultipleAttributesOnSameLineForAssemblyAsync()
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that multiple attributes on the same line, directly in front of a namespace declaration will produce the expected diagnostic.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task VerifyMultipleAttributesBeforeNamespaceAsync()
+        {
+            var testCode = @"using System;
+using System.Runtime.InteropServices;
+
+[assembly:CLSCompliant(false)][assembly:ComVisible(true)]
+namespace TestNamespace
+{
+}
+";
+
+            var fixedTestCode = @"using System;
+using System.Runtime.InteropServices;
+
+[assembly:CLSCompliant(false)]
+[assembly:ComVisible(true)]
+namespace TestNamespace
+{
+}
+";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic().WithLocation(4, 31)
+            };
+
+            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);
+        }
+
         /// <summary>
         /// Verifies that multiple attributes on the same line for module level will produce the expected diagnostic.
         /// </summary>
@@ -366,6 +402,33 @@ public bool TestMethod2([In][MarshalAs(UnmanagedType.I4)] int value)
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that multiple attributes on the same line for a generic parameter will produce the expected diagnostic.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task VerifyMultipleAttributesOnSameLineForGenericParameterAsync()
+        {
+            var testCode = @"using System;
+
+namespace TestNamespace
+{
+    [AttributeUsage(System.AttributeTargets.All, AllowMultiple = true)]
+    public sealed class TestAttribute : Attribute
+    {
+        public string Param { get; private set; }
+        public TestAttribute(string param) { Param = param; }
+    }
+
+    public class TestClass<[Test(""Test1"")][Test(""Test2"")]T>
+    {
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override CodeFixProvider GetCSharpCodeFixProvider()
         {

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1134AttributesMustNotShareLine.cs

@@ -63,9 +63,9 @@ private static void HandleAttributeList(SyntaxNodeAnalysisContext context)
             AttributeListSyntax attributeList = (AttributeListSyntax)context.Node;
             bool violation = false;
 
-            if (attributeList.Parent.IsKind(SyntaxKind.Parameter))
+            if (attributeList.Parent.IsKind(SyntaxKind.Parameter) || attributeList.Parent.IsKind(SyntaxKind.TypeParameter))
             {
-                // no analysis required for parameters
+                // no analysis required for parameters or type (generic) parameters
                 return;
             }