From 645a17835324c068edf5e034e1fa1ddc86663031 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 23 Oct 2019 17:09:48 -0700 Subject: [PATCH] Use destructured paramters --- .../src/features/updatePathsOnRename.ts | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts index 993f9d9501f..c92d0205cb1 100644 --- a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts +++ b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts @@ -35,6 +35,14 @@ const enum UpdateImportsOnFileMoveSetting { Never = 'never', } +interface RenameAction { + readonly oldUri: vscode.Uri; + readonly newUri: vscode.Uri; + readonly newFilePath: string; + readonly oldFilePath: string; + readonly jsTsFileThatIsBeingMoved: vscode.Uri; +} + class UpdateImportsOnFileRenameHandler extends Disposable { public static readonly minVersion = API.v300; @@ -67,18 +75,12 @@ class UpdateImportsOnFileRenameHandler extends Disposable { location: vscode.ProgressLocation.Window, title: localize('renameProgress.title', "Checking for update of JS/TS imports") }, () => { - return this.doRename(oldUri, newUri, newFilePath, oldFilePath, jsTsFileThatIsBeingMoved); + return this.doRename({ oldUri, newUri, newFilePath, oldFilePath, jsTsFileThatIsBeingMoved }); }); })); } - private async doRename( - oldResource: vscode.Uri, - newResource: vscode.Uri, - newFilePath: string, - oldFilePath: string, - jsTsFileThatIsBeingMoved: vscode.Uri, - ): Promise { + private async doRename({ oldUri, newUri, newFilePath, oldFilePath, jsTsFileThatIsBeingMoved }: RenameAction): Promise { const document = await vscode.workspace.openTextDocument(jsTsFileThatIsBeingMoved); const config = this.getConfiguration(document); @@ -88,7 +90,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable { } // Make sure TS knows about file - this.client.bufferSyncSupport.closeResource(oldResource); + this.client.bufferSyncSupport.closeResource(oldUri); this.client.bufferSyncSupport.openTextDocument(document); const edits = await this.getEditsForFileRename(document, oldFilePath, newFilePath); @@ -96,7 +98,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable { return; } - if (await this.confirmActionWithUser(newResource, document)) { + if (await this.confirmActionWithUser(newUri, document)) { await vscode.workspace.applyEdit(edits); } }