@codingame/monaco-vscode-api 8.0.4 → 9.0.0

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

@@ -34,23 +34,23 @@ const CutAction = supportsCut ? registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '2_ccp',
-            title: ( localize(1346, "Cu&&t")),
+            title: ( localize(1355, "Cu&&t")),
             order: 1
         }, {
             menuId: MenuId.EditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(1347, "Cut")),
+            title: ( localize(1356, "Cut")),
             when: EditorContextKeys.writable,
             order: 1,
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(1347, "Cut")),
+            title: ( localize(1356, "Cut")),
             order: 1
         }, {
             menuId: MenuId.SimpleEditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(1347, "Cut")),
+            title: ( localize(1356, "Cut")),
             when: EditorContextKeys.writable,
             order: 1,
         }]
@@ -67,32 +67,32 @@ const CopyAction = supportsCopy ? registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '2_ccp',
-            title: ( localize(1348, "&&Copy")),
+            title: ( localize(1357, "&&Copy")),
             order: 2
         }, {
             menuId: MenuId.EditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(1349, "Copy")),
+            title: ( localize(1358, "Copy")),
             order: 2,
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(1349, "Copy")),
+            title: ( localize(1358, "Copy")),
             order: 1
         }, {
             menuId: MenuId.SimpleEditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(1349, "Copy")),
+            title: ( localize(1358, "Copy")),
             order: 2,
         }]
 })))) : undefined;
-MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, { submenu: MenuId.MenubarCopy, title: ( localize2(1350, "Copy As")), group: '2_ccp', order: 3 });
-MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextCopy, title: ( localize2(1350, "Copy As")), group: CLIPBOARD_CONTEXT_MENU_GROUP, order: 3 });
-MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextShare, title: ( localize2(1351, "Share")), group: '11_share', order: -1, when: ( (ContextKeyExpr.and(
+MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, { submenu: MenuId.MenubarCopy, title: ( localize2(1359, "Copy As")), group: '2_ccp', order: 3 });
+MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextCopy, title: ( localize2(1359, "Copy As")), group: CLIPBOARD_CONTEXT_MENU_GROUP, order: 3 });
+MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextShare, title: ( localize2(1360, "Share")), group: '11_share', order: -1, when: ( (ContextKeyExpr.and(
      (ContextKeyExpr.notEquals('resourceScheme', 'output')),
     EditorContextKeys.editorTextFocus
 ))) });
-MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { submenu: MenuId.ExplorerContextShare, title: ( localize2(1351, "Share")), group: '11_share', order: -1 });
+MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { submenu: MenuId.ExplorerContextShare, title: ( localize2(1360, "Share")), group: '11_share', order: -1 });
 const PasteAction = supportsPaste ? registerCommand(( (new MultiCommand({
     id: 'editor.action.clipboardPasteAction',
     precondition: undefined,
@@ -106,23 +106,23 @@ const PasteAction = supportsPaste ? registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '2_ccp',
-            title: ( localize(1352, "&&Paste")),
+            title: ( localize(1361, "&&Paste")),
             order: 4
         }, {
             menuId: MenuId.EditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(1353, "Paste")),
+            title: ( localize(1362, "Paste")),
             when: EditorContextKeys.writable,
             order: 4,
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(1353, "Paste")),
+            title: ( localize(1362, "Paste")),
             order: 1
         }, {
             menuId: MenuId.SimpleEditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(1353, "Paste")),
+            title: ( localize(1362, "Paste")),
             when: EditorContextKeys.writable,
             order: 4,
         }]
@@ -131,7 +131,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.clipboardCopyWithSyntaxHighlightingAction',
-            label: ( localize(1354, "Copy With Syntax Highlighting")),
+            label: ( localize(1363, "Copy With Syntax Highlighting")),
             alias: 'Copy With Syntax Highlighting',
             precondition: undefined,
             kbOpts: {

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

@@ -241,7 +241,7 @@ async function applyCodeAction(accessor, item, codeActionReason, options, token
             const message = asMessage(err);
             notificationService.error(typeof message === 'string'
                 ? message
-                : ( localize(4521, "An unknown error occurred while applying the code action")));
+                : ( localize(4550, "An unknown error occurred while applying the code action")));
         }
     }
 }

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

