@codingame/monaco-vscode-api 19.1.3 → 20.0.0

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

@@ -29,12 +29,12 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 
 registerCss(bracketMatching);
-const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', '#A0A0A0', ( localize(889, 'Overview ruler marker color for matching brackets.')));
+const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', '#A0A0A0', ( localize(899, 'Overview ruler marker color for matching brackets.')));
 class JumpToBracketAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.jumpToBracket',
-            label: ( localize2(890, "Go to Bracket")),
+            label: ( localize2(900, "Go to Bracket")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -51,10 +51,10 @@ class SelectToBracketAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.selectToBracket',
-            label: ( localize2(891, "Select to Bracket")),
+            label: ( localize2(901, "Select to Bracket")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(892, "Select the text inside and including the brackets or curly braces")),
+                description: ( localize2(902, "Select the text inside and including the brackets or curly braces")),
                 args: [{
                         name: 'args',
                         schema: {
@@ -82,7 +82,7 @@ class RemoveBracketsAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.removeBrackets',
-            label: ( localize2(893, "Remove Brackets")),
+            label: ( localize2(903, "Remove Brackets")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -350,7 +350,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'editor.action.jumpToBracket',
-        title: ( localize(894, "Go to &&Bracket"))
+        title: ( localize(904, "Go to &&Bracket"))
     },
     order: 2
 });

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

@@ -27,7 +27,7 @@ class MoveCaretLeftAction extends MoveCaretAction {
     constructor() {
         super(true, {
             id: 'editor.action.moveCarretLeftAction',
-            label: ( localize2(895, "Move Selected Text Left")),
+            label: ( localize2(905, "Move Selected Text Left")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -36,7 +36,7 @@ class MoveCaretRightAction extends MoveCaretAction {
     constructor() {
         super(false, {
             id: 'editor.action.moveCarretRightAction',
-            label: ( localize2(896, "Move Selected Text Right")),
+            label: ( localize2(906, "Move Selected Text Right")),
             precondition: EditorContextKeys.writable
         });
     }

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(897, "Transpose Letters")),
+            label: ( localize2(907, "Transpose Letters")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,

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

@@ -9,6 +9,7 @@ import { MenuId, MenuRegistry } from '../../../../platform/actions/common/action
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IProductService } from '../../../../platform/product/common/productService.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { CopyOptions, InMemoryClipboardMetadataManager } from '../../../browser/controller/editContext/clipboardUtils.js';
@@ -40,23 +41,23 @@ const CutAction = supportsCut ? registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '2_ccp',
-            title: ( localize(898, "Cu&&t")),
+            title: ( localize(908, "Cu&&t")),
             order: 1
         }, {
             menuId: MenuId.EditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(899, "Cut")),
+            title: ( localize(909, "Cut")),
             when: EditorContextKeys.writable,
             order: 1,
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(899, "Cut")),
+            title: ( localize(909, "Cut")),
             order: 1
         }, {
             menuId: MenuId.SimpleEditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(899, "Cut")),
+            title: ( localize(909, "Cut")),
             when: EditorContextKeys.writable,
             order: 1,
         }]
@@ -73,29 +74,29 @@ const CopyAction = supportsCopy ? registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '2_ccp',
-            title: ( localize(900, "&&Copy")),
+            title: ( localize(910, "&&Copy")),
             order: 2
         }, {
             menuId: MenuId.EditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(901, "Copy")),
+            title: ( localize(911, "Copy")),
             order: 2,
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(901, "Copy")),
+            title: ( localize(911, "Copy")),
             order: 1
         }, {
             menuId: MenuId.SimpleEditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(901, "Copy")),
+            title: ( localize(911, "Copy")),
             order: 2,
         }]
 }))) : undefined;
-MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, { submenu: MenuId.MenubarCopy, title: ( localize2(902, "Copy As")), group: '2_ccp', order: 3 });
-MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextCopy, title: ( localize2(902, "Copy As")), group: CLIPBOARD_CONTEXT_MENU_GROUP, order: 3 });
-MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextShare, title: ( localize2(903, "Share")), group: '11_share', order: -1, when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('resourceScheme', 'output')), EditorContextKeys.editorTextFocus)) });
-MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { submenu: MenuId.ExplorerContextShare, title: ( localize2(903, "Share")), group: '11_share', order: -1 });
+MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, { submenu: MenuId.MenubarCopy, title: ( localize2(912, "Copy As")), group: '2_ccp', order: 3 });
+MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextCopy, title: ( localize2(912, "Copy As")), group: CLIPBOARD_CONTEXT_MENU_GROUP, order: 3 });
+MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextShare, title: ( localize2(913, "Share")), group: '11_share', order: -1, when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('resourceScheme', 'output')), EditorContextKeys.editorTextFocus)) });
+MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { submenu: MenuId.ExplorerContextShare, title: ( localize2(913, "Share")), group: '11_share', order: -1 });
 const PasteAction = supportsPaste ? registerCommand(( new MultiCommand({
     id: 'editor.action.clipboardPasteAction',
     precondition: undefined,
@@ -109,23 +110,23 @@ const PasteAction = supportsPaste ? registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '2_ccp',
-            title: ( localize(904, "&&Paste")),
+            title: ( localize(914, "&&Paste")),
             order: 4
         }, {
             menuId: MenuId.EditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(905, "Paste")),
+            title: ( localize(915, "Paste")),
             when: EditorContextKeys.writable,
             order: 4,
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(905, "Paste")),
+            title: ( localize(915, "Paste")),
             order: 1
         }, {
             menuId: MenuId.SimpleEditorContext,
             group: CLIPBOARD_CONTEXT_MENU_GROUP,
-            title: ( localize(905, "Paste")),
+            title: ( localize(915, "Paste")),
             when: EditorContextKeys.writable,
             order: 4,
         }]
@@ -134,7 +135,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.clipboardCopyWithSyntaxHighlightingAction',
-            label: ( localize2(906, "Copy with Syntax Highlighting")),
+            label: ( localize2(916, "Copy with Syntax Highlighting")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -144,6 +145,8 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
         });
     }
     run(accessor, editor) {
+        const logService = accessor.get(ILogService);
+        logService.trace('ExecCommandCopyWithSyntaxHighlightingAction#run');
         if (!editor.hasModel()) {
             return;
         }
@@ -153,7 +156,9 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
         }
         CopyOptions.forceCopyWithSyntaxHighlighting = true;
         editor.focus();
+        logService.trace('ExecCommandCopyWithSyntaxHighlightingAction (before execCommand copy)');
         editor.getContainerDomNode().ownerDocument.execCommand('copy');
+        logService.trace('ExecCommandCopyWithSyntaxHighlightingAction (after execCommand copy)');
         CopyOptions.forceCopyWithSyntaxHighlighting = false;
     }
 }
@@ -162,6 +167,8 @@ function registerExecCommandImpl(target, browserCommand) {
         return;
     }
     target.addImplementation(10000, 'code-editor', (accessor, args) => {
+        const logService = accessor.get(ILogService);
+        logService.trace('registerExecCommandImpl (addImplementation code-editor for : ', browserCommand, ')');
         const focusedEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
         if (focusedEditor && focusedEditor.hasTextFocus()) {
             const emptySelectionClipboard = focusedEditor.getOption(EditorOption.emptySelectionClipboard);
@@ -170,18 +177,26 @@ function registerExecCommandImpl(target, browserCommand) {
                 return true;
             }
             if (focusedEditor.getOption(EditorOption.effectiveEditContext) && browserCommand === 'cut') {
+                logService.trace('registerExecCommandImpl (before execCommand copy)');
                 focusedEditor.getContainerDomNode().ownerDocument.execCommand('copy');
                 focusedEditor.trigger(undefined, Handler.Cut, undefined);
+                logService.trace('registerExecCommandImpl (after execCommand copy)');
             }
             else {
+                logService.trace('registerExecCommandImpl (before execCommand ' + browserCommand + ')');
                 focusedEditor.getContainerDomNode().ownerDocument.execCommand(browserCommand);
+                logService.trace('registerExecCommandImpl (after execCommand ' + browserCommand + ')');
             }
             return true;
         }
         return false;
     });
     target.addImplementation(0, 'generic-dom', (accessor, args) => {
+        const logService = accessor.get(ILogService);
+        logService.trace('registerExecCommandImpl (addImplementation generic-dom for : ', browserCommand, ')');
+        logService.trace('registerExecCommandImpl (before execCommand ' + browserCommand + ')');
         getActiveDocument().execCommand(browserCommand);
+        logService.trace('registerExecCommandImpl (after execCommand ' + browserCommand + ')');
         return true;
     });
 }
