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

Add workaround for https://github.com/Microsoft/TypeScript/issues/24968

Browse Source
This commit is contained in:
Matt Bierner
2018-06-14 15:56:46 -07:00
parent 30dcf74d92
commit ae7d3eb888
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,6 +209,7 @@ export class UpdateImportsOnFileRenameHandler {
oldFile: string,
newFile: string,
) {
const isDirectoryRename = fs.lstatSync(newFile).isDirectory();
await this.fileConfigurationManager.ensureConfigurationForDocument(document, undefined);
const args: Proto.GetEditsForFileRenameRequestArgs = {
@@ -221,7 +222,37 @@ export class UpdateImportsOnFileRenameHandler {
return;
}
return typeConverters.WorkspaceEdit.fromFromFileCodeEdits(this.client, response.body);
return typeConverters.WorkspaceEdit.fromFromFileCodeEdits(this.client, response.body.map((edit: Proto.FileCodeEdits) => this.fixEdit(edit, isDirectoryRename)));
}
private fixEdit(
edit: Proto.FileCodeEdits,
isDirectoryRename: boolean
): Proto.FileCodeEdits {
if (!isDirectoryRename || this.client.apiVersion.gte(API.v300)) {
return edit;
}
// Workaround for https://github.com/Microsoft/TypeScript/issues/24968
const textChanges = edit.textChanges.map((change): Proto.CodeEdit => {
const match = change.newText.match(/\/[^\/]+$/g);
if (!match) {
return change;
}
return {
newText: change.newText.slice(0, -match[0].length),
start: change.start,
end: {
line: change.end.line,
offset: change.end.offset - match[0].length
}
};
});
return {
fileName: edit.fileName,
textChanges
};
}
}