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

API allowing CodeActionProviders to reliably get the current editor selection (#49081)

Browse Source 
Fixes #49024
Fixes #49060

See #49024 for details on the problem. Makes code action providers take a range | selection. Always pass the selection if one is available.
This commit is contained in:
Matt Bierner
2018-05-10 15:09:26 -07:00
committed by GitHub
parent d8e5520575
commit 49170e54b1
10 changed files with 54 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/typescript-language-features/src/features/refactorProvider.ts
View File

@@ -102,7 +102,7 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
public async provideCodeActions(
document: vscode.TextDocument,
_range: vscode.Range,
rangeOrSelection: vscode.Range | vscode.Selection,
context: vscode.CodeActionContext,
token: vscode.CancellationToken
): Promise<vscode.CodeAction[]> {
@@ -114,22 +114,16 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
return [];
}
if (!vscode.window.activeTextEditor) {
if (!(rangeOrSelection instanceof vscode.Selection) || rangeOrSelection.isEmpty) {
return [];
}
const editor = vscode.window.activeTextEditor;
const file = this.client.normalizePath(document.uri);
if (!file || editor.document.uri.fsPath !== document.uri.fsPath) {
if (!file) {
return [];
}
if (editor.selection.isEmpty) {
return [];
}
const range = editor.selection;
const args: Proto.GetApplicableRefactorsRequestArgs = typeConverters.Range.toFileRangeRequestArgs(file, range);
const args: Proto.GetApplicableRefactorsRequestArgs = typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection);
try {
const response = await this.client.execute('getApplicableRefactors', args, token);
if (!response || !response.body) {
@@ -143,7 +137,7 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
codeAction.command = {
title: info.description,
command: SelectRefactorCommand.ID,
arguments: [document, file, info, range]
arguments: [document, file, info, rangeOrSelection]
};
actions.push(codeAction);
} else {
@@ -152,7 +146,7 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
codeAction.command = {
title: action.description,
command: ApplyRefactoringCommand.ID,
arguments: [document, file, info.name, action.name, range]
arguments: [document, file, info.name, action.name, rangeOrSelection]
};
actions.push(codeAction);
}