Skip to content

Commit 6bdc615

Browse files
Simpliufy
1 parent 8a7640a commit 6bdc615

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,12 @@ protected ImmutableArray<TStatementSyntax> AddReturnIfUnreachable(
227227
private TExecutableStatementSyntax CreateReturnStatement(ImmutableArray<VariableInfo> variables)
228228
{
229229
var generator = this.SemanticDocument.GetRequiredLanguageService<SyntaxGenerator>();
230-
if (variables.IsEmpty)
231-
return (TExecutableStatementSyntax)generator.ReturnStatement();
230+
var returnStatement =
231+
variables.Length == 0 ? generator.ReturnStatement() :
232+
variables.Length == 1 ? generator.ReturnStatement(generator.IdentifierName(variables[0].Name)) :
233+
generator.ReturnStatement(generator.TupleExpression(variables.SelectAsArray(v => generator.IdentifierName(v.Name))));
232234

233-
if (variables is [var variable])
234-
return (TExecutableStatementSyntax)generator.ReturnStatement(generator.IdentifierName(variable.Name));
235-
236-
return (TExecutableStatementSyntax)generator.ReturnStatement(
237-
generator.TupleExpression(variables.SelectAsArray(v => generator.IdentifierName(v.Name))));
235+
return (TExecutableStatementSyntax)returnStatement;
238236
}
239237

240238
protected async Task<ImmutableArray<TStatementSyntax>> AddInvocationAtCallSiteAsync(

0 commit comments

Comments
 (0)