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

Add CodeActionTriggerKind api proposal

Browse Source 
For #118084
Fixes #118087
This commit is contained in:
Matt Bierner
2021-03-03 17:35:40 -08:00
parent 20f06e0444
commit 49d05f998f
7 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/typescript-language-features/src/languageFeatures/quickFix.ts
View File

@@ -223,7 +223,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
_range: vscode.Range,
context: vscode.CodeActionContext,
token: vscode.CancellationToken
): Promise<vscode.CodeAction[]> {
): Promise<VsCodeCodeAction[]> {
const file = this.client.toOpenedFilePath(document);
if (!file) {
return [];

12
extensions/typescript-language-features/src/languageFeatures/refactor.ts
View File

@@ -284,7 +284,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
context: vscode.CodeActionContext,
token: vscode.CancellationToken
): Promise<TsCodeAction[] | undefined> {
if (!this.shouldTrigger(rangeOrSelection, context)) {
if (!this.shouldTrigger(context)) {
return undefined;
}
if (!this.client.toOpenedFilePath(document)) {
@@ -335,10 +335,10 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
}
private toTsTriggerReason(context: vscode.CodeActionContext): Proto.RefactorTriggerReason | undefined {
if (!context.only) {
return;
if (context.triggerKind === vscode.CodeActionTriggerKind.Manual) {
return 'invoked';
}
return 'invoked';
return undefined;
}
private convertApplicableRefactors(
@@ -384,12 +384,12 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
return codeAction;
}
private shouldTrigger(rangeOrSelection: vscode.Range | vscode.Selection, context: vscode.CodeActionContext) {
private shouldTrigger(context: vscode.CodeActionContext) {
if (context.only && !vscode.CodeActionKind.Refactor.contains(context.only)) {
return false;
}
return rangeOrSelection instanceof vscode.Selection;
return context.triggerKind === vscode.CodeActionTriggerKind.Manual;
}
private static getKind(refactor: Proto.RefactorActionInfo) {