@@ -24,23 +24,23 @@ const argsSchema = {
     properties: {
         'kind': {
             type: 'string',
-            description: ( localize(5000, "Kind of the code action to run.")),
+            description: ( localize(4980, "Kind of the code action to run.")),
         },
         'apply': {
             type: 'string',
-            description: ( localize(5001, "Controls when the returned actions are applied.")),
+            description: ( localize(4981, "Controls when the returned actions are applied.")),
             default: CodeActionAutoApply.IfSingle,
             enum: [CodeActionAutoApply.First, CodeActionAutoApply.IfSingle, CodeActionAutoApply.Never],
             enumDescriptions: [
-                ( localize(5002, "Always apply the first returned code action.")),
-                ( localize(5003, "Apply the first returned code action if it is the only one.")),
-                ( localize(5004, "Do not apply the returned code actions.")),
+                ( localize(4982, "Always apply the first returned code action.")),
+                ( localize(4983, "Apply the first returned code action if it is the only one.")),
+                ( localize(4984, "Do not apply the returned code actions.")),
             ]
         },
         'preferred': {
             type: 'boolean',
             default: false,
-            description: ( localize(5005, "Controls if only preferred code actions should be returned.")),
+            description: ( localize(4985, "Controls if only preferred code actions should be returned.")),
         }
     }
 };
