Skip to content

Commit 67a6f23

Browse files
authored
fixes useCustomCodeActionMenu setting microsoft#158617
Fix on `useCustomCodeActionMenu` setting
2 parents 3cb5824 + 856b428 commit 67a6f23

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ export class CodeActionMenu extends Disposable implements IEditorContribution {
307307
/**
308308
* Checks if the setting has disabled/enabled headers in the code action widget.
309309
*/
310-
private isCodeActionWidgetHeadersDisabled(model: ITextModel): boolean {
311-
return this._configurationService.getValue('editor.experimental.useCustomCodeActionMenu.toggleHeaders', {
310+
private isCodeActionWidgetHeadersShown(model: ITextModel): boolean {
311+
return this._configurationService.getValue('editor.customCodeActionMenu.showHeaders', {
312312
resource: model.uri
313313
});
314314
}
@@ -441,7 +441,7 @@ export class CodeActionMenu extends Disposable implements IEditorContribution {
441441
const totalActionEntries: (IAction | string)[] = [];
442442

443443
// Checks if headers are disabled.
444-
if (this.isCodeActionWidgetHeadersDisabled(model)) {
444+
if (!this.isCodeActionWidgetHeadersShown(model)) {
445445
totalActionEntries.push(...inputArray);
446446

447447
} else {

src/vs/editor/contrib/codeAction/browser/codeActionWidgetContribution.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
1111
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
1212
...editorConfigurationBaseNode,
1313
properties: {
14-
'editor.experimental.useCustomCodeActionMenu': {
14+
'editor.useCustomCodeActionMenu': {
1515
type: 'boolean',
16-
tags: ['experimental'],
1716
scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
1817
description: nls.localize('codeActionWidget', "Enabling this adjusts how the code action menu is rendered."),
1918
default: true,
@@ -24,12 +23,11 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
2423
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
2524
...editorConfigurationBaseNode,
2625
properties: {
27-
'editor.experimental.useCustomCodeActionMenu.toggleHeaders': {
26+
'editor.customCodeActionMenu.showHeaders': {
2827
type: 'boolean',
29-
tags: ['experimental'],
3028
scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
31-
description: nls.localize('codeActionWidget.toggle', "Disables headers in the code action widget."),
32-
default: false,
29+
description: nls.localize('showCodeActionHeaders', "Enabling this will show the code action menu with group headers, if the custom code action menu is enabled."),
30+
default: true,
3331
},
3432
}
3533
});

0 commit comments

Comments
 (0)