Code review update: Updated SA1402CodeFixProvider to use FileNameHelpers for getting the file name for the new document.

Author: bjornhellander

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/MaintainabilityRules/SA1402CodeFixProvider.cs

@@ -63,7 +63,10 @@ private static async Task<Solution> GetTransformedSolutionAsync(Document documen
             }
 
             DocumentId extractedDocumentId = DocumentId.CreateNewId(document.Project.Id);
-            var extractedDocumentName = GetExtractedDocumentName(memberDeclarationSyntax) + ".cs";
+            string suffix;
+            FileNameHelpers.GetFileNameAndSuffix(document.Name, out suffix);
+            var settings = document.Project.AnalyzerOptions.GetStyleCopSettings(cancellationToken);
+            string extractedDocumentName = FileNameHelpers.GetConventionalFileName(memberDeclarationSyntax, settings.DocumentationRules.FileNamingConvention) + suffix;
 
             List<SyntaxNode> nodesToRemoveFromExtracted = new List<SyntaxNode>();
             SyntaxNode previous = node;
@@ -93,8 +96,8 @@ private static async Task<Solution> GetTransformedSolutionAsync(Document documen
                 }
             }
 
+            // Add the new file
             SyntaxNode extractedDocumentNode = root.RemoveNodes(nodesToRemoveFromExtracted, SyntaxRemoveOptions.KeepUnbalancedDirectives);
-
             Solution updatedSolution = document.Project.Solution.AddDocument(extractedDocumentId, extractedDocumentName, extractedDocumentNode, document.Folders);
 
             // Make sure to also add the file to linked projects
@@ -109,30 +112,5 @@ private static async Task<Solution> GetTransformedSolutionAsync(Document documen
 
             return updatedSolution;
         }
-
-        private static string GetExtractedDocumentName(MemberDeclarationSyntax memberDeclarationSyntax)
-        {
-            string extractedDocumentName = NamedTypeHelpers.GetNameOrIdentifier(memberDeclarationSyntax);
-
-            var typeDeclarationSyntax = memberDeclarationSyntax as TypeDeclarationSyntax;
-            var delegateDeclarationSyntax = memberDeclarationSyntax as DelegateDeclarationSyntax;
-
-            if (typeDeclarationSyntax != null)
-            {
-                if (typeDeclarationSyntax.TypeParameterList?.Parameters.Count > 0)
-                {
-                    extractedDocumentName += "`" + typeDeclarationSyntax.TypeParameterList.Parameters.Count;
-                }
-            }
-            else if (delegateDeclarationSyntax != null)
-            {
-                if (delegateDeclarationSyntax.TypeParameterList?.Parameters.Count > 0)
-                {
-                    extractedDocumentName += "`" + delegateDeclarationSyntax.TypeParameterList.Parameters.Count;
-                }
-            }
-
-            return extractedDocumentName;
-        }
     }
 }