diff --git a/src/services/organizeImports.ts b/src/services/organizeImports.ts index 142bdbe879100..1a394bc349bed 100644 --- a/src/services/organizeImports.ts +++ b/src/services/organizeImports.ts @@ -76,7 +76,7 @@ namespace ts.OrganizeImports { // Delete any subsequent imports. for (let i = 1; i < oldImportDecls.length; i++) { - changeTracker.delete(sourceFile, oldImportDecls[i]); + changeTracker.deleteNode(sourceFile, oldImportDecls[i]); } } } diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts index 245306ac10954..fe926d031756e 100644 --- a/src/services/textChanges.ts +++ b/src/services/textChanges.ts @@ -286,6 +286,12 @@ namespace ts.textChanges { this.deletedNodes.push({ sourceFile, node }); } + public deleteNode(sourceFile: SourceFile, node: Node, options: ConfigurableStartEnd = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }): void { + const startPosition = getAdjustedStartPosition(sourceFile, node, options); + const endPosition = getAdjustedEndPosition(sourceFile, node, options); + this.deleteRange(sourceFile, { pos: startPosition, end: endPosition }); + } + public deleteModifier(sourceFile: SourceFile, modifier: Modifier): void { this.deleteRange(sourceFile, { pos: modifier.getStart(sourceFile), end: skipTrivia(sourceFile.text, modifier.end, /*stopAfterLineBreak*/ true) }); }