@@ -189,6 +204,8 @@ registerExecCommandImpl(CutAction, 'cut');
 registerExecCommandImpl(CopyAction, 'copy');
 if (PasteAction) {
     PasteAction.addImplementation(10000, 'code-editor', (accessor, args) => {
+        const logService = accessor.get(ILogService);
+        logService.trace('registerExecCommandImpl (addImplementation code-editor for : paste)');
         const codeEditorService = accessor.get(ICodeEditorService);
         const clipboardService = accessor.get(IClipboardService);
         const telemetryService = accessor.get(ITelemetryService);
@@ -203,9 +220,12 @@ if (PasteAction) {
                 }
             }
             const sw = StopWatch.create(true);
+            logService.trace('registerExecCommandImpl (before triggerPaste)');
             const triggerPaste = clipboardService.triggerPaste(getActiveWindow().vscodeWindowId);
             if (triggerPaste) {
+                logService.trace('registerExecCommandImpl (triggerPaste defined)');
                 return triggerPaste.then(async () => {
+                    logService.trace('registerExecCommandImpl (after triggerPaste)');
                     if (productService.quality !== 'stable') {
                         const duration = sw.elapsed();
                         telemetryService.publicLog2('editorAsyncPaste', { duration });
@@ -213,7 +233,11 @@ if (PasteAction) {
                     return CopyPasteController.get(focusedEditor)?.finishedPaste() ?? Promise.resolve();
                 });
             }
+            else {
+                logService.trace('registerExecCommandImpl (triggerPaste undefined)');
+            }
             if (isWeb) {
+                logService.trace('registerExecCommandImpl (Paste handling on web)');
                 return (async () => {
                     const clipboardText = await clipboardService.readText();
                     if (clipboardText !== '') {
@@ -226,6 +250,7 @@ if (PasteAction) {
                             multicursorText = (typeof metadata.multicursorText !== 'undefined' ? metadata.multicursorText : null);
                             mode = metadata.mode;
                         }
+                        logService.trace('registerExecCommandImpl (clipboardText.length : ', clipboardText.length, ' id : ', metadata?.id, ')');
                         focusedEditor.trigger('keyboard', Handler.Paste, {
                             text: clipboardText,
                             pasteOnNewLine,
@@ -240,6 +265,8 @@ if (PasteAction) {
         return false;
     });
     PasteAction.addImplementation(0, 'generic-dom', (accessor, args) => {
+        const logService = accessor.get(ILogService);
+        logService.trace('registerExecCommandImpl (addImplementation generic-dom for : paste)');
         const triggerPaste = accessor.get(IClipboardService).triggerPaste(getActiveWindow().vscodeWindowId);
         return triggerPaste ?? false;
     });

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

@@ -16,10 +16,10 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { IBulkEditService } from '../../../browser/services/bulkEditService.service.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
-import { CodeActionTriggerType } from '../../../common/languages.js';
+import { CodeActionTriggerType, ProviderId } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { IModelService } from '../../../common/services/model.service.js';
-import { EditReasons } from '../../../common/textModelEditReason.js';
+import { EditSources } from '../../../common/textModelEditSource.js';
 import { TextModelCancellationTokenSource } from '../../editorState/browser/editorState.js';
 import { CodeActionKind, filtersAction, CodeActionItem, mayIncludeActionsOfKind, CodeActionTriggerSource } from '../common/types.js';
 
@@ -98,12 +98,13 @@ async function getCodeActions(registry, model, rangeOrSelection, trigger, progre
         const handle = setTimeout(() => progress.report(provider), 1250);
         try {
             const providedCodeActions = await provider.provideCodeActions(model, rangeOrSelection, codeActionContext, cts.token);
-            if (providedCodeActions) {
-                disposables.add(providedCodeActions);
-            }
             if (cts.token.isCancellationRequested) {
+                providedCodeActions?.dispose();
                 return emptyCodeActionsResponse;
             }
+            if (providedCodeActions) {
+                disposables.add(providedCodeActions);
+            }
             const filteredActions = (providedCodeActions?.actions || []).filter(action => action && filtersAction(filter, action));
             const documentation = getDocumentationFromProvider(provider, filteredActions, filter.include);
             return {
@@ -234,7 +235,7 @@ async function applyCodeAction(accessor, item, codeActionReason, options, token
             code: 'undoredo.codeAction',
             respectAutoSaveConfig: codeActionReason !== ApplyCodeActionReason.OnSave,
             showPreview: options?.preview,
-            reason: EditReasons.codeAction({ kind: item.action.kind, extensionId: item.provider?.extensionId }),
+            reason: EditSources.codeAction({ kind: item.action.kind, providerId: ProviderId.fromExtensionId(item.provider?.extensionId) }),
         });
         if (!result.isApplied) {
             return;
@@ -248,7 +249,7 @@ async function applyCodeAction(accessor, item, codeActionReason, options, token
             const message = asMessage(err);
             notificationService.error(typeof message === 'string'
                 ? message
-                : ( localize(907, "An unknown error occurred while applying the code action")));
+                : ( localize(917, "An unknown error occurred while applying the code action")));
         }
     }
     setTimeout(() => accessibilitySignalService.playSignal(AccessibilitySignal.codeActionApplied), CODE_ACTION_SOUND_APPLIED_DURATION);

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

@@ -21,23 +21,23 @@ const argsSchema = {
     properties: {
         'kind': {
             type: 'string',
-            description: ( localize(908, "Kind of the code action to run.")),
+            description: ( localize(918, "Kind of the code action to run.")),
         },
         'apply': {
             type: 'string',
-            description: ( localize(909, "Controls when the returned actions are applied.")),
+            description: ( localize(919, "Controls when the returned actions are applied.")),
             default: CodeActionAutoApply.IfSingle,
             enum: [CodeActionAutoApply.First, CodeActionAutoApply.IfSingle, CodeActionAutoApply.Never],
             enumDescriptions: [
-                ( localize(910, "Always apply the first returned code action.")),
-                ( localize(911, "Apply the first returned code action if it is the only one.")),
-                ( localize(912, "Do not apply the returned code actions.")),
+                ( localize(920, "Always apply the first returned code action.")),
+                ( localize(921, "Apply the first returned code action if it is the only one.")),
+                ( localize(922, "Do not apply the returned code actions.")),
             ]
         },
         'preferred': {
             type: 'boolean',
             default: false,
-            description: ( localize(913, "Controls if only preferred code actions should be returned.")),
+            description: ( localize(923, "Controls if only preferred code actions should be returned.")),
         }
     }
 };
@@ -51,7 +51,7 @@ class QuickFixAction extends EditorAction {
     constructor() {
         super({
             id: quickFixCommandId,
-            label: ( localize2(914, "Quick Fix...")),
+            label: ( localize2(924, "Quick Fix...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -61,7 +61,7 @@ class QuickFixAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(915, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(925, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
     }
 }
 class CodeActionCommand extends EditorCommand {
@@ -82,11 +82,11 @@ class CodeActionCommand extends EditorCommand {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(916, "No preferred code actions for '{0}' available", userArgs.kind))
-                : ( localize(917, "No code actions for '{0}' available", userArgs.kind))
+                ? ( localize(926, "No preferred code actions for '{0}' available", userArgs.kind))
+                : ( localize(927, "No code actions for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(918, "No preferred code actions available"))
-                : ( localize(919, "No code actions available")), {
+                ? ( localize(928, "No preferred code actions available"))
+                : ( localize(929, "No code actions available")), {
             include: args.kind,
             includeSourceActions: true,
             onlyIncludePreferredActions: args.preferred,
@@ -97,7 +97,7 @@ class RefactorAction extends EditorAction {
     constructor() {
         super({
             id: refactorCommandId,
-            label: ( localize2(920, "Refactor...")),
+            label: ( localize2(930, "Refactor...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -128,11 +128,11 @@ class RefactorAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(921, "No preferred refactorings for '{0}' available", userArgs.kind))
-                : ( localize(922, "No refactorings for '{0}' available", userArgs.kind))
+                ? ( localize(931, "No preferred refactorings for '{0}' available", userArgs.kind))
+                : ( localize(932, "No refactorings for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(923, "No preferred refactorings available"))
-                : ( localize(924, "No refactorings available")), {
+                ? ( localize(933, "No preferred refactorings available"))
+                : ( localize(934, "No refactorings available")), {
             include: CodeActionKind.Refactor.contains(args.kind) ? args.kind : HierarchicalKind.None,
             onlyIncludePreferredActions: args.preferred
         }, args.apply, CodeActionTriggerSource.Refactor);
@@ -142,7 +142,7 @@ class SourceAction extends EditorAction {
     constructor() {
         super({
             id: sourceActionCommandId,
-            label: ( localize2(925, "Source Action...")),
+            label: ( localize2(935, "Source Action...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             contextMenuOpts: {
                 group: '1_modification',
@@ -165,11 +165,11 @@ class SourceAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(926, "No preferred source actions for '{0}' available", userArgs.kind))
-                : ( localize(927, "No source actions for '{0}' available", userArgs.kind))
+                ? ( localize(936, "No preferred source actions for '{0}' available", userArgs.kind))
+                : ( localize(937, "No source actions for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(928, "No preferred source actions available"))
-                : ( localize(929, "No source actions available")), {
+                ? ( localize(938, "No preferred source actions available"))
+                : ( localize(939, "No source actions available")), {
             include: CodeActionKind.Source.contains(args.kind) ? args.kind : HierarchicalKind.None,
             includeSourceActions: true,
             onlyIncludePreferredActions: args.preferred,
@@ -180,7 +180,7 @@ class OrganizeImportsAction extends EditorAction {
     constructor() {
         super({
             id: organizeImportsCommandId,
-            label: ( localize2(930, "Organize Imports")),
+            label: ( localize2(940, "Organize Imports")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.SourceOrganizeImports)
@@ -192,21 +192,21 @@ class OrganizeImportsAction extends EditorAction {
             },
             metadata: {
                 description: ( localize2(
-                    931,
+                    941,
                     "Organize imports in the current file. Also called 'Optimize Imports' by some tools"
                 ))
             }
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(932, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(942, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
     }
 }
 class FixAllAction extends EditorAction {
     constructor() {
         super({
             id: fixAllCommandId,
-            label: ( localize2(933, "Fix All")),
+            label: ( localize2(943, "Fix All")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.SourceFixAll)
@@ -214,14 +214,14 @@ class FixAllAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(934, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(944, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
     }
 }
 class AutoFixAction extends EditorAction {
     constructor() {
         super({
             id: autoFixCommandId,
-            label: ( localize2(935, "Auto Fix...")),
+            label: ( localize2(945, "Auto Fix...")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.QuickFix)
@@ -237,7 +237,7 @@ class AutoFixAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(936, "No auto fixes available")), {
+        return triggerCodeActionsForEditorSelection(editor, ( localize(946, "No auto fixes available")), {
             include: CodeActionKind.QuickFix,
             onlyIncludePreferredActions: true
         }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.AutoFix);

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

@@ -23,7 +23,7 @@ registerEditorCommand(( new CodeActionCommand()));
         'editor.codeActionWidget.showHeaders': {
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(937, "Enable/disable showing group headers in the Code Action menu.")),
+            description: ( localize(947, "Enable/disable showing group headers in the Code Action menu.")),
             default: true,
         },
     }
@@ -35,7 +35,7 @@ registerEditorCommand(( new CodeActionCommand()));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localize(
-                938,
+                948,
                 "Enable/disable showing nearest Quick Fix within a line when not currently on a diagnostic."
             )),
             default: true,
@@ -49,7 +49,7 @@ registerEditorCommand(( new CodeActionCommand()));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             markdownDescription: ( localize(
-                939,
+                949,
                 '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

@@ -279,7 +279,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(
-                                940,
+                                950,
                                 "Context: {0} at line {1} and column {2}.",
                                 selectionText,
                                 diagnostic.startLineNumber,
@@ -326,7 +326,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(941, 'Hide Disabled')),
+                label: ( localize(951, 'Hide Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,
@@ -336,7 +336,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                 }
             } : {
                 id: 'showMoreActions',
-                label: ( localize(942, 'Show Disabled')),
+                label: ( localize(952, 'Show Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,

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

@@ -7,15 +7,15 @@ 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(943, 'More Actions...')) }));
+const uncategorizedCodeActionGroup = ( Object.freeze({ kind: HierarchicalKind.Empty, title: ( localize(953, 'More Actions...')) }));
 const codeActionGroups = ( Object.freeze([
-    { kind: CodeActionKind.QuickFix, title: ( localize(944, 'Quick Fix')) },
-    { kind: CodeActionKind.RefactorExtract, title: ( localize(945, 'Extract')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorInline, title: ( localize(946, 'Inline')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorRewrite, title: ( localize(947, 'Rewrite')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorMove, title: ( localize(948, 'Move')), icon: Codicon.wrench },
-    { kind: CodeActionKind.SurroundWith, title: ( localize(949, 'Surround With')), icon: Codicon.surroundWith },
-    { kind: CodeActionKind.Source, title: ( localize(950, 'Source Action')), icon: Codicon.symbolFile },
+    { kind: CodeActionKind.QuickFix, title: ( localize(954, 'Quick Fix')) },
+    { kind: CodeActionKind.RefactorExtract, title: ( localize(955, 'Extract')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorInline, title: ( localize(956, 'Inline')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorRewrite, title: ( localize(957, 'Rewrite')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorMove, title: ( localize(958, 'Move')), icon: Codicon.wrench },
+    { kind: CodeActionKind.SurroundWith, title: ( localize(959, 'Surround With')), icon: Codicon.surroundWith },
+    { kind: CodeActionKind.Source, title: ( localize(960, 'Source Action')), icon: Codicon.symbolFile },
     uncategorizedCodeActionGroup,
 ]));
 function toMenuItems(inputCodeActions, showHeaders, keybindingResolver) {

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

@@ -187,7 +187,11 @@ class CodeActionModel extends Disposable {
                             codeActionSet.dispose();
                             return emptyCodeActionSet;
                         }
-                        const foundQuickfix = codeActionSet.validActions?.some(action => action.action.kind ? CodeActionKind.QuickFix.contains(( new HierarchicalKind(action.action.kind))) : false);
+                        const foundQuickfix = codeActionSet.validActions?.some(action => {
+                            return action.action.kind &&
+                                CodeActionKind.QuickFix.contains(( new HierarchicalKind(action.action.kind))) &&
+                                !action.action.isAI;
+                        });
                         const allMarkers = this._markerService.read({ resource: model.uri });
                         if (foundQuickfix) {
                             for (const action of codeActionSet.validActions) {