Tweak

Author: CyrusNajmabadi

src/Features/Core/Portable/ExtractMethod/MethodExtractor.CodeGenerator.cs

@@ -224,15 +224,25 @@ protected ImmutableArray<TStatementSyntax> AddReturnIfUnreachable(
                 return statements.Concat(CreateReturnStatement([]));
             }
 
-            private TExecutableStatementSyntax CreateReturnStatement(ImmutableArray<VariableInfo> variables)
+            //private TExecutableStatementSyntax CreateReturnStatement(ImmutableArray<VariableInfo> variables)
+            //{
+            //    var generator = this.SemanticDocument.GetRequiredLanguageService<SyntaxGenerator>();
+            //    return CreateReturnStatement(variables.SelectAsArray(v => (TExpressionSyntax)generator.IdentifierName(v.Name)));
+            //}
+
+            private TExecutableStatementSyntax CreateReturnStatement(ImmutableArray<TExpressionSyntax> expressions)
             {
                 var generator = this.SemanticDocument.GetRequiredLanguageService<SyntaxGenerator>();
-                var returnStatement =
-                    variables.Length == 0 ? generator.ReturnStatement() :
-                    variables.Length == 1 ? generator.ReturnStatement(generator.IdentifierName(variables[0].Name)) :
-                    generator.ReturnStatement(generator.TupleExpression(variables.SelectAsArray(v => generator.IdentifierName(v.Name))));
+                return (TExecutableStatementSyntax)generator.ReturnStatement(CreateReturnExpression(expressions));
+            }
 
-                return (TExecutableStatementSyntax)returnStatement;
+            private TExpressionSyntax CreateReturnExpression(ImmutableArray<TExpressionSyntax> expressions)
+            {
+                var generator = this.SemanticDocument.GetRequiredLanguageService<SyntaxGenerator>();
+                return
+                    expressions.Length == 0 ? null :
+                    expressions.Length == 1 ? expressions[0] :
+                    (TExpressionSyntax)generator.TupleExpression(expressions.Select(generator.Argument));
             }
 
             protected async Task<ImmutableArray<TStatementSyntax>> AddInvocationAtCallSiteAsync(
@@ -297,7 +307,11 @@ protected ImmutableArray<TStatementSyntax> AppendReturnStatementIfNeeded(Immutab
                 if (AnalyzerResult.VariablesToUseAsReturnValue.IsEmpty)
                     return statements;
 
-                return statements.Concat(CreateReturnStatement(AnalyzerResult.VariablesToUseAsReturnValue));
+                var generator = this.SemanticDocument.GetRequiredLanguageService<SyntaxGenerator>();
+                return statements.Concat(CreateReturnStatement(
+                    AnalyzerResult.VariablesToUseAsReturnValue.SelectAsArray(
+                        static (v, generator) => (TExpressionSyntax)generator.IdentifierName(v.Name),
+                        generator)));
             }
 
             protected static HashSet<SyntaxAnnotation> CreateVariableDeclarationToRemoveMap(