Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 14:01:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Normalizing names

Browse Source
This commit is contained in:
Matt Bierner
2019-10-23 16:10:57 -07:00
parent 45cd966a16
commit 0d0a574164
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/typescript-language-features/src/features/updatePathsOnRename.ts
View File

@@ -66,13 +66,13 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
return;
}
const newFile = this.client.toPath(newResource);
if (!newFile) {
const newFilePath = this.client.toPath(newResource);
if (!newFilePath) {
return;
}
const oldFile = this.client.toPath(oldResource);
if (!oldFile) {
const oldFilePath = this.client.toPath(oldResource);
if (!oldFilePath) {
return;
}
@@ -88,7 +88,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
this.client.bufferSyncSupport.closeResource(oldResource);
this.client.bufferSyncSupport.openTextDocument(document);
const edits = await this.getEditsForFileRename(document, oldFile, newFile);
const edits = await this.getEditsForFileRename(document, oldFilePath, newFilePath);
if (!edits || !edits.size) {
return;
}
@@ -207,18 +207,18 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
private async getEditsForFileRename(
document: vscode.TextDocument,
oldFile: string,
newFile: string,
oldFilePath: string,
newFilePath: string,
): Promise<vscode.WorkspaceEdit | undefined> {
const response = await this.client.interruptGetErr(() => {
this.fileConfigurationManager.setGlobalConfigurationFromDocument(document, nulToken);
const args: Proto.GetEditsForFileRenameRequestArgs = {
oldFilePath: oldFile,
newFilePath: newFile,
oldFilePath,
newFilePath,
};
return this.client.execute('getEditsForFileRename', args, nulToken);
});
if (response.type !== 'response' || !response.body) {
if (response.type !== 'response') {
return;
}