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

Use current selection instead of range for refactoring

Browse Source 
Fixes #34481
This commit is contained in:
Matt Bierner
2017-11-10 12:56:03 -08:00
parent 82b13bc9e3
commit 006b379de2
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/typescript/src/features/refactorProvider.ts
View File

@@ -113,7 +113,7 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
public async provideCodeActions2(
document: vscode.TextDocument,
range: vscode.Range,
_range: vscode.Range,
_context: vscode.CodeActionContext,
token: vscode.CancellationToken
): Promise<vscode.CodeAction[]> {
@@ -121,11 +121,17 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
return [];
}
const file = this.client.normalizePath(document.uri);
if (!file) {
if (!vscode.window.activeTextEditor) {
return [];
}
const editor = vscode.window.activeTextEditor;
const file = this.client.normalizePath(document.uri);
if (!file || editor.document.uri.fsPath !== document.uri.fsPath) {
return [];
}
const range = editor.selection;
const args: Proto.GetApplicableRefactorsRequestArgs = vsRangeToTsFileRange(file, range);
try {
const response = await this.client.execute('getApplicableRefactors', args, token);
@@ -158,7 +164,7 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
}
}
return actions;
} catch (err) {
} catch {
return [];
}
}