Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename codeActionMenu to codeActionWidget (#161540)

Browse Source
This commit is contained in:
Matt Bierner
2022-09-22 16:42:12 -07:00
committed by GitHub
parent 82c1bf86bf
commit 93836c720c
6 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts
View File

@@ -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 });
}
});

19
src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts
View File

@@ -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<IConfigurationRegistry>(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,
},
}
});

8
src/vs/editor/contrib/codeAction/browser/codeActionUi.ts
View File

@@ -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));
},

0
src/vs/editor/contrib/codeAction/browser/media/action.css → src/vs/editor/contrib/codeAction/browser/codeActionWidget.css
View File

12
src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts → src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts
View File

@@ -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;
}

21
src/vs/editor/contrib/codeAction/browser/codeActionWidgetContribution.ts
View File

@@ -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<IConfigurationRegistry>(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,
},
}
});