@codingame/monaco-vscode-api 26.2.2 → 27.0.0

package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js

@@ -12,7 +12,7 @@ class TransposeLettersAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.transposeLetters",
-            label: ( localize2(926, "Transpose Letters")),
+            label: ( localize2(944, "Transpose Letters")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,

package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js

@@ -42,23 +42,23 @@ const CutAction = supportsCut ? registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.MenubarEditMenu,
         group: "2_ccp",
-        title: ( localize(927, "Cu&&t")),
+        title: ( localize(945, "Cu&&t")),
         order: 1
     }, {
         menuId: MenuId.EditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(928, "Cut")),
+        title: ( localize(946, "Cut")),
         when: EditorContextKeys.writable,
         order: 1
     }, {
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(928, "Cut")),
+        title: ( localize(946, "Cut")),
         order: 1
     }, {
         menuId: MenuId.SimpleEditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(928, "Cut")),
+        title: ( localize(946, "Cut")),
         when: EditorContextKeys.writable,
         order: 1
     }]
@@ -78,47 +78,47 @@ const CopyAction = supportsCopy ? registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.MenubarEditMenu,
         group: "2_ccp",
-        title: ( localize(929, "&&Copy")),
+        title: ( localize(947, "&&Copy")),
         order: 2
     }, {
         menuId: MenuId.EditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(930, "Copy")),
+        title: ( localize(948, "Copy")),
         order: 2
     }, {
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(930, "Copy")),
+        title: ( localize(948, "Copy")),
         order: 1
     }, {
         menuId: MenuId.SimpleEditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(930, "Copy")),
+        title: ( localize(948, "Copy")),
         order: 2
     }]
 }))) : undefined;
 MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, {
     submenu: MenuId.MenubarCopy,
-    title: ( localize2(931, "Copy As")),
+    title: ( localize2(949, "Copy As")),
     group: "2_ccp",
     order: 3
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.EditorContextCopy,
-    title: ( localize2(931, "Copy As")),
+    title: ( localize2(949, "Copy As")),
     group: CLIPBOARD_CONTEXT_MENU_GROUP,
     order: 3
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.EditorContextShare,
-    title: ( localize2(932, "Share")),
+    title: ( localize2(950, "Share")),
     group: "11_share",
     order: -1,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals("resourceScheme", "output")), EditorContextKeys.editorTextFocus))
 });
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     submenu: MenuId.ExplorerContextShare,
-    title: ( localize2(932, "Share")),
+    title: ( localize2(950, "Share")),
     group: "11_share",
     order: -1
 });
@@ -141,23 +141,23 @@ const PasteAction = supportsPaste ? registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.MenubarEditMenu,
         group: "2_ccp",
-        title: ( localize(933, "&&Paste")),
+        title: ( localize(951, "&&Paste")),
         order: 4
     }, {
         menuId: MenuId.EditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(934, "Paste")),
+        title: ( localize(952, "Paste")),
         when: EditorContextKeys.writable,
         order: 4
     }, {
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(934, "Paste")),
+        title: ( localize(952, "Paste")),
         order: 1
     }, {
         menuId: MenuId.SimpleEditorContext,
         group: CLIPBOARD_CONTEXT_MENU_GROUP,
-        title: ( localize(934, "Paste")),
+        title: ( localize(952, "Paste")),
         when: EditorContextKeys.writable,
         order: 4
     }]
