Fix that SA1649 does not support simple names

Author: pdelvo

StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1649UnitTests.cs

@@ -169,6 +169,7 @@ public async Task VerifyStyleCopNamingConventionForGenericTypeAsync(string typeK
 
             var expectedDiagnostic = this.CSharpDiagnostic().WithLocation("TestType`3.cs", 3, 13 + typeKeyword.Length);
             await this.VerifyCSharpDiagnosticAsync(testCode, expectedDiagnostic, CancellationToken.None, "TestType`3.cs").ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None, "TestType.cs").ConfigureAwait(false);
             await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None, "TestType{T1,T2,T3}.cs").ConfigureAwait(false);
             await this.VerifyRenameAsync(testCode, "TestType{T1,T2,T3}.cs", CancellationToken.None).ConfigureAwait(false);
         }
@@ -194,6 +195,9 @@ public async Task VerifyMetadataNamingConventionForGenericTypeAsync(string typeK
 
             var expectedDiagnostic = this.CSharpDiagnostic().WithLocation("TestType{T1,T2,T3}.cs", 3, 13 + typeKeyword.Length);
             await this.VerifyCSharpDiagnosticAsync(testCode, expectedDiagnostic, CancellationToken.None, "TestType{T1,T2,T3}.cs").ConfigureAwait(false);
+
+            expectedDiagnostic = this.CSharpDiagnostic().WithLocation("TestType.cs", 3, 13 + typeKeyword.Length);
+            await this.VerifyCSharpDiagnosticAsync(testCode, expectedDiagnostic, CancellationToken.None, "TestType.cs").ConfigureAwait(false);
             await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None, "TestType`3.cs").ConfigureAwait(false);
             await this.VerifyRenameAsync(testCode, "TestType`3.cs", CancellationToken.None).ConfigureAwait(false);
         }

StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1649FileNameMustMatchTypeName.cs

@@ -98,6 +98,12 @@ public void HandleSyntaxTreeAction(SyntaxTreeAnalysisContext context)
 
                 if (string.Compare(fileName, expectedFileName, StringComparison.OrdinalIgnoreCase) != 0)
                 {
+                    if (this.fileNamingConvention == FileNamingConvention.StyleCop
+                        && string.Compare(fileName, GetSimpleFileName(firstTypeDeclaration), StringComparison.OrdinalIgnoreCase) == 0)
+                    {
+                        return;
+                    }
+
                     var properties = ImmutableDictionary.Create<string, string>()
                         .Add(ExpectedFileNameKey, expectedFileName);
 
@@ -123,6 +129,11 @@ private static string GetStyleCopFileName(TypeDeclarationSyntax firstTypeDeclara
                 return $"{firstTypeDeclaration.Identifier.ValueText}{{{typeParameterList}}}.cs";
             }
 
+            private static string GetSimpleFileName(TypeDeclarationSyntax firstTypeDeclaration)
+            {
+                return $"{firstTypeDeclaration.Identifier.ValueText}.cs";
+            }
+
             private static string GetMetadataFileName(TypeDeclarationSyntax firstTypeDeclaration)
             {
                 if (firstTypeDeclaration.TypeParameterList == null)