Refactored

src/Workspaces/CSharp/Portable/CodeGeneration/CSharpCodeGenerationService.cs

@@ -466,13 +466,9 @@ protected override TDeclarationNode AddMembers<TDeclarationNode>(TDeclarationNod
             CodeGenerationOptions options,
             CancellationToken cancellationToken)
         {
-            if (destinationMember is MemberDeclarationSyntax memberDeclaration)
-            {
-                return AddStatementsToMemberDeclaration<TDeclarationNode>(destinationMember, statements, memberDeclaration);
-            }
-            else if (destinationMember is LocalFunctionStatementSyntax localFunctionDeclaration)
+            if (destinationMember is MemberDeclarationSyntax || destinationMember is LocalFunctionStatementSyntax)
             {
-                return AddStatementsToLocalFunction<TDeclarationNode>(destinationMember, statements, localFunctionDeclaration);
+                return AddStatementsToMemberOrLocalFunctionDeclaration<TDeclarationNode>(destinationMember, statements);
             }
             else
             {
@@ -520,34 +516,44 @@ protected override TDeclarationNode AddMembers<TDeclarationNode>(TDeclarationNod
             throw new ArgumentException(CSharpWorkspaceResources.No_available_location_found_to_add_statements_to);
         }
 
-        private static TDeclarationNode AddStatementsToMemberDeclaration<TDeclarationNode>(TDeclarationNode destinationMember, IEnumerable<SyntaxNode> statements, MemberDeclarationSyntax memberDeclaration) where TDeclarationNode : SyntaxNode
+        private static TDeclarationNode AddStatementsToMemberOrLocalFunctionDeclaration<TDeclarationNode>(TDeclarationNode destinationMember, IEnumerable<SyntaxNode> statements) where TDeclarationNode : SyntaxNode
         {
-            var body = memberDeclaration.GetBody();
-            if (body == null)
+            if (destinationMember is MemberDeclarationSyntax memberDeclaration)
+            {
+                var finalBody = GetFinalBody(memberDeclaration.GetBody(), statements);
+                if (finalBody == null)
                 {
                     return destinationMember;
                 }
 
-            var statementNodes = body.Statements.ToList();
-            statementNodes.AddRange(StatementGenerator.GenerateStatements(statements));
-
-            var finalBody = body.WithStatements(SyntaxFactory.List<StatementSyntax>(statementNodes));
                 var finalMember = memberDeclaration.WithBody(finalBody);
+                return Cast<TDeclarationNode>(finalMember);
+            }
+            else
+            {
+                var localFunctionDeclaration = Cast<LocalFunctionStatementSyntax>(destinationMember);
+                var finalBody = GetFinalBody(localFunctionDeclaration.Body, statements);
+                if (finalBody == null)
+                {
+                    return destinationMember;
+                }
 
+                var finalMember = localFunctionDeclaration.WithBody(finalBody);
                 return Cast<TDeclarationNode>(finalMember);
             }
+        }
 
-        private static TDeclarationNode AddStatementsToLocalFunction<TDeclarationNode>(TDeclarationNode destinationMember, IEnumerable<SyntaxNode> statements, LocalFunctionStatementSyntax localFunctionDeclaration) where TDeclarationNode : SyntaxNode
+        private static BlockSyntax GetFinalBody(BlockSyntax body, IEnumerable<SyntaxNode> statements)
+        {
+            if (body == null)
             {
-            var body = localFunctionDeclaration.Body;
+                return null;
+            }
 
             var statementNodes = body.Statements.ToList();
             statementNodes.AddRange(StatementGenerator.GenerateStatements(statements));
 
-            var finalBody = body.WithStatements(SyntaxFactory.List<StatementSyntax>(statementNodes));
-            var finalMember = localFunctionDeclaration.WithBody(finalBody);
-
-            return Cast<TDeclarationNode>(finalMember);
+            return body.WithStatements(SyntaxFactory.List<StatementSyntax>(statementNodes));
         }
 
         public override SyntaxNode CreateEventDeclaration(