@@ -166,7 +166,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.clipboardCopyWithSyntaxHighlightingAction",
-            label: ( localize2(935, "Copy with Syntax Highlighting")),
+            label: ( localize2(953, "Copy with Syntax Highlighting")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,

package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js

@@ -267,7 +267,7 @@ async function applyCodeAction(accessor, item, codeActionReason, options, token
             await commandService.executeCommand(item.action.command.id, ...(item.action.command.arguments || []));
         } catch (err) {
             const message = asMessage(err);
-            notificationService.error(typeof message === "string" ? message : ( localize(936, "An unknown error occurred while applying the code action")));
+            notificationService.error(typeof message === "string" ? message : ( localize(954, "An unknown error occurred while applying the code action")));
         }
     }
     setTimeout(

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js

@@ -27,23 +27,23 @@ const argsSchema = {
     properties: {
         "kind": {
             type: "string",
-            description: ( localize(937, "Kind of the code action to run."))
+            description: ( localize(955, "Kind of the code action to run."))
         },
         "apply": {
             type: "string",
-            description: ( localize(938, "Controls when the returned actions are applied.")),
+            description: ( localize(956, "Controls when the returned actions are applied.")),
             default: CodeActionAutoApply.IfSingle,
             enum: [
                 CodeActionAutoApply.First,
                 CodeActionAutoApply.IfSingle,
                 CodeActionAutoApply.Never
             ],
-            enumDescriptions: [( localize(939, "Always apply the first returned code action.")), ( localize(940, "Apply the first returned code action if it is the only one.")), ( localize(941, "Do not apply the returned code actions."))]
+            enumDescriptions: [( localize(957, "Always apply the first returned code action.")), ( localize(958, "Apply the first returned code action if it is the only one.")), ( localize(959, "Do not apply the returned code actions."))]
         },
         "preferred": {
             type: "boolean",
             default: false,
-            description: ( localize(942, "Controls if only preferred code actions should be returned."))
+            description: ( localize(960, "Controls if only preferred code actions should be returned."))
         }
     }
 };
@@ -63,7 +63,7 @@ class QuickFixAction extends EditorAction2 {
     constructor() {
         super({
             id: quickFixCommandId,
-            title: ( localize2(943, "Quick Fix...")),
+            title: ( localize2(961, "Quick Fix...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             icon: Codicon.lightBulb,
             f1: true,
@@ -74,14 +74,14 @@ class QuickFixAction extends EditorAction2 {
             },
             menu: {
                 id: MenuId.InlineChatEditorAffordance,
-                group: "0_quickfix",
+                group: "1_quickfix",
                 order: 0,
                 when: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider))
             }
         });
     }
     runEditorCommand(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(944, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(962, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
     }
 }
 class CodeActionCommand extends EditorCommand {
@@ -105,7 +105,7 @@ class CodeActionCommand extends EditorCommand {
         });
         return triggerCodeActionsForEditorSelection(
             editor,
-            typeof userArgs?.kind === "string" ? args.preferred ? ( localize(945, "No preferred code actions for '{0}' available", userArgs.kind)) : ( localize(946, "No code actions for '{0}' available", userArgs.kind)) : args.preferred ? ( localize(947, "No preferred code actions available")) : ( localize(948, "No code actions available")),
+            typeof userArgs?.kind === "string" ? args.preferred ? ( localize(963, "No preferred code actions for '{0}' available", userArgs.kind)) : ( localize(964, "No code actions for '{0}' available", userArgs.kind)) : args.preferred ? ( localize(965, "No preferred code actions available")) : ( localize(966, "No code actions available")),
             {
                 include: args.kind,
                 includeSourceActions: true,
@@ -119,7 +119,7 @@ class RefactorAction extends EditorAction {
     constructor() {
         super({
             id: refactorCommandId,
-            label: ( localize2(949, "Refactor...")),
+            label: ( localize2(967, "Refactor...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -153,7 +153,7 @@ class RefactorAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(
             editor,
-            typeof userArgs?.kind === "string" ? args.preferred ? ( localize(950, "No preferred refactorings for '{0}' available", userArgs.kind)) : ( localize(951, "No refactorings for '{0}' available", userArgs.kind)) : args.preferred ? ( localize(952, "No preferred refactorings available")) : ( localize(953, "No refactorings available")),
+            typeof userArgs?.kind === "string" ? args.preferred ? ( localize(968, "No preferred refactorings for '{0}' available", userArgs.kind)) : ( localize(969, "No refactorings for '{0}' available", userArgs.kind)) : args.preferred ? ( localize(970, "No preferred refactorings available")) : ( localize(971, "No refactorings available")),
             {
                 include: CodeActionKind.Refactor.contains(args.kind) ? args.kind : HierarchicalKind.None,
                 onlyIncludePreferredActions: args.preferred
@@ -167,7 +167,7 @@ class SourceAction extends EditorAction {
     constructor() {
         super({
             id: sourceActionCommandId,
-            label: ( localize2(954, "Source Action...")),
+            label: ( localize2(972, "Source Action...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             contextMenuOpts: {
                 group: "1_modification",
@@ -193,7 +193,7 @@ class SourceAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(
             editor,
-            typeof userArgs?.kind === "string" ? args.preferred ? ( localize(955, "No preferred source actions for '{0}' available", userArgs.kind)) : ( localize(956, "No source actions for '{0}' available", userArgs.kind)) : args.preferred ? ( localize(957, "No preferred source actions available")) : ( localize(958, "No source actions available")),
+            typeof userArgs?.kind === "string" ? args.preferred ? ( localize(973, "No preferred source actions for '{0}' available", userArgs.kind)) : ( localize(974, "No source actions for '{0}' available", userArgs.kind)) : args.preferred ? ( localize(975, "No preferred source actions available")) : ( localize(976, "No source actions available")),
             {
                 include: CodeActionKind.Source.contains(args.kind) ? args.kind : HierarchicalKind.None,
                 includeSourceActions: true,
@@ -208,7 +208,7 @@ class OrganizeImportsAction extends EditorAction {
     constructor() {
         super({
             id: organizeImportsCommandId,
-            label: ( localize2(959, "Organize Imports")),
+            label: ( localize2(977, "Organize Imports")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.SourceOrganizeImports)
@@ -220,14 +220,14 @@ class OrganizeImportsAction extends EditorAction {
             },
             metadata: {
                 description: ( localize2(
-                    960,
+                    978,
                     "Organize imports in the current file. Also called 'Optimize Imports' by some tools"
                 ))
             }
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(961, "No organize imports action available")), {
+        return triggerCodeActionsForEditorSelection(editor, ( localize(979, "No organize imports action available")), {
             include: CodeActionKind.SourceOrganizeImports,
             includeSourceActions: true
         }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
@@ -237,7 +237,7 @@ class FixAllAction extends EditorAction {
     constructor() {
         super({
             id: fixAllCommandId,
-            label: ( localize2(962, "Fix All")),
+            label: ( localize2(980, "Fix All")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.SourceFixAll)
@@ -245,7 +245,7 @@ class FixAllAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(963, "No fix all action available")), {
+        return triggerCodeActionsForEditorSelection(editor, ( localize(981, "No fix all action available")), {
             include: CodeActionKind.SourceFixAll,
             includeSourceActions: true
         }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
@@ -255,7 +255,7 @@ class AutoFixAction extends EditorAction {
     constructor() {
         super({
             id: autoFixCommandId,
-            label: ( localize2(964, "Auto Fix...")),
+            label: ( localize2(982, "Auto Fix...")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.QuickFix)
@@ -271,7 +271,7 @@ class AutoFixAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(965, "No auto fixes available")), {
+        return triggerCodeActionsForEditorSelection(editor, ( localize(983, "No auto fixes available")), {
             include: CodeActionKind.QuickFix,
             onlyIncludePreferredActions: true
         }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.AutoFix);

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js

@@ -28,7 +28,7 @@ registerEditorCommand(( new CodeActionCommand()));
         "editor.codeActionWidget.showHeaders": {
             type: "boolean",
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(966, "Enable/disable showing group headers in the Code Action menu.")),
+            description: ( localize(984, "Enable/disable showing group headers in the Code Action menu.")),
             default: true
         }
     }
@@ -40,7 +40,7 @@ registerEditorCommand(( new CodeActionCommand()));
             type: "boolean",
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localize(
-                967,
+                985,
                 "Enable/disable showing nearest Quick Fix within a line when not currently on a diagnostic."
             )),
             default: true
@@ -54,7 +54,7 @@ registerEditorCommand(( new CodeActionCommand()));
             type: "boolean",
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             markdownDescription: ( localize(
-                968,
+                986,
                 "Enable triggering {0} when {1} is set to {2}. Code Actions must be set to {3} to be triggered for window and focus changes.",
                 "`#editor.codeActionsOnSave#`",
                 "`#files.autoSave#`",

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.d.ts

@@ -15,6 +15,7 @@ import { ILanguageFeaturesService } from "../../../common/services/languageFeatu
 import { CodeActionAutoApply, CodeActionFilter, CodeActionItem, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from "../common/types.js";
 import { ApplyCodeActionReason } from "./codeAction.js";
 import { LightBulbInfo } from "./lightBulbWidget.js";
+import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
 interface IActionShowOptions {
     readonly includeDisabledActions?: boolean;
     readonly fromLightbulb?: boolean;
@@ -25,6 +26,7 @@ export declare class CodeActionController extends Disposable implements IEditorC
     private readonly _actionWidgetService;
     private readonly _instantiationService;
     private readonly _progressService;
+    private readonly _keybindingService;
     static readonly ID = "editor.contrib.codeActionController";
     static get(editor: ICodeEditor): CodeActionController | null;
     private readonly _editor;
@@ -34,8 +36,14 @@ export declare class CodeActionController extends Disposable implements IEditorC
     private _showDisabled;
     private readonly _resolver;
     private _disposed;
+    set onlyLightBulbWithEmptySelection(value: boolean);
+    private _onlyLightBulbWithEmptySelection;
+    private readonly _lightBulbInfoObs;
+    private readonly _preferredKbLabel;
+    private readonly _quickFixKbLabel;
+    private _hasLightBulbStateObservers;
     readonly lightBulbState: IObservable<LightBulbInfo | undefined>;
-    constructor(editor: ICodeEditor, markerService: IMarkerService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, languageFeaturesService: ILanguageFeaturesService, progressService: IEditorProgressService, _commandService: ICommandService, _configurationService: IConfigurationService, _actionWidgetService: IActionWidgetService, _instantiationService: IInstantiationService, _progressService: IEditorProgressService);
+    constructor(editor: ICodeEditor, markerService: IMarkerService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, languageFeaturesService: ILanguageFeaturesService, progressService: IEditorProgressService, _commandService: ICommandService, _configurationService: IConfigurationService, _actionWidgetService: IActionWidgetService, _instantiationService: IInstantiationService, _progressService: IEditorProgressService, _keybindingService: IKeybindingService);
     dispose(): void;
     private showCodeActionsFromLightbulb;
     showCodeActions(_trigger: CodeActionTrigger, actions: CodeActionSet, at: IAnchor | IPosition): Promise<void>;

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js

@@ -7,6 +7,7 @@ import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
+import { Event } from '../../../../base/common/event.js';
 import { localize } from '../../../../nls.js';
 import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.service.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
@@ -35,12 +36,14 @@ import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { MessageController } from '../../message/browser/messageController.js';
 import { CodeActionTriggerSource, CodeActionAutoApply, CodeActionKind } from '../common/types.js';
-import { ApplyCodeActionReason, applyCodeAction } from './codeAction.js';
+import { autoFixCommandId, quickFixCommandId, ApplyCodeActionReason, applyCodeAction } from './codeAction.js';
 import { CodeActionKeybindingResolver } from './codeActionKeybindingResolver.js';
 import { toMenuItems } from './codeActionMenu.js';
 import { CodeActionModel, CodeActionsState } from './codeActionModel.js';
-import { LightBulbWidget } from './lightBulbWidget.js';
-import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
+import { LightBulbWidget, computeLightBulbInfo } from './lightBulbWidget.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { derivedOpts } from '../../../../base/common/observableInternal/observables/derived.js';
 
 var CodeActionController_1;
 const DECORATION_CLASS_NAME = "quickfix-edit-highlight";
@@ -54,6 +57,13 @@ let CodeActionController = class CodeActionController extends Disposable {
     static get(editor) {
         return editor.getContribution(CodeActionController_1.ID);
     }
+    set onlyLightBulbWithEmptySelection(value) {
+        const widget = this._lightBulbWidget.rawValue;
+        if (widget) {
+            widget.onlyWithEmptySelection = value;
+        }
+        this._onlyLightBulbWithEmptySelection = value;
+    }
     constructor(
         editor,
         markerService,
@@ -65,7 +75,8 @@ let CodeActionController = class CodeActionController extends Disposable {
         _configurationService,
         _actionWidgetService,
         _instantiationService,
-        _progressService
+        _progressService,
+        _keybindingService
     ) {
         super();
         this._commandService = _commandService;
@@ -73,15 +84,27 @@ let CodeActionController = class CodeActionController extends Disposable {
         this._actionWidgetService = _actionWidgetService;
         this._instantiationService = _instantiationService;
         this._progressService = _progressService;
+        this._keybindingService = _keybindingService;
         this._activeCodeActions = this._register(( new MutableDisposable()));
         this._showDisabled = false;
         this._disposed = false;
-        this.lightBulbState = derived(this, reader => {
-            const widget = this._lightBulbWidget.rawValue;
-            if (!widget) {
-                return undefined;
+        this._onlyLightBulbWithEmptySelection = false;
+        this._lightBulbInfoObs = observableValue(this, undefined);
+        this._preferredKbLabel = observableValue(this, undefined);
+        this._quickFixKbLabel = observableValue(this, undefined);
+        this._hasLightBulbStateObservers = false;
+        this.lightBulbState = derivedOpts({
+            owner: this,
+            onLastObserverRemoved: () => {
+                this._hasLightBulbStateObservers = false;
+                this._model.ignoreLightbulbOff = false;
+            }
+        }, reader => {
+            if (!this._hasLightBulbStateObservers) {
+                this._hasLightBulbStateObservers = true;
+                this._model.ignoreLightbulbOff = true;
             }
-            return widget.lightBulbInfo.read(reader);
+            return this._lightBulbInfoObs.read(reader);
         });
         this._editor = editor;
         this._model = this._register(( new CodeActionModel(
@@ -93,10 +116,23 @@ let CodeActionController = class CodeActionController extends Disposable {
             _configurationService
         )));
         this._register(this._model.onDidChangeState(newState => this.update(newState)));
+        this._register(
+            Event.runAndSubscribe(this._keybindingService.onDidUpdateKeybindings, () => {
+                this._preferredKbLabel.set(
+                    this._keybindingService.lookupKeybinding(autoFixCommandId)?.getLabel() ?? undefined,
+                    undefined
+                );
+                this._quickFixKbLabel.set(
+                    this._keybindingService.lookupKeybinding(quickFixCommandId)?.getLabel() ?? undefined,
+                    undefined
+                );
+            })
+        );
         this._lightBulbWidget = ( new Lazy(() => {
             const widget = this._editor.getContribution(LightBulbWidget.ID);
             if (widget) {
                 this._register(widget.onClick(e => this.showCodeActionsFromLightbulb(e.actions, e)));
+                widget.onlyWithEmptySelection = this._onlyLightBulbWithEmptySelection;
             }
             return widget;
         }));
@@ -181,6 +217,7 @@ let CodeActionController = class CodeActionController extends Disposable {
     async update(newState) {
         if (newState.type !== CodeActionsState.Type.Triggered) {
             this.hideLightBulbWidget();
+            this._lightBulbInfoObs.set(undefined, undefined);
             return;
         }
         let actions;
@@ -198,6 +235,12 @@ let CodeActionController = class CodeActionController extends Disposable {
             return;
         }
         this._lightBulbWidget.value?.update(actions, newState.trigger, newState.position);
+        this._lightBulbInfoObs.set(computeLightBulbInfo(
+            actions,
+            newState.trigger,
+            this._preferredKbLabel.get(),
+            this._quickFixKbLabel.get()
+        ), undefined);
         if (newState.trigger.type === CodeActionTriggerType.Invoke) {
             if (newState.trigger.filter?.include) {
                 const validActionToApply = this.tryGetValidActionToApply(newState.trigger, actions);
@@ -346,7 +389,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                                 column: diagnostic.startColumn
                             })?.word;
                             status(( localize(
-                                969,
+                                987,
                                 "Context: {0} at line {1} and column {2}.",
                                 selectionText,
                                 diagnostic.startLineNumber,
@@ -408,7 +451,7 @@ let CodeActionController = class CodeActionController extends Disposable {
         if (options.includeDisabledActions && actions.validActions.length > 0 && actions.allActions.length !== actions.validActions.length) {
             resultActions.push(this._showDisabled ? {
                 id: "hideMoreActions",
-                label: ( localize(970, "Hide Disabled")),
+                label: ( localize(988, "Hide Disabled")),
                 enabled: true,
                 tooltip: "",
                 class: undefined,
@@ -418,7 +461,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                 }
             } : {
                 id: "showMoreActions",
-                label: ( localize(971, "Show Disabled")),
+                label: ( localize(989, "Show Disabled")),
                 enabled: true,
                 tooltip: "",
                 class: undefined,
@@ -431,7 +474,7 @@ let CodeActionController = class CodeActionController extends Disposable {
         return resultActions;
     }
 };
-CodeActionController = CodeActionController_1 = ( __decorate([( __param(1, IMarkerService)), ( __param(2, IContextKeyService)), ( __param(3, IInstantiationService)), ( __param(4, ILanguageFeaturesService)), ( __param(5, IEditorProgressService)), ( __param(6, ICommandService)), ( __param(7, IConfigurationService)), ( __param(8, IActionWidgetService)), ( __param(9, IInstantiationService)), ( __param(10, IEditorProgressService))], CodeActionController));
+CodeActionController = CodeActionController_1 = ( __decorate([( __param(1, IMarkerService)), ( __param(2, IContextKeyService)), ( __param(3, IInstantiationService)), ( __param(4, ILanguageFeaturesService)), ( __param(5, IEditorProgressService)), ( __param(6, ICommandService)), ( __param(7, IConfigurationService)), ( __param(8, IActionWidgetService)), ( __param(9, IInstantiationService)), ( __param(10, IEditorProgressService)), ( __param(11, IKeybindingService))], CodeActionController));
 registerThemingParticipant((theme, collector) => {
     const addBackgroundColorRule = (selector, color) => {
         if (color) {

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js

@@ -9,34 +9,34 @@ import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 
 const uncategorizedCodeActionGroup = ( Object.freeze({
     kind: HierarchicalKind.Empty,
-    title: ( localize(972, "More Actions..."))
+    title: ( localize(990, "More Actions..."))
 }));
 const codeActionGroups = ( Object.freeze([{
     kind: CodeActionKind.QuickFix,
-    title: ( localize(973, "Quick Fix"))
+    title: ( localize(991, "Quick Fix"))
 }, {
     kind: CodeActionKind.RefactorExtract,
-    title: ( localize(974, "Extract")),
+    title: ( localize(992, "Extract")),
     icon: Codicon.wrench
 }, {
     kind: CodeActionKind.RefactorInline,
-    title: ( localize(975, "Inline")),
+    title: ( localize(993, "Inline")),
     icon: Codicon.wrench
 }, {
     kind: CodeActionKind.RefactorRewrite,
-    title: ( localize(976, "Rewrite")),
+    title: ( localize(994, "Rewrite")),
     icon: Codicon.wrench
 }, {
     kind: CodeActionKind.RefactorMove,
-    title: ( localize(977, "Move")),
+    title: ( localize(995, "Move")),
     icon: Codicon.wrench
 }, {
     kind: CodeActionKind.SurroundWith,
-    title: ( localize(978, "Surround With")),
+    title: ( localize(996, "Surround With")),
     icon: Codicon.surroundWith
 }, {
     kind: CodeActionKind.Source,
-    title: ( localize(979, "Source Action")),
+    title: ( localize(997, "Source Action")),
     icon: Codicon.symbolFile
 }, uncategorizedCodeActionGroup]));
 function toMenuItems(inputCodeActions, showHeaders, keybindingResolver) {

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.d.ts

@@ -44,6 +44,8 @@ export declare class CodeActionModel extends Disposable {
     readonly onDidChangeState: import("../../../../base/common/event.js").Event<CodeActionsState.State>;
     private readonly codeActionsDisposable;
     private _disposed;
+    private _ignoreLightbulbOff;
+    set ignoreLightbulbOff(value: boolean);
     constructor(_editor: ICodeEditor, _registry: LanguageFeatureRegistry<CodeActionProvider>, _markerService: IMarkerService, contextKeyService: IContextKeyService, _progressService?: IEditorProgressService | undefined, _configurationService?: IConfigurationService | undefined);
     dispose(): void;
     private _settingEnabledNearbyQuickfixes;

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js

@@ -24,6 +24,7 @@ class CodeActionOracle extends Disposable {
         this._signalChange = _signalChange;
         this._delay = _delay;
         this._autoTriggerTimer = this._register(( new TimeoutTimer()));
+        this.ignoreLightbulbOff = false;
         this._register(this._markerService.onMarkerChanged(e => this._onMarkerChanges(e)));
         this._register(this._editor.onDidChangeCursorPosition(() => this._tryAutoTrigger()));
     }
@@ -57,9 +58,9 @@ class CodeActionOracle extends Disposable {
             return selection;
         }
         const enabled = this._editor.getOption(EditorOption.lightbulb).enabled;
-        if (enabled === ShowLightbulbIconMode.Off) {
+        if (enabled === ShowLightbulbIconMode.Off && !this.ignoreLightbulbOff) {
             return undefined;
-        } else if (enabled === ShowLightbulbIconMode.On) {
+        } else if (enabled === ShowLightbulbIconMode.Off || enabled === ShowLightbulbIconMode.On) {
             return selection;
         } else if (enabled === ShowLightbulbIconMode.OnCode) {
             const isSelectionEmpty = selection.isEmpty();
@@ -130,6 +131,22 @@ const emptyCodeActionSet = ( Object.freeze({
     allAIFixes: false
 }));
 class CodeActionModel extends Disposable {
+    set ignoreLightbulbOff(value) {
+        if (this._ignoreLightbulbOff === value) {
+            return;
+        }
+        this._ignoreLightbulbOff = value;
+        const oracle = this._codeActionOracle.value;
+        if (oracle) {
+            oracle.ignoreLightbulbOff = value;
+            if (value) {
+                oracle.trigger({
+                    type: CodeActionTriggerType.Auto,
+                    triggerAction: CodeActionTriggerSource.Default
+                });
+            }
+        }
+    }
     constructor(
         _editor,
         _registry,
@@ -150,6 +167,7 @@ class CodeActionModel extends Disposable {
         this.onDidChangeState = this._onDidChangeState.event;
         this.codeActionsDisposable = this._register(( new MutableDisposable()));
         this._disposed = false;
+        this._ignoreLightbulbOff = false;
         this._supportedCodeActions = SUPPORTED_CODE_ACTIONS.bindTo(contextKeyService);
         this._register(this._editor.onDidChangeModel(() => this._update()));
         this._register(this._editor.onDidChangeModelLanguage(() => this._update()));
@@ -185,7 +203,7 @@ class CodeActionModel extends Disposable {
         if (model && ( this._registry.has(model)) && !this._editor.getOption(EditorOption.readOnly)) {
             const supportedActions = this._registry.all(model).flatMap(provider => provider.providedCodeActionKinds ?? []);
             this._supportedCodeActions.set(supportedActions.join(" "));
-            this._codeActionOracle.value = ( new CodeActionOracle(this._editor, this._markerService, trigger => {
+            const oracle = ( new CodeActionOracle(this._editor, this._markerService, trigger => {
                 if (!trigger) {
                     this.setState(CodeActionsState.Empty);
                     return;
@@ -359,6 +377,8 @@ class CodeActionModel extends Disposable {
                     }, 500);
                 }
             }, undefined));
+            oracle.ignoreLightbulbOff = this._ignoreLightbulbOff;
+            this._codeActionOracle.value = oracle;
             this._codeActionOracle.value.trigger({
                 type: CodeActionTriggerType.Auto,
                 triggerAction: CodeActionTriggerSource.Default