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

Refactoring refactor provider

Browse Source 
Steps:

Return undefined instead of empty array

Extract shouldTrigger

Extract convertApplicableRefactors

Extract refactorActionToCodeAction

Move context only check into shouldTrigger
This commit is contained in:
Matt Bierner
2018-06-04 08:56:41 -07:00
parent 45a79e010f
commit 1579821005
1 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,40 +115,44 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
rangeOrSelection: vscode.Range | vscode.Selection,
context: vscode.CodeActionContext,
token: vscode.CancellationToken
): Promise<vscode.CodeAction[]> {
): Promise<vscode.CodeAction[] | undefined> {
if (!this.client.apiVersion.has240Features()) {
return [];
return undefined;
}
if (context.only && !vscode.CodeActionKind.Refactor.contains(context.only)) {
return [];
}
if (!(rangeOrSelection instanceof vscode.Selection) || (rangeOrSelection.isEmpty && context.triggerKind !== vscode.CodeActionTrigger.Manual)) {
return [];
if (!this.shouldTrigger(rangeOrSelection, context)) {
return undefined;
}
const file = this.client.normalizePath(document.uri);
if (!file) {
return [];
return undefined;
}
await this.formattingOptionsManager.ensureConfigurationForDocument(document, undefined);
const args: Proto.GetApplicableRefactorsRequestArgs = typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection);
let response: Proto.GetApplicableRefactorsResponse;
try {
response = await this.client.execute('getApplicableRefactors', args, token);
if (!response || !response.body) {
return [];
return undefined;
}
} catch {
return [];
return undefined;
}
return this.convertApplicableRefactors(response.body, document, file, rangeOrSelection);
}
private convertApplicableRefactors(
body: Proto.ApplicableRefactorInfo[],
document: vscode.TextDocument,
file: string,
rangeOrSelection: vscode.Range | vscode.Selection
) {
const actions: vscode.CodeAction[] = [];
for (const info of response.body) {
for (const info of body) {
if (info.inlineable === false) {
const codeAction = new vscode.CodeAction(info.description, vscode.CodeActionKind.Refactor);
codeAction.command = {
@@ -159,19 +163,37 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
actions.push(codeAction);
} else {
for (const action of info.actions) {
const codeAction = new vscode.CodeAction(action.description, TypeScriptRefactorProvider.getKind(action));
codeAction.command = {
title: action.description,
command: ApplyRefactoringCommand.ID,
arguments: [document, file, info.name, action.name, rangeOrSelection]
};
actions.push(codeAction);
actions.push(this.refactorActionToCodeAction(action, document, file, info, rangeOrSelection));
}
}
}
return actions;
}
private refactorActionToCodeAction(
action: Proto.RefactorActionInfo,
document: vscode.TextDocument,
file: string,
info: Proto.ApplicableRefactorInfo,
rangeOrSelection: vscode.Range | vscode.Selection
) {
const codeAction = new vscode.CodeAction(action.description, TypeScriptRefactorProvider.getKind(action));
codeAction.command = {
title: action.description,
command: ApplyRefactoringCommand.ID,
arguments: [document, file, info.name, action.name, rangeOrSelection],
};
return codeAction;
}
private shouldTrigger(rangeOrSelection: vscode.Range | vscode.Selection, context: vscode.CodeActionContext) {
if (context.only && !vscode.CodeActionKind.Refactor.contains(context.only)) {
return false;
}
return rangeOrSelection instanceof vscode.Selection && (!rangeOrSelection.isEmpty || context.triggerKind === vscode.CodeActionTrigger.Manual);
}
private static getKind(refactor: Proto.RefactorActionInfo) {
if (refactor.name.startsWith('function_')) {
return TypeScriptRefactorProvider.extractFunctionKind;