From 7f74bb7526eee7ee7fb1e63bf05a554bbef44658 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 4 Jun 2018 08:51:34 -0700 Subject: [PATCH] Don't use active text editor for rename Fixes #50856 --- .../src/features/refactorProvider.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/extensions/typescript-language-features/src/features/refactorProvider.ts b/extensions/typescript-language-features/src/features/refactorProvider.ts index 02446169c93..0a9a33ea9b6 100644 --- a/extensions/typescript-language-features/src/features/refactorProvider.ts +++ b/extensions/typescript-language-features/src/features/refactorProvider.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as vscode from 'vscode'; import * as fs from 'fs'; @@ -60,11 +58,10 @@ class ApplyRefactoringCommand implements Command { const renameLocation = response.body.renameLocation; if (renameLocation) { - if (vscode.window.activeTextEditor && vscode.window.activeTextEditor.document.uri.fsPath === document.uri.fsPath) { - const pos = typeConverters.Position.fromLocation(renameLocation); - vscode.window.activeTextEditor.selection = new vscode.Selection(pos, pos); - await vscode.commands.executeCommand('editor.action.rename'); - } + await vscode.commands.executeCommand('editor.action.rename', [ + document.uri, + typeConverters.Position.fromLocation(renameLocation) + ]); } return true; }