@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/platform/actionWidget/browser/actionList.js

@@ -25,13 +25,8 @@ import '../../theme/common/colors/quickpickColors.js';
 import '../../theme/common/colors/searchColors.js';
 const acceptSelectedActionCommand = 'acceptSelectedCodeAction';
 const previewSelectedActionCommand = 'previewSelectedCodeAction';
-var ActionListItemKind;
-( ((function(ActionListItemKind) {
-    ActionListItemKind["Action"] = "action";
-    ActionListItemKind["Header"] = "header";
-})(ActionListItemKind || (ActionListItemKind = {}))));
 class HeaderRenderer {
-    get templateId() { return ActionListItemKind.Header; }
+    get templateId() { return "header" ; }
     renderTemplate(container) {
         container.classList.add('group-header');
         const text = document.createElement('span');
@@ -45,7 +40,7 @@ class HeaderRenderer {
     }
 }
 let ActionItemRenderer = class ActionItemRenderer {
-    get templateId() { return ActionListItemKind.Action; }
+    get templateId() { return "action" ; }
     constructor(_supportsPreview, _keybindingService) {
         this._supportsPreview = _supportsPreview;
         this._keybindingService = _keybindingService;
@@ -86,10 +81,10 @@ let ActionItemRenderer = class ActionItemRenderer {
         }
         else if (actionTitle && previewTitle) {
             if (this._supportsPreview && element.canPreview) {
-                data.container.title = ( localize(11289, "{0} to Apply, {1} to Preview", actionTitle, previewTitle));
+                data.container.title = ( localize(11406, "{0} to Apply, {1} to Preview", actionTitle, previewTitle));
             }
             else {
-                data.container.title = ( localize(11290, "{0} to Apply", actionTitle));
+                data.container.title = ( localize(11407, "{0} to Apply", actionTitle));
             }
         }
         else {
@@ -127,7 +122,7 @@ let ActionList = class ActionList extends Disposable {
         this.domNode = document.createElement('div');
         this.domNode.classList.add('actionList');
         const virtualDelegate = {
-            getHeight: element => element.kind === ActionListItemKind.Header ? this._headerLineHeight : this._actionLineHeight,
+            getHeight: element => element.kind === "header"  ? this._headerLineHeight : this._actionLineHeight,
             getTemplateId: element => element.kind
         };
         this._list = this._register(( (new List(user, this.domNode, virtualDelegate, [
@@ -139,17 +134,17 @@ let ActionList = class ActionList extends Disposable {
             keyboardNavigationLabelProvider: { getKeyboardNavigationLabel },
             accessibilityProvider: {
                 getAriaLabel: element => {
-                    if (element.kind === ActionListItemKind.Action) {
+                    if (element.kind === "action" ) {
                         let label = element.label ? stripNewlines(element?.label) : '';
                         if (element.disabled) {
-                            label = ( localize(11291, "{0}, Disabled Reason: {1}", label, element.disabled));
+                            label = ( localize(11408, "{0}, Disabled Reason: {1}", label, element.disabled));
                         }
                         return label;
                     }
                     return null;
                 },
-                getWidgetAriaLabel: () => ( localize(11292, "Action Widget")),
-                getRole: (e) => e.kind === ActionListItemKind.Action ? 'option' : 'separator',
+                getWidgetAriaLabel: () => ( localize(11409, "Action Widget")),
+                getRole: (e) => e.kind === "action"  ? 'option' : 'separator',
                 getWidgetRole: () => 'listbox',
             },
         }))));
@@ -165,7 +160,7 @@ let ActionList = class ActionList extends Disposable {
         }
     }
     focusCondition(element) {
-        return !element.disabled && element.kind === ActionListItemKind.Action;
+        return !element.disabled && element.kind === "action" ;
     }
     hide(didCancel) {
         this._delegate.onHide(didCancel);
@@ -244,7 +239,7 @@ let ActionList = class ActionList extends Disposable {
     async onListHover(e) {
         const element = e.element;
         if (element && element.item && this.focusCondition(element)) {
-            if (this._delegate.onHover && !element.disabled && element.kind === ActionListItemKind.Action) {
+            if (this._delegate.onHover && !element.disabled && element.kind === "action" ) {
                 const result = await this._delegate.onHover(element.item, this.cts.token);
                 element.canPreview = result ? result.canPreview : undefined;
             }
@@ -267,4 +262,4 @@ ActionList = ( (__decorate([
 function stripNewlines(str) {
     return str.replace(/\r\n|\r|\n/g, ' ');
 }
-export { ActionList, ActionListItemKind, acceptSelectedActionCommand, previewSelectedActionCommand };
+export { ActionList, acceptSelectedActionCommand, previewSelectedActionCommand };

package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js

@@ -1,7 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { addDisposableListener, EventType, trackFocus, $ } from '../../../base/browser/dom.js';
 import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
-import { KeyCode, KeyMod as KeyMod$1 } from '../../../base/common/keyCodes.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import './actionWidget.css.js';
 import { localize, localize2 } from '../../../nls.js';
@@ -10,9 +9,8 @@ import { registerAction2, Action2 } from '../../actions/common/actions.js';
 import { RawContextKey } from '../../contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../contextkey/common/contextkey.service.js';
 import { IContextViewService } from '../../contextview/browser/contextView.service.js';
-import { registerSingleton, InstantiationType } from '../../instantiation/common/extensions.js';
+import { registerSingleton } from '../../instantiation/common/extensions.js';
 import { createDecorator, IInstantiationService } from '../../instantiation/common/instantiation.js';
-import { KeybindingWeight } from '../../keybinding/common/keybindingsRegistry.js';
 import { registerColor } from '../../theme/common/colorUtils.js';
 import '../../theme/common/colors/baseColors.js';
 import '../../theme/common/colors/chartsColors.js';
@@ -24,9 +22,9 @@ import '../../theme/common/colors/minimapColors.js';
 import '../../theme/common/colors/miscColors.js';
 import '../../theme/common/colors/quickpickColors.js';
 import '../../theme/common/colors/searchColors.js';
-registerColor('actionBar.toggledBackground', inputActiveOptionBackground, ( localize(9885, 'Background color for toggled action items in action bar.')));
+registerColor('actionBar.toggledBackground', inputActiveOptionBackground, ( localize(9978, 'Background color for toggled action items in action bar.')));
 const ActionWidgetContextKeys = {
-    Visible: ( (new RawContextKey('codeActionMenuVisible', false, ( localize(9886, "Whether the action widget list is visible")))))
+    Visible: ( (new RawContextKey('codeActionMenuVisible', false, ( localize(9979, "Whether the action widget list is visible")))))
 };
 const IActionWidgetService = ( (createDecorator('actionWidgetService')));
 let ActionWidgetService = class ActionWidgetService extends Disposable {
@@ -125,18 +123,18 @@ ActionWidgetService = ( (__decorate([
     ( (__param(1, IContextKeyService))),
     ( (__param(2, IInstantiationService)))
 ], ActionWidgetService)));
-registerSingleton(IActionWidgetService, ActionWidgetService, InstantiationType.Delayed);
-const weight = KeybindingWeight.EditorContrib + 1000;
+registerSingleton(IActionWidgetService, ActionWidgetService, 1 );
+const weight = 100  + 1000;
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'hideCodeActionWidget',
-            title: ( localize2(9887, "Hide action widget")),
+            title: ( localize2(9980, "Hide action widget")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: KeyCode.Escape,
-                secondary: [KeyMod$1.Shift | KeyCode.Escape]
+                primary: 9 ,
+                secondary: [1024  | 9 ]
             },
         });
     }
@@ -148,13 +146,13 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'selectPrevCodeAction',
-            title: ( localize2(9888, "Select previous action")),
+            title: ( localize2(9981, "Select previous action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: KeyCode.UpArrow,
-                secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow],
-                mac: { primary: KeyCode.UpArrow, secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow, KeyMod$1.WinCtrl | KeyCode.KeyP] },
+                primary: 16 ,
+                secondary: [2048  | 16 ],
+                mac: { primary: 16 , secondary: [2048  | 16 , 256  | 46 ] },
             }
         });
     }
@@ -169,13 +167,13 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'selectNextCodeAction',
-            title: ( localize2(9889, "Select next action")),
+            title: ( localize2(9982, "Select next action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: KeyCode.DownArrow,
-                secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow],
-                mac: { primary: KeyCode.DownArrow, secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow, KeyMod$1.WinCtrl | KeyCode.KeyN] }
+                primary: 18 ,
+                secondary: [2048  | 18 ],
+                mac: { primary: 18 , secondary: [2048  | 18 , 256  | 44 ] }
             }
         });
     }
@@ -190,12 +188,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: acceptSelectedActionCommand,
-            title: ( localize2(9890, "Accept selected action")),
+            title: ( localize2(9983, "Accept selected action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: KeyCode.Enter,
-                secondary: [KeyMod$1.CtrlCmd | KeyCode.Period],
+                primary: 3 ,
+                secondary: [2048  | 89 ],
             }
         });
     }
@@ -210,11 +208,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: previewSelectedActionCommand,
-            title: ( localize2(9891, "Preview selected action")),
+            title: ( localize2(9984, "Preview selected action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
+                primary: 2048  | 3 ,
             }
         });
     }

package/vscode/src/vs/platform/actions/browser/actionViewItemService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+const IActionViewItemService = ( createDecorator('IActionViewItemService'));
+export { IActionViewItemService };

package/vscode/src/vs/platform/actions/browser/buttonbar.js

@@ -87,7 +87,7 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
             const kb = this._keybindingService.lookupKeybinding(action.id);
             let tooltip;
             if (kb) {
-                tooltip = ( localize(11436, "{0} ({1})", action.label, kb.getLabel()));
+                tooltip = ( localize(11470, "{0} ({1})", action.label, kb.getLabel()));
             }
             else {
                 tooltip = action.label;
@@ -100,12 +100,12 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
         if (secondary.length > 0) {
             const btn = this.addButton({
                 secondary: true,
-                ariaLabel: ( localize(11437, "More Actions"))
+                ariaLabel: ( localize(11471, "More Actions"))
             });
             btn.icon = Codicon.dropDownButton;
             btn.element.classList.add('default-colors', 'monaco-text-button');
             btn.enabled = true;
-            this._updateStore.add(this._hoverService.setupManagedHover(hoverDelegate, btn.element, ( localize(11437, "More Actions"))));
+            this._updateStore.add(this._hoverService.setupManagedHover(hoverDelegate, btn.element, ( localize(11471, "More Actions"))));
             this._updateStore.add(btn.onDidClick(async () => {
                 this._contextMenuService.showContextMenu({
                     getAnchor: () => btn.element,

package/vscode/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.js

@@ -3,21 +3,21 @@ import { $, append, addDisposableListener, EventType } from '../../../base/brows
 import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
 import { BaseActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js';
 import { DropdownMenuActionViewItem } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
-import { KeyCode } from '../../../base/common/keyCodes.js';
 import { MenuEntryActionViewItem } from './menuEntryActionViewItem.js';
 import { IContextKeyService } from '../../contextkey/common/contextkey.service.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
 import { INotificationService } from '../../notification/common/notification.service.js';
 import { IThemeService } from '../../theme/common/themeService.service.js';
+import { IContextMenuService } from '../../contextview/browser/contextView.service.js';
 import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
 let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem extends BaseActionViewItem {
     get onDidChangeDropdownVisibility() {
         return this._dropdown.onDidChangeVisibility;
     }
-    constructor(primaryAction, dropdownAction, dropdownMenuActions, className, _contextMenuProvider, _options, _keybindingService, _notificationService, _contextKeyService, _themeService, _accessibilityService) {
+    constructor(primaryAction, dropdownAction, dropdownMenuActions, className, _options, _contextMenuProvider, _keybindingService, _notificationService, _contextKeyService, _themeService, _accessibilityService) {
         super(null, primaryAction, { hoverDelegate: _options?.hoverDelegate });
-        this._contextMenuProvider = _contextMenuProvider;
         this._options = _options;
+        this._contextMenuProvider = _contextMenuProvider;
         this._container = null;
         this._dropdownContainer = null;
         this._primaryAction = ( new MenuEntryActionViewItem(
@@ -37,7 +37,7 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
             menuAsChild: _options?.menuAsChild ?? true,
             classNames: className ? ['codicon', 'codicon-chevron-down', className] : ['codicon', 'codicon-chevron-down'],
             actionRunner: this._options?.actionRunner,
-            keybindingProvider: this._options?.getKeyBinding,
+            keybindingProvider: this._options?.getKeyBinding ?? (action => _keybindingService.lookupKeybinding(action.id)),
             hoverDelegate: _options?.hoverDelegate
         }));
     }
@@ -56,7 +56,7 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
         this._dropdown.render(append(this._container, this._dropdownContainer));
         this._register(addDisposableListener(primaryContainer, EventType.KEY_DOWN, (e) => {
             const event = ( new StandardKeyboardEvent(e));
-            if (event.equals(KeyCode.RightArrow)) {
+            if (event.equals(17 )) {
                 this._primaryAction.element.tabIndex = -1;
                 this._dropdown.focus();
                 event.stopPropagation();
@@ -64,7 +64,7 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
         }));
         this._register(addDisposableListener(this._dropdownContainer, EventType.KEY_DOWN, (e) => {
             const event = ( new StandardKeyboardEvent(e));
-            if (event.equals(KeyCode.LeftArrow)) {
+            if (event.equals(15 )) {
                 this._primaryAction.element.tabIndex = 0;
                 this._dropdown.setFocusable(false);
                 this._primaryAction.element?.focus();
@@ -120,6 +120,7 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
     }
 };
 DropdownWithPrimaryActionViewItem = ( __decorate([
+    ( __param(5, IContextMenuService)),
     ( __param(6, IKeybindingService)),
     ( __param(7, INotificationService)),
     ( __param(8, IContextKeyService)),

package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js

@@ -5,7 +5,6 @@ import { ActionViewItem, BaseActionViewItem, SelectActionViewItem } from '../../
 import { DropdownMenuActionViewItem } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { Separator, SubmenuAction, ActionRunner } from '../../../base/common/actions.js';
 import { UILabelProvider } from '../../../base/common/keybindingLabels.js';
-import { KeyCode } from '../../../base/common/keyCodes.js';
 import { MutableDisposable, toDisposable, combinedDisposable } from '../../../base/common/lifecycle.js';
 import { OS, isWindows, isLinux } from '../../../base/common/platform.js';
 import './menuEntryActionViewItem.css.js';
@@ -18,7 +17,6 @@ import { IContextMenuService, IContextViewService } from '../../contextview/brow
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
 import { INotificationService } from '../../notification/common/notification.service.js';
-import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
 import { IThemeService } from '../../theme/common/themeService.service.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
@@ -195,17 +193,17 @@ let MenuEntryActionViewItem = class MenuEntryActionViewItem extends ActionViewIt
         const keybindingLabel = keybinding && keybinding.getLabel();
         const tooltip = this._commandAction.tooltip || this._commandAction.label;
         let title = keybindingLabel
-            ? ( localize(5217, "{0} ({1})", tooltip, keybindingLabel))
+            ? ( localize(4895, "{0} ({1})", tooltip, keybindingLabel))
             : tooltip;
         if (!this._wantsAltCommand && this._menuItemAction.alt?.enabled) {
             const altTooltip = this._menuItemAction.alt.tooltip || this._menuItemAction.alt.label;
             const altKeybinding = this._keybindingService.lookupKeybinding(this._menuItemAction.alt.id, this._contextKeyService);
             const altKeybindingLabel = altKeybinding && altKeybinding.getLabel();
             const altTitleSection = altKeybindingLabel
-                ? ( localize(5217, "{0} ({1})", altTooltip, altKeybindingLabel))
+                ? ( localize(4895, "{0} ({1})", altTooltip, altKeybindingLabel))
                 : altTooltip;
             title = ( localize(
-                5218,
+                4896,
                 "{0}\n[{1}] {2}",
                 title,
                 UILabelProvider.modifierLabels[OS].altKey,
@@ -281,10 +279,10 @@ class TextOnlyMenuEntryActionViewItem extends MenuEntryActionViewItem {
         if (this.label) {
             const kb2 = TextOnlyMenuEntryActionViewItem._symbolPrintEnter(kb);
             if (this._options?.conversational) {
-                this.label.textContent = ( localize(5219, '{1} to {0}', this._action.label, kb2));
+                this.label.textContent = ( localize(4897, '{1} to {0}', this._action.label, kb2));
             }
             else {
-                this.label.textContent = ( localize(5220, '{0} ({1})', this._action.label, kb2));
+                this.label.textContent = ( localize(4898, '{0} ({1})', this._action.label, kb2));
             }
         }
     }
@@ -350,7 +348,7 @@ let DropdownWithDefaultActionViewItem = class DropdownWithDefaultActionViewItem
         this._options = options;
         this._storageKey = `${submenuAction.item.submenu.id}_lastActionId`;
         let defaultAction;
-        const defaultActionId = options?.persistLastActionId ? _storageService.get(this._storageKey, StorageScope.WORKSPACE) : undefined;
+        const defaultActionId = options?.persistLastActionId ? _storageService.get(this._storageKey, 1 ) : undefined;
         if (defaultActionId) {
             defaultAction = submenuAction.actions.find(a => defaultActionId === a.id);
         }
@@ -379,7 +377,7 @@ let DropdownWithDefaultActionViewItem = class DropdownWithDefaultActionViewItem
     }
     update(lastAction) {
         if (this._options?.persistLastActionId) {
-            this._storageService.store(this._storageKey, lastAction.id, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this._storageService.store(this._storageKey, lastAction.id, 1 , 1 );
         }
         this._defaultAction.dispose();
         this._defaultAction = this._instaService.createInstance(MenuEntryActionViewItem, lastAction, { keybinding: this._getDefaultActionKeybindingLabel(lastAction) });
@@ -415,7 +413,7 @@ let DropdownWithDefaultActionViewItem = class DropdownWithDefaultActionViewItem
         this._defaultAction.render(append(this._container, primaryContainer));
         this._register(addDisposableListener(primaryContainer, EventType.KEY_DOWN, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(KeyCode.RightArrow)) {
+            if (event.equals(17 )) {
                 this._defaultAction.element.tabIndex = -1;
                 this._dropdown.focus();
                 event.stopPropagation();
@@ -425,7 +423,7 @@ let DropdownWithDefaultActionViewItem = class DropdownWithDefaultActionViewItem
         this._dropdown.render(append(this._container, dropdownContainer));
         this._register(addDisposableListener(dropdownContainer, EventType.KEY_DOWN, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(KeyCode.LeftArrow)) {
+            if (event.equals(15 )) {
                 this._defaultAction.element.tabIndex = 0;
                 this._dropdown.setFocusable(false);
                 this._defaultAction.element?.focus();

package/vscode/src/vs/platform/actions/browser/toolbar.js

@@ -10,7 +10,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { localize } from '../../../nls.js';
-import { createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
+import { createActionViewItem, createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
 import { MenuItemAction, SubmenuItemAction } from '../common/actions.js';
 import { IMenuService } from '../common/actions.service.js';
 import { createConfigureKeybindingAction } from '../common/menuService.js';
@@ -19,12 +19,8 @@ import { IContextKeyService } from '../../contextkey/common/contextkey.service.j
 import { IContextMenuService } from '../../contextview/browser/contextView.service.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.service.js';
-var HiddenItemStrategy;
-( ((function(HiddenItemStrategy) {
-    HiddenItemStrategy[HiddenItemStrategy["NoHide"] = -1] = "NoHide";
-    HiddenItemStrategy[HiddenItemStrategy["Ignore"] = 0] = "Ignore";
-    HiddenItemStrategy[HiddenItemStrategy["RenderInSecondaryGroup"] = 1] = "RenderInSecondaryGroup";
-})(HiddenItemStrategy || (HiddenItemStrategy = {}))));
+import { IActionViewItemService } from './actionViewItemService.service.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
     constructor(container, _options, _menuService, _contextKeyService, _contextMenuService, _keybindingService, _commandService, telemetryService) {
         super(container, _contextMenuService, {
@@ -53,7 +49,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
         let toggleActionsCheckedCount = 0;
         const extraSecondary = [];
         let someAreHidden = false;
-        if (this._options?.hiddenItemStrategy !== HiddenItemStrategy.NoHide) {
+        if (this._options?.hiddenItemStrategy !== -1 ) {
             for (let i = 0; i < primary.length; i++) {
                 const action = primary[i];
                 if (!(action instanceof MenuItemAction) && !(action instanceof SubmenuItemAction)) {
@@ -69,7 +65,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                 if (action.hideActions.isHidden) {
                     someAreHidden = true;
                     primary[i] = undefined;
-                    if (this._options?.hiddenItemStrategy !== HiddenItemStrategy.Ignore) {
+                    if (this._options?.hiddenItemStrategy !== 0 ) {
                         extraSecondary[i] = action;
                     }
                 }
@@ -116,7 +112,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                 }
                 if (toggleActions.length > 0) {
                     let noHide = false;
-                    if (toggleActionsCheckedCount === 1 && this._options?.hiddenItemStrategy === HiddenItemStrategy.Ignore) {
+                    if (toggleActionsCheckedCount === 1 && this._options?.hiddenItemStrategy === 0 ) {
                         noHide = true;
                         for (let i = 0; i < toggleActions.length; i++) {
                             if (toggleActions[i].checked) {
@@ -140,7 +136,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     else {
                         primaryActions.push(toAction({
                             id: 'label',
-                            label: ( localize(5531, "Hide")),
+                            label: ( localize(5578, "Hide")),
                             enabled: false,
                             run() { }
                         }));
@@ -154,7 +150,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     actions.push(( (new Separator())));
                     actions.push(toAction({
                         id: 'resetThisMenu',
-                        label: ( localize(5532, "Reset Menu")),
+                        label: ( localize(5579, "Reset Menu")),
                         run: () => this._menuService.resetHiddenStates(menuIds)
                     }));
                 }
@@ -182,11 +178,25 @@ WorkbenchToolBar = ( (__decorate([
     ( (__param(7, ITelemetryService)))
 ], WorkbenchToolBar)));
 let MenuWorkbenchToolBar = class MenuWorkbenchToolBar extends WorkbenchToolBar {
-    constructor(container, menuId, options, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService) {
-        super(container, { resetMenu: menuId, ...options }, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService);
+    constructor(container, menuId, options, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService, actionViewService, instaService) {
+        super(container, {
+            resetMenu: menuId,
+            ...options,
+            actionViewItemProvider: (action, opts) => {
+                let provider = actionViewService.lookUp(menuId, action.id);
+                if (!provider) {
+                    provider = options?.actionViewItemProvider;
+                }
+                const viewItem = provider?.(action, opts);
+                if (viewItem) {
+                    return viewItem;
+                }
+                return createActionViewItem(instaService, action, opts);
+            }
+        }, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService);
         this._onDidChangeMenuItems = this._store.add(( (new Emitter())));
         this.onDidChangeMenuItems = this._onDidChangeMenuItems.event;
-        const menu = this._store.add(menuService.createMenu(menuId, contextKeyService, { emitEventsForSubmenuChanges: true }));
+        const menu = this._store.add(menuService.createMenu(menuId, contextKeyService, { emitEventsForSubmenuChanges: true, eventDebounceDelay: options?.eventDebounceDelay }));
         const updateToolbar = () => {
             const primary = [];
             const secondary = [];
@@ -198,6 +208,11 @@ let MenuWorkbenchToolBar = class MenuWorkbenchToolBar extends WorkbenchToolBar {
             updateToolbar();
             this._onDidChangeMenuItems.fire(this);
         }));
+        this._store.add(actionViewService.onDidChange(e => {
+            if (e === menuId) {
+                updateToolbar();
+            }
+        }));
         updateToolbar();
     }
     setActions() {
@@ -210,6 +225,8 @@ MenuWorkbenchToolBar = ( (__decorate([
     ( (__param(5, IContextMenuService))),
     ( (__param(6, IKeybindingService))),
     ( (__param(7, ICommandService))),
-    ( (__param(8, ITelemetryService)))
+    ( (__param(8, ITelemetryService))),
+    ( (__param(9, IActionViewItemService))),
+    ( (__param(10, IInstantiationService)))
 ], MenuWorkbenchToolBar)));
-export { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar };
+export { MenuWorkbenchToolBar, WorkbenchToolBar };

package/vscode/src/vs/platform/actions/common/actions.contribution.js

@@ -2,5 +2,4 @@ import { registerAction2 } from './actions.js';
 import '../../instantiation/common/instantiation.js';
 import { MenuHiddenStatesReset } from './menuResetAction.js';
 import './menuService.js';
-import '../../instantiation/common/extensions.js';
 registerAction2(MenuHiddenStatesReset);

package/vscode/src/vs/platform/actions/common/actions.d.ts

@@ -61,6 +61,7 @@ declare class MenuId {
     static readonly ExplorerContext: MenuId;
     static readonly ExplorerContextShare: MenuId;
     static readonly ExtensionContext: MenuId;
+    static readonly ExtensionEditorContextMenu: MenuId;
     static readonly GlobalActivity: MenuId;
     static readonly CommandCenter: MenuId;
     static readonly CommandCenterCenter: MenuId;
@@ -92,18 +93,7 @@ declare class MenuId {
     static readonly OpenEditorsContextShare: MenuId;
     static readonly ProblemsPanelContext: MenuId;
     static readonly SCMInputBox: MenuId;
-    static readonly SCMChangesSeparator: MenuId;
     static readonly SCMChangesContext: MenuId;
-    static readonly SCMIncomingChanges: MenuId;
-    static readonly SCMIncomingChangesContext: MenuId;
-    static readonly SCMIncomingChangesSetting: MenuId;
-    static readonly SCMOutgoingChanges: MenuId;
-    static readonly SCMOutgoingChangesContext: MenuId;
-    static readonly SCMOutgoingChangesSetting: MenuId;
-    static readonly SCMIncomingChangesAllChangesContext: MenuId;
-    static readonly SCMIncomingChangesHistoryItemContext: MenuId;
-    static readonly SCMOutgoingChangesAllChangesContext: MenuId;
-    static readonly SCMOutgoingChangesHistoryItemContext: MenuId;
     static readonly SCMChangeContext: MenuId;
     static readonly SCMResourceContext: MenuId;
     static readonly SCMResourceContextShare: MenuId;
@@ -170,6 +160,7 @@ declare class MenuId {
     static readonly NotebookCellExecuteGoTo: MenuId;
     static readonly NotebookCellExecutePrimary: MenuId;
     static readonly NotebookDiffCellInputTitle: MenuId;
+    static readonly NotebookDiffDocumentMetadata: MenuId;
     static readonly NotebookDiffCellMetadataTitle: MenuId;
     static readonly NotebookDiffCellOutputsTitle: MenuId;
     static readonly NotebookOutputToolbar: MenuId;
@@ -209,9 +200,15 @@ declare class MenuId {
     static readonly ChatCodeBlock: MenuId;
     static readonly ChatCompareBlock: MenuId;
     static readonly ChatMessageTitle: MenuId;
+    static readonly ChatMessageFooter: MenuId;
     static readonly ChatExecute: MenuId;
     static readonly ChatExecuteSecondary: MenuId;
+    static readonly ChatInput: MenuId;
     static readonly ChatInputSide: MenuId;
+    static readonly ChatEditingSessionWidgetToolbar: MenuId;
+    static readonly ChatInlineResourceAnchorContext: MenuId;
+    static readonly ChatInlineSymbolAnchorContext: MenuId;
+    static readonly ChatCommandCenter: MenuId;
     static readonly AccessibleView: MenuId;
     static readonly MultiDiffEditorFileToolbar: MenuId;
     static readonly DiffEditorHunkToolbar: MenuId;
@@ -274,7 +271,7 @@ declare const MenuRegistry: IMenuRegistry;
 declare class SubmenuItemAction extends SubmenuAction {
     readonly item: ISubmenuItem;
     readonly hideActions: IMenuItemHide | undefined;
-    constructor(item: ISubmenuItem, hideActions: IMenuItemHide | undefined, actions: IAction[]);
+    constructor(item: ISubmenuItem, hideActions: IMenuItemHide | undefined, actions: readonly IAction[]);
 }
 interface IMenuItemHide {
     readonly isHidden: boolean;

package/vscode/src/vs/platform/actions/common/actions.js

@@ -50,6 +50,7 @@ class MenuId {
     static { this.ExplorerContext = ( new MenuId('ExplorerContext')); }
     static { this.ExplorerContextShare = ( new MenuId('ExplorerContextShare')); }
     static { this.ExtensionContext = ( new MenuId('ExtensionContext')); }
+    static { this.ExtensionEditorContextMenu = ( new MenuId('ExtensionEditorContextMenu')); }
     static { this.GlobalActivity = ( new MenuId('GlobalActivity')); }
     static { this.CommandCenter = ( new MenuId('CommandCenter')); }
     static { this.CommandCenterCenter = ( new MenuId('CommandCenterCenter')); }
@@ -81,18 +82,7 @@ class MenuId {
     static { this.OpenEditorsContextShare = ( new MenuId('OpenEditorsContextShare')); }
     static { this.ProblemsPanelContext = ( new MenuId('ProblemsPanelContext')); }
     static { this.SCMInputBox = ( new MenuId('SCMInputBox')); }
-    static { this.SCMChangesSeparator = ( new MenuId('SCMChangesSeparator')); }
     static { this.SCMChangesContext = ( new MenuId('SCMChangesContext')); }
-    static { this.SCMIncomingChanges = ( new MenuId('SCMIncomingChanges')); }
-    static { this.SCMIncomingChangesContext = ( new MenuId('SCMIncomingChangesContext')); }
-    static { this.SCMIncomingChangesSetting = ( new MenuId('SCMIncomingChangesSetting')); }
-    static { this.SCMOutgoingChanges = ( new MenuId('SCMOutgoingChanges')); }
-    static { this.SCMOutgoingChangesContext = ( new MenuId('SCMOutgoingChangesContext')); }
-    static { this.SCMOutgoingChangesSetting = ( new MenuId('SCMOutgoingChangesSetting')); }
-    static { this.SCMIncomingChangesAllChangesContext = ( new MenuId('SCMIncomingChangesAllChangesContext')); }
-    static { this.SCMIncomingChangesHistoryItemContext = ( new MenuId('SCMIncomingChangesHistoryItemContext')); }
-    static { this.SCMOutgoingChangesAllChangesContext = ( new MenuId('SCMOutgoingChangesAllChangesContext')); }
-    static { this.SCMOutgoingChangesHistoryItemContext = ( new MenuId('SCMOutgoingChangesHistoryItemContext')); }
     static { this.SCMChangeContext = ( new MenuId('SCMChangeContext')); }
     static { this.SCMResourceContext = ( new MenuId('SCMResourceContext')); }
     static { this.SCMResourceContextShare = ( new MenuId('SCMResourceContextShare')); }
@@ -159,6 +149,7 @@ class MenuId {
     static { this.NotebookCellExecuteGoTo = ( new MenuId('NotebookCellExecuteGoTo')); }
     static { this.NotebookCellExecutePrimary = ( new MenuId('NotebookCellExecutePrimary')); }
     static { this.NotebookDiffCellInputTitle = ( new MenuId('NotebookDiffCellInputTitle')); }
+    static { this.NotebookDiffDocumentMetadata = ( new MenuId('NotebookDiffDocumentMetadata')); }
     static { this.NotebookDiffCellMetadataTitle = ( new MenuId('NotebookDiffCellMetadataTitle')); }
     static { this.NotebookDiffCellOutputsTitle = ( new MenuId('NotebookDiffCellOutputsTitle')); }
     static { this.NotebookOutputToolbar = ( new MenuId('NotebookOutputToolbar')); }
@@ -198,9 +189,15 @@ class MenuId {
     static { this.ChatCodeBlock = ( new MenuId('ChatCodeblock')); }
     static { this.ChatCompareBlock = ( new MenuId('ChatCompareBlock')); }
     static { this.ChatMessageTitle = ( new MenuId('ChatMessageTitle')); }
+    static { this.ChatMessageFooter = ( new MenuId('ChatMessageFooter')); }
     static { this.ChatExecute = ( new MenuId('ChatExecute')); }
     static { this.ChatExecuteSecondary = ( new MenuId('ChatExecuteSecondary')); }
+    static { this.ChatInput = ( new MenuId('ChatInput')); }
     static { this.ChatInputSide = ( new MenuId('ChatInputSide')); }
+    static { this.ChatEditingSessionWidgetToolbar = ( new MenuId('ChatEditingSession')); }
+    static { this.ChatInlineResourceAnchorContext = ( new MenuId('ChatInlineResourceAnchorContext')); }
+    static { this.ChatInlineSymbolAnchorContext = ( new MenuId('ChatInlineSymbolAnchorContext')); }
+    static { this.ChatCommandCenter = ( new MenuId('ChatCommandCenter')); }
     static { this.AccessibleView = ( new MenuId('AccessibleView')); }
     static { this.MultiDiffEditorFileToolbar = ( new MenuId('MultiDiffEditorFileToolbar')); }
     static { this.DiffEditorHunkToolbar = ( new MenuId('DiffEditorHunkToolbar')); }

package/vscode/src/vs/platform/actions/common/menuResetAction.js

@@ -7,7 +7,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: 'menu.resetHiddenStates',
-            title: ( localize2(4454, "Reset All Menus")),
+            title: ( localize2(4495, "Reset All Menus")),
             category: Categories.View,
             f1: true
         });