From b9f33fc242dcb968b043d24a86ad060485cbae2d Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 17 Mar 2021 16:57:22 -0700 Subject: [PATCH] Rename CodeActionKind.Manual -> Invoke For #118084 --- .../src/languageFeatures/refactor.ts | 4 ++-- src/vs/editor/common/modes.ts | 4 ++-- src/vs/editor/contrib/codeAction/codeAction.ts | 2 +- .../editor/contrib/codeAction/codeActionCommands.ts | 2 +- src/vs/editor/contrib/codeAction/codeActionModel.ts | 2 +- src/vs/editor/contrib/codeAction/codeActionUi.ts | 2 +- .../contrib/codeAction/test/codeAction.test.ts | 2 +- .../editor/contrib/hover/markerHoverParticipant.ts | 2 +- src/vs/vscode.proposed.d.ts | 12 ++++++------ src/vs/workbench/api/common/extHostTypeConverters.ts | 6 +++--- src/vs/workbench/api/common/extHostTypes.ts | 4 ++-- .../contrib/markers/browser/markersTreeViewer.ts | 2 +- .../test/browser/api/extHostLanguageFeatures.test.ts | 8 ++++---- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts index f64c0b27553..4284366e273 100644 --- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts +++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts @@ -335,7 +335,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider getCodeActions(model, trigger.selection, trigger.trigger, Progress.None, token)); - if (trigger.trigger.type === CodeActionTriggerType.Manual) { + if (trigger.trigger.type === CodeActionTriggerType.Invoke) { this._progressService?.showWhile(actions, 250); } diff --git a/src/vs/editor/contrib/codeAction/codeActionUi.ts b/src/vs/editor/contrib/codeAction/codeActionUi.ts index 9f037de5ae6..099789d9504 100644 --- a/src/vs/editor/contrib/codeAction/codeActionUi.ts +++ b/src/vs/editor/contrib/codeAction/codeActionUi.ts @@ -77,7 +77,7 @@ export class CodeActionUi extends Disposable { this._lightBulbWidget.getValue().update(actions, newState.trigger, newState.position); - if (newState.trigger.type === CodeActionTriggerType.Manual) { + if (newState.trigger.type === CodeActionTriggerType.Invoke) { if (newState.trigger.filter?.include) { // Triggered for specific scope // Check to see if we want to auto apply. diff --git a/src/vs/editor/contrib/codeAction/test/codeAction.test.ts b/src/vs/editor/contrib/codeAction/test/codeAction.test.ts index 53a80a51108..c4987968a98 100644 --- a/src/vs/editor/contrib/codeAction/test/codeAction.test.ts +++ b/src/vs/editor/contrib/codeAction/test/codeAction.test.ts @@ -127,7 +127,7 @@ suite('CodeAction', () => { new CodeActionItem(testData.tsLint.abc, provider) ]; - const { validActions: actions } = await getCodeActions(model, new Range(1, 1, 2, 1), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None); + const { validActions: actions } = await getCodeActions(model, new Range(1, 1, 2, 1), { type: modes.CodeActionTriggerType.Invoke }, Progress.None, CancellationToken.None); assert.equal(actions.length, 6); assert.deepEqual(actions, expected); }); diff --git a/src/vs/editor/contrib/hover/markerHoverParticipant.ts b/src/vs/editor/contrib/hover/markerHoverParticipant.ts index bb55bc810c2..d13cdc5f9bd 100644 --- a/src/vs/editor/contrib/hover/markerHoverParticipant.ts +++ b/src/vs/editor/contrib/hover/markerHoverParticipant.ts @@ -46,7 +46,7 @@ export class MarkerHover implements IHoverPart { } const markerCodeActionTrigger: CodeActionTrigger = { - type: CodeActionTriggerType.Manual, + type: CodeActionTriggerType.Invoke, filter: { include: CodeActionKind.QuickFix } }; diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 9687172baca..4a90f0d8647 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -2672,18 +2672,18 @@ declare module 'vscode' { * The reason why code actions were requested. */ export enum CodeActionTriggerKind { + /** + * Code actions were explicitly requested by the user or by an extension. + */ + Invoke = 1, + /** * Code actions were requested automatically. * * This typically happens when current selection in a file changes, but can * also be triggered when file content changes. */ - Automatic = 1, - - /** - * Code actions were requested maually by the user or an extension. - */ - Manual = 2, + Automatic = 2, } export interface CodeActionContext { diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts index fe2aec8f49a..4691259728e 100644 --- a/src/vs/workbench/api/common/extHostTypeConverters.ts +++ b/src/vs/workbench/api/common/extHostTypeConverters.ts @@ -1731,11 +1731,11 @@ export namespace CodeActionTriggerKind { export function to(value: modes.CodeActionTriggerType): types.CodeActionTriggerKind { switch (value) { + case modes.CodeActionTriggerType.Invoke: + return types.CodeActionTriggerKind.Invoke; + case modes.CodeActionTriggerType.Auto: return types.CodeActionTriggerKind.Automatic; - - case modes.CodeActionTriggerType.Manual: - return types.CodeActionTriggerKind.Manual; } } } diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts index 88833b1730f..bef6a7bf01c 100644 --- a/src/vs/workbench/api/common/extHostTypes.ts +++ b/src/vs/workbench/api/common/extHostTypes.ts @@ -1179,8 +1179,8 @@ export class DocumentSymbol { export enum CodeActionTriggerKind { - Automatic = 1, - Manual = 2, + Invoke = 1, + Automatic = 2, } @es5ClassCompat diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts index c092329a8c0..f66d8357d67 100644 --- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts +++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts @@ -695,7 +695,7 @@ export class MarkerViewModel extends Disposable { if (!this.codeActionsPromise) { this.codeActionsPromise = createCancelablePromise(cancellationToken => { return getCodeActions(model, new Range(this.marker.range.startLineNumber, this.marker.range.startColumn, this.marker.range.endLineNumber, this.marker.range.endColumn), { - type: CodeActionTriggerType.Manual, filter: { include: CodeActionKind.QuickFix } + type: CodeActionTriggerType.Invoke, filter: { include: CodeActionKind.QuickFix } }, Progress.None, cancellationToken).then(actions => { return this._register(actions); }); diff --git a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts index b40a45b3539..9e29d3ac043 100644 --- a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts @@ -591,7 +591,7 @@ suite('ExtHostLanguageFeatures', function () { })); await rpcProtocol.sync(); - const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None); + const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Invoke }, Progress.None, CancellationToken.None); assert.strictEqual(actions.length, 2); const [first, second] = actions; assert.strictEqual(first.action.title, 'Testing1'); @@ -615,7 +615,7 @@ suite('ExtHostLanguageFeatures', function () { })); await rpcProtocol.sync(); - const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None); + const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Invoke }, Progress.None, CancellationToken.None); assert.strictEqual(actions.length, 1); const [first] = actions; assert.strictEqual(first.action.title, 'Testing1'); @@ -638,7 +638,7 @@ suite('ExtHostLanguageFeatures', function () { })); await rpcProtocol.sync(); - const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None); + const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Invoke }, Progress.None, CancellationToken.None); assert.strictEqual(actions.length, 1); }); @@ -656,7 +656,7 @@ suite('ExtHostLanguageFeatures', function () { })); await rpcProtocol.sync(); - const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None); + const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Invoke }, Progress.None, CancellationToken.None); assert.strictEqual(actions.length, 1); });