From 93836c720c9544fe0faae2366c6a13cfa94de843 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 22 Sep 2022 16:42:12 -0700 Subject: [PATCH] Rename codeActionMenu to codeActionWidget (#161540) --- .../codeAction/browser/codeActionCommands.ts | 12 +++++------ .../browser/codeActionContributions.ts | 19 +++++++++++++++-- .../codeAction/browser/codeActionUi.ts | 8 +++---- .../action.css => codeActionWidget.css} | 0 ...{codeActionMenu.ts => codeActionWidget.ts} | 12 +++++------ .../browser/codeActionWidgetContribution.ts | 21 ------------------- 6 files changed, 33 insertions(+), 39 deletions(-) rename src/vs/editor/contrib/codeAction/browser/{media/action.css => codeActionWidget.css} (100%) rename src/vs/editor/contrib/codeAction/browser/{codeActionMenu.ts => codeActionWidget.ts} (98%) delete mode 100644 src/vs/editor/contrib/codeAction/browser/codeActionWidgetContribution.ts diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts b/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts index 1aa9057ffcb..8e002a60009 100644 --- a/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts +++ b/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts @@ -19,7 +19,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { CodeActionTriggerType } from 'vs/editor/common/languages'; import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures'; import { codeActionCommandId, CodeActionItem, CodeActionSet, fixAllCommandId, organizeImportsCommandId, refactorCommandId, refactorPreviewCommandId, sourceActionCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction'; -import { acceptSelectedCodeActionCommand, CodeActionMenu, Context, previewSelectedCodeActionCommand } from 'vs/editor/contrib/codeAction/browser/codeActionMenu'; +import { acceptSelectedCodeActionCommand, CodeActionWidget, Context, previewSelectedCodeActionCommand } from 'vs/editor/contrib/codeAction/browser/codeActionWidget'; import { CodeActionUi } from 'vs/editor/contrib/codeAction/browser/codeActionUi'; import { MessageController } from 'vs/editor/contrib/message/browser/messageController'; import * as nls from 'vs/nls'; @@ -511,7 +511,7 @@ registerAction2(class extends Action2 { } run(): void { - CodeActionMenu.INSTANCE?.hide(); + CodeActionWidget.INSTANCE?.hide(); } }); @@ -534,7 +534,7 @@ registerAction2(class extends Action2 { } run(): void { - CodeActionMenu.INSTANCE?.focusPrevious(); + CodeActionWidget.INSTANCE?.focusPrevious(); } }); @@ -557,7 +557,7 @@ registerAction2(class extends Action2 { } run(): void { - CodeActionMenu.INSTANCE?.focusNext(); + CodeActionWidget.INSTANCE?.focusNext(); } }); @@ -579,7 +579,7 @@ registerAction2(class extends Action2 { } run(): void { - CodeActionMenu.INSTANCE?.acceptSelected(); + CodeActionWidget.INSTANCE?.acceptSelected(); } }); @@ -600,7 +600,7 @@ registerAction2(class extends Action2 { } run(): void { - CodeActionMenu.INSTANCE?.acceptSelected({ preview: true }); + CodeActionWidget.INSTANCE?.acceptSelected({ preview: true }); } }); diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts b/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts index e9ffb192073..75c76189bc1 100644 --- a/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts +++ b/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts @@ -4,8 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions'; -import { AutoFixAction, CodeActionCommand, FixAllAction, OrganizeImportsAction, QuickFixAction, CodeActionController, RefactorAction, RefactorPreview, SourceAction } from 'vs/editor/contrib/codeAction/browser/codeActionCommands'; -import 'vs/editor/contrib/codeAction/browser/codeActionWidgetContribution'; +import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema'; +import { AutoFixAction, CodeActionCommand, CodeActionController, FixAllAction, OrganizeImportsAction, QuickFixAction, RefactorAction, RefactorPreview, SourceAction } from 'vs/editor/contrib/codeAction/browser/codeActionCommands'; +import * as nls from 'vs/nls'; +import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; +import { Registry } from 'vs/platform/registry/common/platform'; registerEditorContribution(CodeActionController.ID, CodeActionController); registerEditorAction(QuickFixAction); @@ -16,3 +19,15 @@ registerEditorAction(OrganizeImportsAction); registerEditorAction(AutoFixAction); registerEditorAction(FixAllAction); registerEditorCommand(new CodeActionCommand()); + +Registry.as(Extensions.Configuration).registerConfiguration({ + ...editorConfigurationBaseNode, + properties: { + 'editor.codeActionWidget.showHeaders': { + type: 'boolean', + scope: ConfigurationScope.LANGUAGE_OVERRIDABLE, + description: nls.localize('showCodeActionHeaders', "Enable/disable showing group headers in the code action menu."), + default: true, + }, + } +}); diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts b/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts index 96b0db6395f..13e0d5fe187 100644 --- a/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts +++ b/src/vs/editor/contrib/codeAction/browser/codeActionUi.ts @@ -16,8 +16,8 @@ import { CodeActionItem, CodeActionSet } from 'vs/editor/contrib/codeAction/brow import { MessageController } from 'vs/editor/contrib/message/browser/messageController'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { CodeActionMenu, CodeActionShowOptions } from './codeActionMenu'; import { CodeActionsState } from './codeActionModel'; +import { CodeActionShowOptions, CodeActionWidget } from './codeActionWidget'; import { LightBulbWidget } from './lightBulbWidget'; import { CodeActionAutoApply, CodeActionTrigger } from './types'; @@ -46,7 +46,7 @@ export class CodeActionUi extends Disposable { return widget; }); - this._register(this._editor.onDidLayoutChange(() => CodeActionMenu.INSTANCE?.hide())); + this._register(this._editor.onDidLayoutChange(() => CodeActionWidget.INSTANCE?.hide())); } override dispose() { @@ -114,7 +114,7 @@ export class CodeActionUi extends Disposable { this.showCodeActionList(newState.trigger, actions, this.toCoords(newState.position), { includeDisabledActions, fromLightbulb: false, showHeaders: this.shouldShowHeaders() }); } else { // auto magically triggered - if (CodeActionMenu.INSTANCE?.isVisible) { + if (CodeActionWidget.INSTANCE?.isVisible) { // TODO: Figure out if we should update the showing menu? actions.dispose(); } else { @@ -159,7 +159,7 @@ export class CodeActionUi extends Disposable { const anchor = Position.isIPosition(at) ? this.toCoords(at) : at; - CodeActionMenu.getOrCreateInstance(this._instantiationService).show(trigger, actions, anchor, editorDom, { ...options, showHeaders: this.shouldShowHeaders() }, { + CodeActionWidget.getOrCreateInstance(this._instantiationService).show(trigger, actions, anchor, editorDom, { ...options, showHeaders: this.shouldShowHeaders() }, { onSelectCodeAction: async (action, trigger, options) => { this.delegate.applyCodeAction(action, /* retrigger */ true, Boolean(options.preview || trigger.preview)); }, diff --git a/src/vs/editor/contrib/codeAction/browser/media/action.css b/src/vs/editor/contrib/codeAction/browser/codeActionWidget.css similarity index 100% rename from src/vs/editor/contrib/codeAction/browser/media/action.css rename to src/vs/editor/contrib/codeAction/browser/codeActionWidget.css diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts b/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts similarity index 98% rename from src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts rename to src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts index 8ed074c9f60..7c3180aa563 100644 --- a/src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts +++ b/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts @@ -14,7 +14,7 @@ import { IAction } from 'vs/base/common/actions'; import { Codicon } from 'vs/base/common/codicons'; import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle'; import { OS } from 'vs/base/common/platform'; -import 'vs/css!./media/action'; +import 'vs/css!./codeActionWidget'; import { CodeActionItem, CodeActionSet } from 'vs/editor/contrib/codeAction/browser/codeAction'; import { CodeActionKind, CodeActionTrigger, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/browser/types'; import 'vs/editor/contrib/symbolIcons/browser/symbolIcons'; // The codicon symbol colors are defined here and must be loaded to get colors @@ -347,15 +347,15 @@ class CodeActionList extends Disposable { // TODO: Take a look at user storage for this so it is preserved across windows and on reload. let showDisabled = false; -export class CodeActionMenu extends Disposable { +export class CodeActionWidget extends Disposable { - private static _instance?: CodeActionMenu; + private static _instance?: CodeActionWidget; - public static get INSTANCE(): CodeActionMenu | undefined { return this._instance; } + public static get INSTANCE(): CodeActionWidget | undefined { return this._instance; } - public static getOrCreateInstance(instantiationService: IInstantiationService): CodeActionMenu { + public static getOrCreateInstance(instantiationService: IInstantiationService): CodeActionWidget { if (!this._instance) { - this._instance = instantiationService.createInstance(CodeActionMenu); + this._instance = instantiationService.createInstance(CodeActionWidget); } return this._instance; } diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionWidgetContribution.ts b/src/vs/editor/contrib/codeAction/browser/codeActionWidgetContribution.ts deleted file mode 100644 index f8c7d5eb2c0..00000000000 --- a/src/vs/editor/contrib/codeAction/browser/codeActionWidgetContribution.ts +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import { editorConfigurationBaseNode } from 'vs/editor/common/config/editorConfigurationSchema'; -import * as nls from 'vs/nls'; -import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; -import { Registry } from 'vs/platform/registry/common/platform'; - -Registry.as(Extensions.Configuration).registerConfiguration({ - ...editorConfigurationBaseNode, - properties: { - 'editor.codeActionWidget.showHeaders': { - type: 'boolean', - scope: ConfigurationScope.LANGUAGE_OVERRIDABLE, - description: nls.localize('showCodeActionHeaders', "Enable/disable showing group headers in the code action menu."), - default: true, - }, - } -});