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

Use rename cancellation token for file rename request to ts server

Browse Source
This commit is contained in:
Matt Bierner
2018-09-26 17:34:41 -07:00
parent 11c8300bb9
commit 29e8dcffcf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/typescript-language-features/src/features/rename.ts
+3 -3
View File
@@ -9,7 +9,6 @@ import * as nls from 'vscode-nls';
import * as Proto from '../protocol';
import { ITypeScriptServiceClient, ServerResponse } from '../typescriptService';
import API from '../utils/api';
import { nulToken } from '../utils/cancellation';
import * as typeConverters from '../utils/typeConverters';
@@ -64,7 +63,7 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
if (this.client.apiVersion.gte(API.v310)) {
if (renameInfo.fileToRename) {
const edits = await this.renameFile(renameInfo.fileToRename, newName);
const edits = await this.renameFile(renameInfo.fileToRename, newName, token);
if (edits) {
return edits;
} else {
@@ -113,6 +112,7 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
private async renameFile(
fileToRename: string,
newName: string,
token: vscode.CancellationToken,
): Promise<vscode.WorkspaceEdit | undefined> {
// Make sure we preserve file exension if none provided
if (!path.extname(newName)) {
@@ -127,7 +127,7 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
oldFilePath: fileToRename,
newFilePath: newFilePath,
};
const response = await this.client.execute('getEditsForFileRename', args, nulToken);
const response = await this.client.execute('getEditsForFileRename', args, token);
if (response.type !== 'response' || !response.body) {
return undefined;
}