From 51616a4043bf64a745de1d1e53ca2c6322d58660 Mon Sep 17 00:00:00 2001 From: Gabriela Araujo Britto Date: Thu, 28 Feb 2019 09:50:57 -0800 Subject: [PATCH] use sortAndDeduplicate instead of deduplicate --- src/services/refactors/convertToNamedParameters.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/refactors/convertToNamedParameters.ts b/src/services/refactors/convertToNamedParameters.ts index 102001a46a8..85073dbc76c 100644 --- a/src/services/refactors/convertToNamedParameters.ts +++ b/src/services/refactors/convertToNamedParameters.ts @@ -60,9 +60,8 @@ namespace ts.refactor.convertToNamedParameters { trailingTriviaOption: textChanges.TrailingTriviaOption.Include }); - - const functionCalls = deduplicate(groupedReferences.functionCalls, equateValues); - forEach(functionCalls, call => { + const functionCalls = sortAndDeduplicate(groupedReferences.functionCalls, /*comparer*/ (a, b) => compareValues(a.pos, b.pos)); + for (const call of functionCalls) { if (call.arguments && call.arguments.length) { const newArgument = getSynthesizedDeepClone(createNewArgument(functionDeclaration, call.arguments), /*includeTrivia*/ true); changes.replaceNodeRange( @@ -71,7 +70,8 @@ namespace ts.refactor.convertToNamedParameters { last(call.arguments), newArgument, { leadingTriviaOption: textChanges.LeadingTriviaOption.IncludeAll, trailingTriviaOption: textChanges.TrailingTriviaOption.Include }); - }}); + } + } } function getGroupedReferences(functionDeclaration: ValidFunctionDeclaration, program: Program, cancellationToken: CancellationToken): GroupedReferences {