提交 645a1783 编写于 作者: M Matt Bierner

Use destructured paramters

上级 01f429e8
...@@ -35,6 +35,14 @@ const enum UpdateImportsOnFileMoveSetting { ...@@ -35,6 +35,14 @@ const enum UpdateImportsOnFileMoveSetting {
Never = 'never', 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 { class UpdateImportsOnFileRenameHandler extends Disposable {
public static readonly minVersion = API.v300; public static readonly minVersion = API.v300;
...@@ -67,18 +75,12 @@ class UpdateImportsOnFileRenameHandler extends Disposable { ...@@ -67,18 +75,12 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
location: vscode.ProgressLocation.Window, location: vscode.ProgressLocation.Window,
title: localize('renameProgress.title', "Checking for update of JS/TS imports") 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( private async doRename({ oldUri, newUri, newFilePath, oldFilePath, jsTsFileThatIsBeingMoved }: RenameAction): Promise<void> {
oldResource: vscode.Uri,
newResource: vscode.Uri,
newFilePath: string,
oldFilePath: string,
jsTsFileThatIsBeingMoved: vscode.Uri,
): Promise<void> {
const document = await vscode.workspace.openTextDocument(jsTsFileThatIsBeingMoved); const document = await vscode.workspace.openTextDocument(jsTsFileThatIsBeingMoved);
const config = this.getConfiguration(document); const config = this.getConfiguration(document);
...@@ -88,7 +90,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable { ...@@ -88,7 +90,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
} }
// Make sure TS knows about file // Make sure TS knows about file
this.client.bufferSyncSupport.closeResource(oldResource); this.client.bufferSyncSupport.closeResource(oldUri);
this.client.bufferSyncSupport.openTextDocument(document); this.client.bufferSyncSupport.openTextDocument(document);
const edits = await this.getEditsForFileRename(document, oldFilePath, newFilePath); const edits = await this.getEditsForFileRename(document, oldFilePath, newFilePath);
...@@ -96,7 +98,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable { ...@@ -96,7 +98,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
return; return;
} }
if (await this.confirmActionWithUser(newResource, document)) { if (await this.confirmActionWithUser(newUri, document)) {
await vscode.workspace.applyEdit(edits); await vscode.workspace.applyEdit(edits);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册