Add tests and additional cases to SA1314

Author: nbarbettini

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Helpers/RenameHelper.cs

@@ -54,16 +54,16 @@ public static async Task<bool> IsValidNewMemberNameAsync(SemanticModel semanticM
 
             if (symbol.Kind == SymbolKind.TypeParameter)
             {
-                // If the symbol is a type parameter, the name can't be the same any type parameters
-                // of the containing type.
+                // If the symbol is a type parameter, the name can't be the same as any type parameters of the containing type.
                 var parentSymbol = containingSymbol?.ContainingSymbol as INamedTypeSymbol;
-                if (parentSymbol == null)
+                if (parentSymbol != null
+                    && parentSymbol.TypeParameters.Any(t => t.Name == name))
                 {
-                    return true;
+                    return false;
                 }
 
-                bool conflict = parentSymbol.TypeParameters.Any(t => t.Name == name);
-                return !conflict;
+                // Move up one level for the next validation step.
+                containingSymbol = containingSymbol?.ContainingSymbol;
             }
 
             var containingNamespaceOrTypeSymbol = containingSymbol as INamespaceOrTypeSymbol;
@@ -144,30 +144,30 @@ public static SyntaxNode GetParentDeclaration(SyntaxToken token)
             {
                 switch (parent.Kind())
                 {
-                case SyntaxKind.VariableDeclarator:
-                case SyntaxKind.Parameter:
-                case SyntaxKind.TypeParameter:
-                case SyntaxKind.CatchDeclaration:
-                case SyntaxKind.ExternAliasDirective:
-                case SyntaxKind.QueryContinuation:
-                case SyntaxKind.FromClause:
-                case SyntaxKind.LetClause:
-                case SyntaxKind.JoinClause:
-                case SyntaxKind.JoinIntoClause:
-                case SyntaxKind.ForEachStatement:
-                case SyntaxKind.UsingDirective:
-                case SyntaxKind.LabeledStatement:
-                case SyntaxKind.AnonymousObjectMemberDeclarator:
-                    return parent;
-
-                default:
-                    var declarationParent = parent as MemberDeclarationSyntax;
-                    if (declarationParent != null)
-                    {
-                        return declarationParent;
-                    }
-
-                    break;
+                    case SyntaxKind.VariableDeclarator:
+                    case SyntaxKind.Parameter:
+                    case SyntaxKind.TypeParameter:
+                    case SyntaxKind.CatchDeclaration:
+                    case SyntaxKind.ExternAliasDirective:
+                    case SyntaxKind.QueryContinuation:
+                    case SyntaxKind.FromClause:
+                    case SyntaxKind.LetClause:
+                    case SyntaxKind.JoinClause:
+                    case SyntaxKind.JoinIntoClause:
+                    case SyntaxKind.ForEachStatement:
+                    case SyntaxKind.UsingDirective:
+                    case SyntaxKind.LabeledStatement:
+                    case SyntaxKind.AnonymousObjectMemberDeclarator:
+                        return parent;
+
+                    default:
+                        var declarationParent = parent as MemberDeclarationSyntax;
+                        if (declarationParent != null)
+                        {
+                            return declarationParent;
+                        }
+
+                        break;
                 }
 
                 parent = parent.Parent;

StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1314UnitTests.cs

@@ -15,7 +15,7 @@ namespace StyleCop.Analyzers.Test.NamingRules
     public class SA1314UnitTests : CodeFixVerifier
     {
         [Fact]
-        public async Task TestGenericParameterDoesNotStartWithTAsync()
+        public async Task TestTypeParameterDoesNotStartWithTAsync()
         {
             var testCode = @"
 public interface IFoo<Key>
@@ -35,7 +35,7 @@ public interface IFoo<TKey>
         }
 
         [Fact]
-        public async Task TestGenericParameterDoesNotStartWithTPlusParameterUsedAsync()
+        public async Task TestTypeParameterDoesNotStartWithTPlusParameterUsedAsync()
         {
             var testCode = @"
 public class Foo<Key>
@@ -65,7 +65,7 @@ void Test()
         }
 
         [Fact]
-        public async Task TestGenericParameterStartsWithLowerTAsync()
+        public async Task TestTypeParameterStartsWithLowerTAsync()
         {
             var testCode = @"
 public interface IFoo<tKey>
@@ -85,7 +85,7 @@ public interface IFoo<TtKey>
         }
 
         [Fact]
-        public async Task TestInnerGenericParameterDoesNotStartWithTAsync()
+        public async Task TestInnerTypeParameterDoesNotStartWithTAsync()
         {
             var testCode = @"
 public class Bar
@@ -111,7 +111,7 @@ public class Foo<TKey>
         }
 
         [Fact]
-        public async Task TestGenericParameterDoesStartWithTAsync()
+        public async Task TestTypeParameterDoesStartWithTAsync()
         {
             var testCode = @"public interface IFoo<TKey>
 {
@@ -121,7 +121,7 @@ public async Task TestGenericParameterDoesStartWithTAsync()
         }
 
         [Fact]
-        public async Task TestInnerGenericParameterDoesStartWithTAsync()
+        public async Task TestInnerTypeParameterDoesStartWithTAsync()
         {
             var testCode = @"
 public class Bar
@@ -135,7 +135,7 @@ public class Foo<TKey>
         }
 
         [Fact]
-        public async Task TestGenericParameterDoesNotStartWithTWithMemberMatchingTargetTypeAsync()
+        public async Task TestTypeParameterDoesNotStartWithTWithMemberMatchingTargetTypeAsync()
         {
             string testCode = @"
 public class Foo<Key>
@@ -157,7 +157,7 @@ public class Foo<TKey>
         }
 
         [Fact]
-        public async Task TestNestedGenericParameterDoesNotStartWithTWithConflictAsync()
+        public async Task TestNestedTypeParameterDoesNotStartWithTWithConflictAsync()
         {
             string testCode = @"
 public class Outer<TKey>
@@ -182,7 +182,7 @@ public class Foo<TKey1>
         }
 
         [Fact]
-        public async Task TestNestedGenericParameterDoesNotStartWithTWithMemberConflictAsync()
+        public async Task TestNestedTypeParameterDoesNotStartWithTWithMemberConflictAsync()
         {
             string testCode = @"
 public class Outer<TKey>
@@ -208,6 +208,59 @@ public class Foo<TKey1>
             await this.VerifyCSharpFixAsync(testCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestTypeParameterDoesNotStartWithTAndTypeConflictAsync()
+        {
+            string testCode = @"
+public class TFoo
+{
+}
+
+public class Bar<Foo>
+{
+}";
+            string fixedCode = @"
+public class TFoo
+{
+}
+
+public class Bar<TFoo1>
+{
+}";
+
+            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(6, 18);
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
+        }
+
+        [Fact]
+        public async Task TestTypeParameterInMethodSignatureDoesNotStartWithTAsync()
+        {
+            var testCode = @"
+public class Foo
+{
+    public void Bar<Baz>()
+    {
+    }
+}";
+
+            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(4, 21);
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+
+            var fixedCode = @"
+public class Foo
+{
+    public void Bar<TBaz>()
+    {
+    }
+}";
+
+            await this.VerifyCSharpFixAsync(testCode, fixedCode).ConfigureAwait(false);
+        }
+
         protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
         {
             yield return new SA1314TypeParameterNamesMustBeginWithT();