@@ -54,7 +54,7 @@ class QuickFixAction extends EditorAction {
     constructor() {
         super({
             id: quickFixCommandId,
-            label: ( localize(5006, "Quick Fix...")),
+            label: ( localize(4986, "Quick Fix...")),
             alias: 'Quick Fix...',
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider))),
             kbOpts: {
@@ -65,7 +65,7 @@ class QuickFixAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(5007, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(4987, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
     }
 }
 class CodeActionCommand extends EditorCommand {
@@ -86,11 +86,11 @@ class CodeActionCommand extends EditorCommand {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(5008, "No preferred code actions for '{0}' available", userArgs.kind))
-                : ( localize(5009, "No code actions for '{0}' available", userArgs.kind))
+                ? ( localize(4988, "No preferred code actions for '{0}' available", userArgs.kind))
+                : ( localize(4989, "No code actions for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(5010, "No preferred code actions available"))
-                : ( localize(5011, "No code actions available")), {
+                ? ( localize(4990, "No preferred code actions available"))
+                : ( localize(4991, "No code actions available")), {
             include: args.kind,
             includeSourceActions: true,
             onlyIncludePreferredActions: args.preferred,
@@ -101,7 +101,7 @@ class RefactorAction extends EditorAction {
     constructor() {
         super({
             id: refactorCommandId,
-            label: ( localize(5012, "Refactor...")),
+            label: ( localize(4992, "Refactor...")),
             alias: 'Refactor...',
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider))),
             kbOpts: {
@@ -133,11 +133,11 @@ class RefactorAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(5013, "No preferred refactorings for '{0}' available", userArgs.kind))
-                : ( localize(5014, "No refactorings for '{0}' available", userArgs.kind))
+                ? ( localize(4993, "No preferred refactorings for '{0}' available", userArgs.kind))
+                : ( localize(4994, "No refactorings for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(5015, "No preferred refactorings available"))
-                : ( localize(5016, "No refactorings available")), {
+                ? ( localize(4995, "No preferred refactorings available"))
+                : ( localize(4996, "No refactorings available")), {
             include: CodeActionKind.Refactor.contains(args.kind) ? args.kind : HierarchicalKind.None,
             onlyIncludePreferredActions: args.preferred
         }, args.apply, CodeActionTriggerSource.Refactor);
@@ -147,7 +147,7 @@ class SourceAction extends EditorAction {
     constructor() {
         super({
             id: sourceActionCommandId,
-            label: ( localize(5017, "Source Action...")),
+            label: ( localize(4997, "Source Action...")),
             alias: 'Source Action...',
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider))),
             contextMenuOpts: {
@@ -171,11 +171,11 @@ class SourceAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(5018, "No preferred source actions for '{0}' available", userArgs.kind))
-                : ( localize(5019, "No source actions for '{0}' available", userArgs.kind))
+                ? ( localize(4998, "No preferred source actions for '{0}' available", userArgs.kind))
+                : ( localize(4999, "No source actions for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(5020, "No preferred source actions available"))
-                : ( localize(5021, "No source actions available")), {
+                ? ( localize(5000, "No preferred source actions available"))
+                : ( localize(5001, "No source actions available")), {
             include: CodeActionKind.Source.contains(args.kind) ? args.kind : HierarchicalKind.None,
             includeSourceActions: true,
             onlyIncludePreferredActions: args.preferred,
@@ -186,7 +186,7 @@ class OrganizeImportsAction extends EditorAction {
     constructor() {
         super({
             id: organizeImportsCommandId,
-            label: ( localize(5022, "Organize Imports")),
+            label: ( localize(5002, "Organize Imports")),
             alias: 'Organize Imports',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -200,14 +200,14 @@ class OrganizeImportsAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(5023, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(5003, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
     }
 }
 class FixAllAction extends EditorAction {
     constructor() {
         super({
             id: fixAllCommandId,
-            label: ( localize(5024, "Fix All")),
+            label: ( localize(5004, "Fix All")),
             alias: 'Fix All',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -216,14 +216,14 @@ class FixAllAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(5025, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(5005, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
     }
 }
 class AutoFixAction extends EditorAction {
     constructor() {
         super({
             id: autoFixCommandId,
-            label: ( localize(5026, "Auto Fix...")),
+            label: ( localize(5006, "Auto Fix...")),
             alias: 'Auto Fix...',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -240,7 +240,7 @@ class AutoFixAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(5027, "No auto fixes available")), {
+        return triggerCodeActionsForEditorSelection(editor, ( localize(5007, "No auto fixes available")), {
             include: CodeActionKind.QuickFix,
             onlyIncludePreferredActions: true
         }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.AutoFix);

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

@@ -21,7 +21,7 @@ registerEditorCommand(( (new CodeActionCommand())));
         'editor.codeActionWidget.showHeaders': {
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1355, "Enable/disable showing group headers in the Code Action menu.")),
+            description: ( localize(1364, "Enable/disable showing group headers in the Code Action menu.")),
             default: true,
         },
     }
@@ -33,7 +33,7 @@ registerEditorCommand(( (new CodeActionCommand())));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localize(
-                1356,
+                1365,
                 "Enable/disable showing nearest Quick Fix within a line when not currently on a diagnostic."
             )),
             default: true,
@@ -47,7 +47,7 @@ registerEditorCommand(( (new CodeActionCommand())));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             markdownDescription: ( localize(
-                1357,
+                1366,
                 '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.js

@@ -38,6 +38,7 @@ import { registerThemingParticipant } from '../../../../platform/theme/common/th
 import { CodeActionTriggerSource, CodeActionAutoApply, CodeActionKind } from '../common/types.js';
 import { CodeActionModel, CodeActionsState } from './codeActionModel.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 var CodeActionController_1;
 const DECORATION_CLASS_NAME = 'quickfix-edit-highlight';
 let CodeActionController = class CodeActionController extends Disposable {
@@ -46,12 +47,13 @@ let CodeActionController = class CodeActionController extends Disposable {
     static get(editor) {
         return editor.getContribution(CodeActionController_1.ID);
     }
-    constructor(editor, markerService, contextKeyService, instantiationService, languageFeaturesService, progressService, _commandService, _configurationService, _actionWidgetService, _instantiationService) {
+    constructor(editor, markerService, contextKeyService, instantiationService, languageFeaturesService, progressService, _commandService, _configurationService, _actionWidgetService, _instantiationService, _telemetryService) {
         super();
         this._commandService = _commandService;
         this._configurationService = _configurationService;
         this._actionWidgetService = _actionWidgetService;
         this._instantiationService = _instantiationService;
+        this._telemetryService = _telemetryService;
         this._activeCodeActions = this._register(( (new MutableDisposable())));
         this._showDisabled = false;
         this._disposed = false;
@@ -62,7 +64,8 @@ let CodeActionController = class CodeActionController extends Disposable {
             markerService,
             contextKeyService,
             progressService,
-            _configurationService
+            _configurationService,
+            this._telemetryService
         ))));
         this._register(this._model.onDidChangeState(newState => this.update(newState)));
         this._lightBulbWidget = ( (new Lazy(() => {
@@ -140,6 +143,10 @@ let CodeActionController = class CodeActionController extends Disposable {
         if (this._disposed) {
             return;
         }
+        const selection = this._editor.getSelection();
+        if (selection?.startLineNumber !== newState.position.lineNumber) {
+            return;
+        }
         this._lightBulbWidget.value?.update(actions, newState.trigger, newState.position);
         if (newState.trigger.type === CodeActionTriggerType.Invoke) {
             if (newState.trigger.filter?.include) {
@@ -270,7 +277,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                         if (diagnostic.startLineNumber && diagnostic.startColumn) {
                             const selectionText = this._editor.getModel()?.getWordAtPosition({ lineNumber: diagnostic.startLineNumber, column: diagnostic.startColumn })?.word;
                             status(( localize(
-                                5028,
+                                5008,
                                 "Context: {0} at line {1} and column {2}.",
                                 selectionText,
                                 diagnostic.startLineNumber,
@@ -317,7 +324,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(5029, 'Hide Disabled')),
+                label: ( localize(5009, 'Hide Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,
@@ -327,7 +334,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                 }
             } : {
                 id: 'showMoreActions',
-                label: ( localize(5030, 'Show Disabled')),
+                label: ( localize(5010, 'Show Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,
@@ -349,7 +356,8 @@ CodeActionController = CodeActionController_1 = ( (__decorate([
     ( (__param(6, ICommandService))),
     ( (__param(7, IConfigurationService))),
     ( (__param(8, IActionWidgetService))),
-    ( (__param(9, IInstantiationService)))
+    ( (__param(9, IInstantiationService))),
+    ( (__param(10, ITelemetryService)))
 ], CodeActionController)));
 registerThemingParticipant((theme, collector) => {
     const addBackgroundColorRule = (selector, color) => {

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

@@ -6,15 +6,15 @@ import '../../symbolIcons/browser/symbolIcons.js';
 import { localize } from '../../../../nls.js';
 import { ActionListItemKind } from '../../../../platform/actionWidget/browser/actionList.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
-const uncategorizedCodeActionGroup = ( (Object.freeze({ kind: HierarchicalKind.Empty, title: ( localize(9847, 'More Actions...')) })));
+const uncategorizedCodeActionGroup = ( (Object.freeze({ kind: HierarchicalKind.Empty, title: ( localize(9884, 'More Actions...')) })));
 const codeActionGroups = ( (Object.freeze([
-    { kind: CodeActionKind.QuickFix, title: ( localize(9848, 'Quick Fix')) },
-    { kind: CodeActionKind.RefactorExtract, title: ( localize(9849, 'Extract')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorInline, title: ( localize(9850, 'Inline')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorRewrite, title: ( localize(9851, 'Rewrite')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorMove, title: ( localize(9852, 'Move')), icon: Codicon.wrench },
-    { kind: CodeActionKind.SurroundWith, title: ( localize(9853, 'Surround With')), icon: Codicon.surroundWith },
-    { kind: CodeActionKind.Source, title: ( localize(9854, 'Source Action')), icon: Codicon.symbolFile },
+    { kind: CodeActionKind.QuickFix, title: ( localize(9885, 'Quick Fix')) },
+    { kind: CodeActionKind.RefactorExtract, title: ( localize(9886, 'Extract')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorInline, title: ( localize(9887, 'Inline')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorRewrite, title: ( localize(9888, 'Rewrite')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorMove, title: ( localize(9889, 'Move')), icon: Codicon.wrench },
+    { kind: CodeActionKind.SurroundWith, title: ( localize(9890, 'Surround With')), icon: Codicon.surroundWith },
+    { kind: CodeActionKind.Source, title: ( localize(9891, 'Source Action')), icon: Codicon.symbolFile },
     uncategorizedCodeActionGroup,
 ])));
 function toMenuItems(inputCodeActions, showHeaders, keybindingResolver) {

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

@@ -12,6 +12,7 @@ import { Progress } from '../../../../platform/progress/common/progress.js';
 import { CodeActionTriggerSource, CodeActionKind } from '../common/types.js';
 import { getCodeActions } from './codeAction.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
 const SUPPORTED_CODE_ACTIONS = ( new RawContextKey('supportedCodeAction', ''));
 const APPLY_FIX_ALL_COMMAND_ID = '_typescript.applyFixAllCodeAction';
 class CodeActionOracle extends Disposable {
@@ -122,13 +123,14 @@ const emptyCodeActionSet = ( Object.freeze({
     allAIFixes: false,
 }));
 class CodeActionModel extends Disposable {
-    constructor(_editor, _registry, _markerService, contextKeyService, _progressService, _configurationService) {
+    constructor(_editor, _registry, _markerService, contextKeyService, _progressService, _configurationService, _telemetryService) {
         super();
         this._editor = _editor;
         this._registry = _registry;
         this._markerService = _markerService;
         this._progressService = _progressService;
         this._configurationService = _configurationService;
+        this._telemetryService = _telemetryService;
         this._codeActionOracle = this._register(( new MutableDisposable()));
         this._state = CodeActionsState.Empty;
         this._onDidChangeState = this._register(( new Emitter()));
@@ -259,6 +261,17 @@ class CodeActionModel extends Disposable {
                             }
                         }
                     }
+                    if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
+                        const sw = ( new StopWatch());
+                        const codeActions = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
+                        if (this._telemetryService) {
+                            this._telemetryService.publicLog2('codeAction.invokedDurations', {
+                                codeActions: codeActions.validActions.length,
+                                duration: sw.elapsed()
+                            });
+                        }
+                        return codeActions;
+                    }
                     return getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
                 });
                 if (trigger.trigger.type === CodeActionTriggerType.Invoke) {

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

@@ -18,23 +18,23 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { Range } from '../../../common/core/range.js';
 var LightBulbWidget_1;
 const GUTTER_LIGHTBULB_ICON = registerIcon('gutter-lightbulb', Codicon.lightBulb, ( localize(
-    5031,
+    5011,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor.'
 )));
 const GUTTER_LIGHTBULB_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-auto-fix', Codicon.lightbulbAutofix, ( localize(
-    5032,
+    5012,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and a quick fix is available.'
 )));
 const GUTTER_LIGHTBULB_AIFIX_ICON = registerIcon('gutter-lightbulb-sparkle', Codicon.lightbulbSparkle, ( localize(
-    5033,
+    5013,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix is available.'
 )));
 const GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-aifix-auto-fix', Codicon.lightbulbSparkleAutofix, ( localize(
-    5034,
+    5014,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'
 )));
 const GUTTER_SPARKLE_FILLED_ICON = registerIcon('gutter-lightbulb-sparkle-filled', Codicon.sparkleFilled, ( localize(
-    5035,
+    5015,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'
 )));
 var LightBulbState;
@@ -75,6 +75,13 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._state = LightBulbState.Hidden;
         this._gutterState = LightBulbState.Hidden;
         this._iconClasses = [];
+        this.lightbulbClasses = [
+            'codicon-' + GUTTER_LIGHTBULB_ICON.id,
+            'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
+            'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
+            'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
+            'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
+        ];
         this.gutterDecoration = LightBulbWidget_1.GUTTER_DECORATION;
         this._domNode = $('div.lightBulbWidget');
         this._domNode.role = 'listbox';
@@ -120,14 +127,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             this._updateLightBulbTitleAndIcon();
         }));
         this._register(this._editor.onMouseDown(async (e) => {
-            const lightbulbClasses = [
-                'codicon-' + GUTTER_LIGHTBULB_ICON.id,
-                'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
-                'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
-                'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
-                'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
-            ];
-            if (!e.target.element || !( (lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))))) {
+            if (!e.target.element || !( (this.lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))))) {
                 return;
             }
             if (this.gutterState.type !== LightBulbState.Type.Showing) {
@@ -169,6 +169,11 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             this.gutterHide();
             return this.hide();
         }
+        const hasTextFocus = this._editor.hasTextFocus();
+        if (!hasTextFocus) {
+            this.gutterHide();
+            return this.hide();
+        }
         const options = this._editor.getOptions();
         if (!options.get(EditorOption.lightbulb).enabled) {
             this.gutterHide();
@@ -188,6 +193,17 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         const isFolded = (lineNumber) => {
             return lineNumber > 2 && this._editor.getTopForLineNumber(lineNumber) === this._editor.getTopForLineNumber(lineNumber - 1);
         };
+        const currLineDecorations = this._editor.getLineDecorations(lineNumber);
+        let hasDecoration = false;
+        if (currLineDecorations) {
+            for (const decoration of currLineDecorations) {
+                const glyphClass = decoration.options.glyphMarginClassName;
+                if (glyphClass && !( (this.lightbulbClasses.some(className => glyphClass.includes(className))))) {
+                    hasDecoration = true;
+                    break;
+                }
+            }
+        }
         let effectiveLineNumber = lineNumber;
         let effectiveColumnNumber = 1;
         if (!lineHasSpace) {
@@ -202,15 +218,6 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
                 const nextLineEmptyOrIndented = !endLine && isLineEmptyOrIndented(lineNumber + 1);
                 const currLineEmptyOrIndented = isLineEmptyOrIndented(lineNumber);
                 const notEmpty = !nextLineEmptyOrIndented && !prevLineEmptyOrIndented;
-                let hasDecoration = false;
-                const currLineDecorations = this._editor.getLineDecorations(lineNumber);
-                if (currLineDecorations) {
-                    for (const decoration of currLineDecorations) {
-                        if (decoration.options.glyphMarginClassName?.includes(Codicon.debugBreakpoint.id)) {
-                            hasDecoration = true;
-                        }
-                    }
-                }
                 if (!nextLineEmptyOrIndented && !prevLineEmptyOrIndented && !hasDecoration) {
                     this.gutterState = new LightBulbState.Showing(actions, trigger, atPosition, {
                         position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
@@ -219,7 +226,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
                     this.renderGutterLightbub();
                     return this.hide();
                 }
-                else if (prevLineEmptyOrIndented || endLine || (notEmpty && !currLineEmptyOrIndented)) {
+                else if (prevLineEmptyOrIndented || endLine || (prevLineEmptyOrIndented && !currLineEmptyOrIndented)) {
                     effectiveLineNumber -= 1;
                 }
                 else if (nextLineEmptyOrIndented || (notEmpty && currLineEmptyOrIndented)) {
@@ -231,8 +238,13 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
                     position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
                     preference: LightBulbWidget_1._posPref
                 });
-                this.renderGutterLightbub();
-                return this.hide();
+                if (hasDecoration) {
+                    this.gutterHide();
+                }
+                else {
+                    this.renderGutterLightbub();
+                    return this.hide();
+                }
             }
             else if ((lineNumber < model.getLineCount()) && !isFolded(lineNumber + 1)) {
                 effectiveLineNumber += 1;
@@ -385,20 +397,20 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             return;
         }
         if (autoRun) {
-            this.title = ( localize(5036, "Run: {0}", this.state.actions.validActions[0].action.title));
+            this.title = ( localize(5016, "Run: {0}", this.state.actions.validActions[0].action.title));
         }
         else if (autoFix && this._preferredKbLabel) {
             this.title = ( localize(
-                5037,
+                5017,
                 "Show Code Actions. Preferred Quick Fix Available ({0})",
                 this._preferredKbLabel
             ));
         }
         else if (!autoFix && this._quickFixKbLabel) {
-            this.title = ( localize(5038, "Show Code Actions ({0})", this._quickFixKbLabel));
+            this.title = ( localize(5018, "Show Code Actions ({0})", this._quickFixKbLabel));
         }
         else if (!autoFix) {
-            this.title = ( localize(5039, "Show Code Actions"));
+            this.title = ( localize(5019, "Show Code Actions"));
         }
     }
     set title(value) {

package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js

@@ -388,7 +388,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         super({
             id: 'codelens.showLensesInCurrentLine',
             precondition: EditorContextKeys.hasCodeLensProvider,
-            label: ( localize(1358, "Show CodeLens Commands For Current Line")),
+            label: ( localize(1367, "Show CodeLens Commands For Current Line")),
             alias: 'Show CodeLens Commands For Current Line',
         });
     }
@@ -422,7 +422,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         }
         const item = await quickInputService.pick(items, {
             canPickMany: false,
-            placeHolder: ( localize(1359, "Select a command"))
+            placeHolder: ( localize(1368, "Select a command"))
         });
         if (!item) {
             return;

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js

@@ -5,7 +5,7 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { ColorDecorationInjectedTextMarker } from './colorDetector.js';
 import { ColorHoverParticipant } from './colorHoverParticipant.js';
-import { HoverController } from '../../hover/browser/hoverController.js';
+import { ContentHoverController } from '../../hover/browser/contentHoverController2.js';
 import { HoverStartMode, HoverStartSource } from '../../hover/browser/hoverOperation.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 class ColorContribution extends Disposable {
@@ -37,7 +37,7 @@ class ColorContribution extends Disposable {
         if (!target.range) {
             return;
         }
-        const hoverController = this._editor.getContribution(HoverController.ID);
+        const hoverController = this._editor.getContribution(ContentHoverController.ID);
         if (!hoverController) {
             return;
         }