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

Fix file path rename for js/ts

Browse Source 
Fixes #51175
This commit is contained in:
Matt Bierner
2018-09-26 17:23:46 -07:00
parent f94cfe6677
commit a2d3c87982
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,15 +5,11 @@
import * as path from 'path';
import * as vscode from 'vscode';
import * as nls from 'vscode-nls';
import * as Proto from '../protocol';
import { ITypeScriptServiceClient, ServerResponse } from '../typescriptService';
import API from '../utils/api';
import * as typeConverters from '../utils/typeConverters';
const localize = nls.loadMessageBundle();
class TypeScriptRenameProvider implements vscode.RenameProvider {
public constructor(
private readonly client: ITypeScriptServiceClient
@@ -34,10 +30,6 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
return Promise.reject<vscode.Range>(renameInfo.localizedErrorMessage);
}
if (renameInfo.fileToRename && this.client.apiVersion.gte(API.v310) && this.client.apiVersion.lt(API.v320)) {
return Promise.reject<vscode.Range>(localize('fileToRename.notSupported', "Renaming paths is not supported in this version of TypeScript"));
}
if (this.client.apiVersion.gte(API.v310)) {
const triggerSpan = renameInfo.triggerSpan;
if (triggerSpan) {
@@ -64,14 +56,13 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
return Promise.reject<vscode.WorkspaceEdit>(renameInfo.localizedErrorMessage);
}
const edit = new vscode.WorkspaceEdit();
if (this.client.apiVersion.gte(API.v310)) {
if (renameInfo.fileToRename) {
this.renameFile(edit, renameInfo.fileToRename, newName);
return this.renameFile(renameInfo.fileToRename, newName);
}
}
this.updateLocs(edit, response.body.locs, newName);
return edit;
return this.updateLocs(response.body.locs, newName);
}
public async execRename(
@@ -94,10 +85,10 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
}
private updateLocs(
edit: vscode.WorkspaceEdit,
locations: ReadonlyArray<Proto.SpanGroup>,
newName: string
) {
const edit = new vscode.WorkspaceEdit();
for (const spanGroup of locations) {
const resource = this.client.toResource(spanGroup.file);
if (resource) {
@@ -110,10 +101,11 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
}
private renameFile(
edit: vscode.WorkspaceEdit,
fileToRename: string,
newName: string,
): vscode.WorkspaceEdit {
const edit = new vscode.WorkspaceEdit();
// Make sure we preserve file exension if none provided
if (!path.extname(newName)) {
newName += path.extname(fileToRename);