From 29e8dcffcf6c7773b17a563b4f6ed346e0787c15 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 26 Sep 2018 17:34:41 -0700 Subject: [PATCH] Use rename cancellation token for file rename request to ts server --- .../typescript-language-features/src/features/rename.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/typescript-language-features/src/features/rename.ts b/extensions/typescript-language-features/src/features/rename.ts index 40f1b496c7f..00516bef3a3 100644 --- a/extensions/typescript-language-features/src/features/rename.ts +++ b/extensions/typescript-language-features/src/features/rename.ts @@ -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 { // 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; }