@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,15 +1,18 @@
 import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import './bracketMatching.css.js';
-import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { OverviewRulerLane } from '../../../common/model.js';
+import { TrackedRangeStickiness, OverviewRulerLane } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -33,8 +36,8 @@ class JumpToBracketAction extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 1024  | 93 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Backslash,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -87,8 +90,8 @@ class RemoveBracketsAction extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 512  | 1 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Backspace,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -115,7 +118,7 @@ class BracketMatchingController extends Disposable {
         this._lastVersionId = 0;
         this._decorations = this._editor.createDecorationsCollection();
         this._updateBracketsSoon = this._register(( (new RunOnceScheduler(() => this._updateBrackets(), 50))));
-        this._matchBrackets = this._editor.getOption(72 );
+        this._matchBrackets = this._editor.getOption(EditorOption.matchBrackets);
         this._updateBracketsSoon.schedule();
         this._register(editor.onDidChangeCursorPosition((e) => {
             if (this._matchBrackets === 'never') {
@@ -135,8 +138,8 @@ class BracketMatchingController extends Disposable {
             this._updateBracketsSoon.schedule();
         }));
         this._register(editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(72 )) {
-                this._matchBrackets = this._editor.getOption(72 );
+            if (e.hasChanged(EditorOption.matchBrackets)) {
+                this._matchBrackets = this._editor.getOption(EditorOption.matchBrackets);
                 this._decorations.clear();
                 this._lastBracketsData = [];
                 this._lastVersionId = 0;
@@ -264,7 +267,7 @@ class BracketMatchingController extends Disposable {
     }
     static { this._DECORATION_OPTIONS_WITH_OVERVIEW_RULER = ModelDecorationOptions.register({
         description: 'bracket-match-overview',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         className: 'bracket-match',
         overviewRuler: {
             color: themeColorFromId(overviewRulerBracketMatchForeground),
@@ -273,7 +276,7 @@ class BracketMatchingController extends Disposable {
     }); }
     static { this._DECORATION_OPTIONS_WITHOUT_OVERVIEW_RULER = ModelDecorationOptions.register({
         description: 'bracket-match-no-overview',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         className: 'bracket-match'
     }); }
     _updateBrackets() {
@@ -347,7 +350,7 @@ class BracketMatchingController extends Disposable {
         this._lastVersionId = versionId;
     }
 }
-registerEditorContribution(BracketMatchingController.ID, BracketMatchingController, 1 );
+registerEditorContribution(BracketMatchingController.ID, BracketMatchingController, EditorContributionInstantiation.AfterFirstRender);
 registerEditorAction(SelectToBracketAction);
 registerEditorAction(JumpToBracketAction);
 registerEditorAction(RemoveBracketsAction);

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

@@ -1,9 +1,11 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
 import { ReplaceCommand } from '../../../common/commands/replaceCommand.js';
 import { MoveOperations } from '../../../common/cursor/cursorMoveOperations.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/caretOperations/browser/transpose";
 class TransposeLettersAction extends EditorAction {
     constructor() {
@@ -16,9 +18,9 @@ class TransposeLettersAction extends EditorAction {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
                 mac: {
-                    primary: 256  | 50
+                    primary: KeyMod$1.WinCtrl | KeyCode.KeyT
                 },
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }

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

@@ -1,15 +1,19 @@
 import { isFirefox } from '../../../../base/browser/browser.js';
 import { getActiveDocument } from '../../../../base/browser/dom.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { isNative, isWeb } from '../../../../base/common/platform.js';
 import { InMemoryClipboardMetadataManager, CopyOptions } from '../../../browser/controller/textAreaInput.js';
 import { registerEditorAction, MultiCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { Handler } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { CopyPasteController } from '../../dropOrPasteInto/browser/copyPasteController.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 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';
 const _moduleId = "vs/editor/contrib/clipboard/browser/clipboard";
 const CLIPBOARD_CONTEXT_MENU_GROUP = '9_cutcopypaste';
 const supportsCut = (isNative || document.queryCommandSupported('cut'));
@@ -24,9 +28,9 @@ const CutAction = supportsCut ? registerCommand(( (new MultiCommand({
     precondition: undefined,
     kbOpts: (
     (isNative ? {
-        primary: 2048  | 54 ,
-        win: { primary: 2048  | 54 , secondary: [1024  | 20 ] },
-        weight: 100
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyX,
+        win: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyX, secondary: [KeyMod$1.Shift | KeyCode.Delete] },
+        weight: KeybindingWeight.EditorContrib
     } : undefined)),
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
@@ -57,9 +61,9 @@ const CopyAction = supportsCopy ? registerCommand(( (new MultiCommand({
     precondition: undefined,
     kbOpts: (
     (isNative ? {
-        primary: 2048  | 33 ,
-        win: { primary: 2048  | 33 , secondary: [2048  | 19 ] },
-        weight: 100
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyC,
+        win: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyC, secondary: [KeyMod$1.CtrlCmd | KeyCode.Insert] },
+        weight: KeybindingWeight.EditorContrib
     } : undefined)),
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
@@ -89,17 +93,16 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContex
      (ContextKeyExpr.notEquals('resourceScheme', 'output')),
     EditorContextKeys.editorTextFocus
 ))) });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { submenu: MenuId.EditorTitleContextShare, title: ( localize2WithPath(_moduleId, 5, "Share")), group: '11_share', order: -1 });
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { submenu: MenuId.ExplorerContextShare, title: ( localize2WithPath(_moduleId, 5, "Share")), group: '11_share', order: -1 });
 const PasteAction = supportsPaste ? registerCommand(( (new MultiCommand({
     id: 'editor.action.clipboardPasteAction',
     precondition: undefined,
     kbOpts: (
     (isNative ? {
-        primary: 2048  | 52 ,
-        win: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
-        linux: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
-        weight: 100
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyV,
+        win: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyV, secondary: [KeyMod$1.Shift | KeyCode.Insert] },
+        linux: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyV, secondary: [KeyMod$1.Shift | KeyCode.Insert] },
+        weight: KeybindingWeight.EditorContrib
     } : undefined)),
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
@@ -135,7 +138,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -143,7 +146,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
         if (!editor.hasModel()) {
             return;
         }
-        const emptySelectionClipboard = editor.getOption(37 );
+        const emptySelectionClipboard = editor.getOption(EditorOption.emptySelectionClipboard);
         if (!emptySelectionClipboard && editor.getSelection().isEmpty()) {
             return;
         }
@@ -160,7 +163,7 @@ function registerExecCommandImpl(target, browserCommand) {
     target.addImplementation(10000, 'code-editor', (accessor, args) => {
         const focusedEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
         if (focusedEditor && focusedEditor.hasTextFocus()) {
-            const emptySelectionClipboard = focusedEditor.getOption(37 );
+            const emptySelectionClipboard = focusedEditor.getOption(EditorOption.emptySelectionClipboard);
             const selection = focusedEditor.getSelection();
             if (selection && selection.isEmpty() && !emptySelectionClipboard) {
                 return true;
@@ -196,11 +199,11 @@ if (PasteAction) {
                         let multicursorText = null;
                         let mode = null;
                         if (metadata) {
-                            pasteOnNewLine = (focusedEditor.getOption(37 ) && !!metadata.isFromEmptySelection);
+                            pasteOnNewLine = (focusedEditor.getOption(EditorOption.emptySelectionClipboard) && !!metadata.isFromEmptySelection);
                             multicursorText = (typeof metadata.multicursorText !== 'undefined' ? metadata.multicursorText : null);
                             mode = metadata.mode;
                         }
-                        focusedEditor.trigger('keyboard', "paste" , {
+                        focusedEditor.trigger('keyboard', Handler.Paste, {
                             text: clipboardText,
                             pasteOnNewLine,
                             multicursorText,

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

@@ -6,6 +6,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
+import { CodeActionTriggerType } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { IModelService } from '../../../common/services/model.js';
 import { TextModelCancellationTokenSource } from '../../editorState/browser/editorState.js';
@@ -89,7 +90,7 @@ async function getCodeActions(registry, model, rangeOrSelection, trigger, progre
         trigger: trigger.type,
     };
     const cts = ( (new TextModelCancellationTokenSource(model, token)));
-    const excludeNotebookCodeActions = ((trigger.type === 2) );
+    const excludeNotebookCodeActions = (trigger.type === CodeActionTriggerType.Auto);
     const providers = getCodeActionProviders(registry, model, (excludeNotebookCodeActions) ? notebookFilter : filter);
     const disposables = ( (new DisposableStore()));
     const promises = ( (providers.map(async (provider) => {
@@ -274,7 +275,7 @@ CommandsRegistry.registerCommand('_executeCodeActionProvider', async function (a
         throw illegalArgument();
     }
     const include = typeof kind === 'string' ? ( (new HierarchicalKind(kind))) : undefined;
-    const codeActionSet = await getCodeActions(codeActionProvider, model, validatedRangeOrSelection, { type: 1 , triggerAction: CodeActionTriggerSource.Default, filter: { includeSourceActions: true, include } }, Progress.None, CancellationToken.None);
+    const codeActionSet = await getCodeActions(codeActionProvider, model, validatedRangeOrSelection, { type: CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.Default, filter: { includeSourceActions: true, include } }, Progress.None, CancellationToken.None);
     const resolving = [];
     const resolveCount = Math.min(codeActionSet.validActions.length, typeof itemResolveCount === 'number' ? itemResolveCount : 0);
     for (let i = 0; i < resolveCount; i++) {

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

@@ -1,11 +1,13 @@
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 import { EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { codeActionCommandId, quickFixCommandId, refactorCommandId, sourceActionCommandId, organizeImportsCommandId, fixAllCommandId, autoFixCommandId } from './codeAction.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { CodeActionCommandArgs, CodeActionTriggerSource, CodeActionKind } from '../common/types.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { CodeActionCommandArgs, CodeActionAutoApply, CodeActionTriggerSource, CodeActionKind } from '../common/types.js';
 import { CodeActionController } from './codeActionController.js';
 import { SUPPORTED_CODE_ACTIONS } from './codeActionModel.js';
 const _moduleId = "vs/editor/contrib/codeAction/browser/codeActionCommands";
@@ -28,8 +30,8 @@ const argsSchema = {
         'apply': {
             type: 'string',
             description: ( localizeWithPath(_moduleId, 1, "Controls when the returned actions are applied.")),
-            default: "ifSingle" ,
-            enum: ["first" , "ifSingle" , "never" ],
+            default: CodeActionAutoApply.IfSingle,
+            enum: [CodeActionAutoApply.First, CodeActionAutoApply.IfSingle, CodeActionAutoApply.Never],
             enumDescriptions: [
                 ( localizeWithPath(_moduleId, 2, "Always apply the first returned code action.")),
                 ( localizeWithPath(
@@ -66,8 +68,8 @@ class QuickFixAction extends EditorAction {
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider))),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 89 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.Period,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -89,7 +91,7 @@ class CodeActionCommand extends EditorCommand {
     runEditorCommand(_accessor, editor, userArgs) {
         const args = CodeActionCommandArgs.fromUser(userArgs, {
             kind: HierarchicalKind.Empty,
-            apply: "ifSingle" ,
+            apply: CodeActionAutoApply.IfSingle,
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
@@ -118,11 +120,11 @@ class RefactorAction extends EditorAction {
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider))),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 1024  | 48 ,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyR,
                 mac: {
-                    primary: 256  | 1024  | 48
+                    primary: KeyMod$1.WinCtrl | KeyMod$1.Shift | KeyCode.KeyR
                 },
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             },
             contextMenuOpts: {
                 group: '1_modification',
@@ -141,7 +143,7 @@ class RefactorAction extends EditorAction {
     run(_accessor, editor, userArgs) {
         const args = CodeActionCommandArgs.fromUser(userArgs, {
             kind: CodeActionKind.Refactor,
-            apply: "never"
+            apply: CodeActionAutoApply.Never
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
@@ -184,7 +186,7 @@ class SourceAction extends EditorAction {
     run(_accessor, editor, userArgs) {
         const args = CodeActionCommandArgs.fromUser(userArgs, {
             kind: CodeActionKind.Source,
-            apply: "never"
+            apply: CodeActionAutoApply.Never
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
@@ -216,13 +218,13 @@ class OrganizeImportsAction extends EditorAction {
             ))),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 1024  | 512  | 45 ,
-                weight: 100
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.KeyO,
+                weight: KeybindingWeight.EditorContrib
             },
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localizeWithPath(_moduleId, 23, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, "ifSingle" , CodeActionTriggerSource.OrganizeImports);
+        return triggerCodeActionsForEditorSelection(editor, ( localizeWithPath(_moduleId, 23, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
     }
 }
 class FixAllAction extends EditorAction {
@@ -238,7 +240,7 @@ class FixAllAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localizeWithPath(_moduleId, 25, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, "ifSingle" , CodeActionTriggerSource.FixAll);
+        return triggerCodeActionsForEditorSelection(editor, ( localizeWithPath(_moduleId, 25, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
     }
 }
 class AutoFixAction extends EditorAction {
@@ -253,11 +255,11 @@ class AutoFixAction extends EditorAction {
             ))),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 512  | 1024  | 89 ,
+                primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.Period,
                 mac: {
-                    primary: 2048  | 512  | 89
+                    primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Period
                 },
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -265,7 +267,7 @@ class AutoFixAction extends EditorAction {
         return triggerCodeActionsForEditorSelection(editor, ( localizeWithPath(_moduleId, 27, "No auto fixes available")), {
             include: CodeActionKind.QuickFix,
             onlyIncludePreferredActions: true
-        }, "ifSingle" , CodeActionTriggerSource.AutoFix);
+        }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.AutoFix);
     }
 }
 export { AutoFixAction, CodeActionCommand, FixAllAction, OrganizeImportsAction, QuickFixAction, RefactorAction, SourceAction };

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

@@ -1,14 +1,14 @@
-import { registerEditorContribution, registerEditorAction, registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, registerEditorCommand, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { editorConfigurationBaseNode } from '../../../common/config/editorConfigurationSchema.js';
 import { CodeActionCommand, QuickFixAction, RefactorAction, SourceAction, OrganizeImportsAction, AutoFixAction, FixAllAction } from './codeActionCommands.js';
 import { CodeActionController } from './codeActionController.js';
 import { LightBulbWidget } from './lightBulbWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Extensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 const _moduleId = "vs/editor/contrib/codeAction/browser/codeActionContributions";
-registerEditorContribution(CodeActionController.ID, CodeActionController, 3 );
-registerEditorContribution(LightBulbWidget.ID, LightBulbWidget, 4 );
+registerEditorContribution(CodeActionController.ID, CodeActionController, EditorContributionInstantiation.Eventually);
+registerEditorContribution(LightBulbWidget.ID, LightBulbWidget, EditorContributionInstantiation.Lazy);
 registerEditorAction(QuickFixAction);
 registerEditorAction(RefactorAction);
 registerEditorAction(SourceAction);
@@ -21,7 +21,7 @@ registerEditorCommand(( (new CodeActionCommand())));
     properties: {
         'editor.codeActionWidget.showHeaders': {
             type: 'boolean',
-            scope: 5 ,
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localizeWithPath(
                 _moduleId,
                 0,
@@ -36,7 +36,7 @@ registerEditorCommand(( (new CodeActionCommand())));
     properties: {
         'editor.codeActionWidget.includeNearbyQuickFixes': {
             type: 'boolean',
-            scope: 5 ,
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localizeWithPath(
                 _moduleId,
                 1,

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

@@ -5,6 +5,8 @@ import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Position } from '../../../common/core/position.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { CodeActionTriggerType } from '../../../common/languages.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { ApplyCodeActionReason, applyCodeAction } from './codeAction.js';
@@ -33,8 +35,8 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
-import { CodeActionTriggerSource, CodeActionKind } from '../common/types.js';
-import { CodeActionModel } from './codeActionModel.js';
+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;
@@ -111,7 +113,7 @@ let CodeActionController = class CodeActionController extends Disposable {
         }
         MessageController.get(this._editor)?.closeMessage();
         const triggerPosition = this._editor.getPosition();
-        this._trigger({ type: 1 , triggerAction, filter, autoApply, context: { notAvailableMessage, position: triggerPosition } });
+        this._trigger({ type: CodeActionTriggerType.Invoke, triggerAction, filter, autoApply, context: { notAvailableMessage, position: triggerPosition } });
     }
     _trigger(trigger) {
         return this._model.trigger(trigger);
@@ -122,7 +124,7 @@ let CodeActionController = class CodeActionController extends Disposable {
         }
         finally {
             if (retrigger) {
-                this._trigger({ type: 2 , triggerAction: CodeActionTriggerSource.QuickFix, filter: {} });
+                this._trigger({ type: CodeActionTriggerType.Auto, triggerAction: CodeActionTriggerSource.QuickFix, filter: {} });
             }
         }
     }
@@ -130,7 +132,7 @@ let CodeActionController = class CodeActionController extends Disposable {
         this._lightBulbWidget.rawValue?.hide();
     }
     async update(newState) {
-        if (newState.type !== 1 ) {
+        if (newState.type !== CodeActionsState.Type.Triggered) {
             this._lightBulbWidget.rawValue?.hide();
             return;
         }
@@ -146,7 +148,7 @@ let CodeActionController = class CodeActionController extends Disposable {
             return;
         }
         this._lightBulbWidget.value?.update(actions, newState.trigger, newState.position);
-        if (newState.trigger.type === 1 ) {
+        if (newState.trigger.type === CodeActionTriggerType.Invoke) {
             if (newState.trigger.filter?.include) {
                 const validActionToApply = this.tryGetValidActionToApply(newState.trigger, actions);
                 if (validActionToApply) {
@@ -193,8 +195,8 @@ let CodeActionController = class CodeActionController extends Disposable {
         if (!actions.allActions.length) {
             return undefined;
         }
-        if ((trigger.autoApply === "first"  && actions.validActions.length === 0)
-            || (trigger.autoApply === "ifSingle"  && actions.allActions.length === 1)) {
+        if ((trigger.autoApply === CodeActionAutoApply.First && actions.validActions.length === 0)
+            || (trigger.autoApply === CodeActionAutoApply.IfSingle && actions.allActions.length === 1)) {
             return actions.allActions.find(({ action }) => action.disabled);
         }
         return undefined;
@@ -203,8 +205,8 @@ let CodeActionController = class CodeActionController extends Disposable {
         if (!actions.validActions.length) {
             return undefined;
         }
-        if ((trigger.autoApply === "first"  && actions.validActions.length > 0)
-            || (trigger.autoApply === "ifSingle"  && actions.validActions.length === 1)) {
+        if ((trigger.autoApply === CodeActionAutoApply.First && actions.validActions.length > 0)
+            || (trigger.autoApply === CodeActionAutoApply.IfSingle && actions.validActions.length === 1)) {
             return actions.validActions[0];
         }
         return undefined;
@@ -237,6 +239,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                     this._telemetryService.publicLog2('codeAction.showCodeActionList.onHide', {
                         codeActionListLength: actions.validActions.length,
                         didCancel: didCancel,
+                        codeActions: ( (actions.validActions.map(action => action.action.title))),
                     });
                 }
             },
@@ -302,7 +305,7 @@ let CodeActionController = class CodeActionController extends Disposable {
         if (!this._editor.hasModel()) {
             return { x: 0, y: 0 };
         }
-        this._editor.revealPosition(position, 1 );
+        this._editor.revealPosition(position, ScrollType.Immediate);
         this._editor.render();
         const cursorCoords = this._editor.getScrolledVisiblePosition(position);
         const editorCoords = getDomNodePagePosition(this._editor.getDomNode());

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { refactorCommandId, codeActionCommandId, sourceActionCommandId, organizeImportsCommandId, fixAllCommandId } from './codeAction.js';
-import { CodeActionCommandArgs, CodeActionKind } from '../common/types.js';
+import { CodeActionCommandArgs, CodeActionAutoApply, CodeActionKind } from '../common/types.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 var CodeActionKeybindingResolver_1;
 let CodeActionKeybindingResolver = class CodeActionKeybindingResolver {
@@ -33,7 +33,7 @@ let CodeActionKeybindingResolver = class CodeActionKeybindingResolver {
                 resolvedKeybinding: item.resolvedKeybinding,
                 ...CodeActionCommandArgs.fromUser(commandArgs, {
                     kind: HierarchicalKind.None,
-                    apply: "never"
+                    apply: CodeActionAutoApply.Never
                 })
             };
         }))));

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

@@ -4,6 +4,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { CodeActionKind } from '../common/types.js';
 import '../../symbolIcons/browser/symbolIcons.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { ActionListItemKind } from '../../../../platform/actionWidget/browser/actionList.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 const _moduleId = "vs/editor/contrib/codeAction/browser/codeActionMenu";
 const uncategorizedCodeActionGroup = ( (Object.freeze({ kind: HierarchicalKind.Empty, title: ( localizeWithPath(_moduleId, 0, 'More Actions...')) })));
@@ -22,7 +23,7 @@ function toMenuItems(inputCodeActions, showHeaders, keybindingResolver) {
         return (
              (inputCodeActions.map((action) => {
                 return {
-                    kind: "action" ,
+                    kind: ActionListItemKind.Action,
                     item: action,
                     group: uncategorizedCodeActionGroup,
                     disabled: !!action.action.disabled,
@@ -45,11 +46,11 @@ function toMenuItems(inputCodeActions, showHeaders, keybindingResolver) {
     const allMenuItems = [];
     for (const menuEntry of menuEntries) {
         if (menuEntry.actions.length) {
-            allMenuItems.push({ kind: "header" , group: menuEntry.group });
+            allMenuItems.push({ kind: ActionListItemKind.Header, group: menuEntry.group });
             for (const action of menuEntry.actions) {
                 const group = menuEntry.group;
                 allMenuItems.push({
-                    kind: "action" ,
+                    kind: ActionListItemKind.Action,
                     item: action,
                     group: action.action.isAI ? { title: group.title, kind: group.kind, icon: Codicon.sparkle } : group,
                     label: action.action.title,