Improved readability of some code in SA1402CodeFixProvider

Author: bjornhellander

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

@@ -19,7 +19,7 @@ namespace StyleCop.Analyzers.MaintainabilityRules
     /// Implements a code fix for <see cref="SA1402FileMayOnlyContainASingleType"/>.
     /// </summary>
     /// <remarks>
-    /// <para>To fix a violation of this rule, move each class into its own file.</para>
+    /// <para>To fix a violation of this rule, move each type into its own file.</para>
     /// </remarks>
     [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SA1402CodeFixProvider))]
     [Shared]
@@ -114,16 +114,22 @@ private static string GetExtractedDocumentName(MemberDeclarationSyntax memberDec
         {
             string extractedDocumentName = NamedTypeHelpers.GetNameOrIdentifier(memberDeclarationSyntax);
 
+            var typeDeclarationSyntax = memberDeclarationSyntax as TypeDeclarationSyntax;
             var delegateDeclarationSyntax = memberDeclarationSyntax as DelegateDeclarationSyntax;
-            if (delegateDeclarationSyntax?.TypeParameterList?.Parameters.Count > 0)
+
+            if (typeDeclarationSyntax != null)
             {
-                extractedDocumentName += "`" + delegateDeclarationSyntax.TypeParameterList.Parameters.Count;
+                if (typeDeclarationSyntax.TypeParameterList?.Parameters.Count > 0)
+                {
+                    extractedDocumentName += "`" + typeDeclarationSyntax.TypeParameterList.Parameters.Count;
+                }
             }
-
-            var typeDeclarationSyntax = memberDeclarationSyntax as TypeDeclarationSyntax;
-            if (typeDeclarationSyntax?.TypeParameterList?.Parameters.Count > 0)
+            else if (delegateDeclarationSyntax != null)
             {
-                extractedDocumentName += "`" + typeDeclarationSyntax.TypeParameterList.Parameters.Count;
+                if (delegateDeclarationSyntax.TypeParameterList?.Parameters.Count > 0)
+                {
+                    extractedDocumentName += "`" + delegateDeclarationSyntax.TypeParameterList.Parameters.Count;
+                }
             }
 
             return extractedDocumentName;