@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js

@@ -10,6 +10,7 @@ import '../../../base/common/cancellation.js';
 import { localizeWithPath } from '../../../nls.js';
 import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
 import { IConfigurationService } from '../../configuration/common/configuration.service.js';
+import { observableConfigValue } from '../../observable/common/platformObservableUtils.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.service.js';
 const _moduleId = "vs/platform/accessibilitySignal/browser/accessibilitySignalService";
 const AcknowledgeDocCommentsToken = Symbol('AcknowledgeDocCommentsToken');
@@ -24,7 +25,7 @@ let AccessibilitySignalService = class AccessibilitySignalService extends Dispos
         this.sentTelemetry = ( (new Set()));
         this.playingSounds = ( (new Set()));
         this._signalConfigValue = ( (new CachedFunction(
-            (signal) => observableConfigValue(signal.settingsKey, this.configurationService)
+            (signal) => observableConfigValue(signal.settingsKey, { sound: 'off', announcement: 'off' }, this.configurationService)
         )));
         this._signalEnabledState = ( (new CachedFunction({ getCacheKey: getStructuralKey }, (arg) => {
             return derived(reader => {
@@ -149,6 +150,11 @@ let AccessibilitySignalService = class AccessibilitySignalService extends Dispos
     onSoundEnabledChanged(signal) {
         return this.getEnabledState(signal, false).onDidChange;
     }
+    getDelayMs(signal, modality) {
+        const delaySettingsKey = signal.delaySettingsKey ?? 'accessibility.signalOptions.delays.general';
+        const delaySettingsValue = this.configurationService.getValue(delaySettingsKey);
+        return modality === 'sound' ? delaySettingsValue.sound : delaySettingsValue.announcement;
+    }
 };
 AccessibilitySignalService = ( (__decorate([
     ( (__param(0, IConfigurationService))),
@@ -182,6 +188,7 @@ class Sound {
     }
     static { this.error = Sound.register({ fileName: 'error.mp3' }); }
     static { this.warning = Sound.register({ fileName: 'warning.mp3' }); }
+    static { this.success = Sound.register({ fileName: 'success.mp3' }); }
     static { this.foldedArea = Sound.register({ fileName: 'foldedAreas.mp3' }); }
     static { this.break = Sound.register({ fileName: 'break.mp3' }); }
     static { this.quickFixes = Sound.register({ fileName: 'quickFixes.mp3' }); }
@@ -221,13 +228,14 @@ class SoundSource {
     }
 }
 class AccessibilitySignal {
-    constructor(sound, name, legacySoundSettingsKey, settingsKey, legacyAnnouncementSettingsKey, announcementMessage) {
+    constructor(sound, name, legacySoundSettingsKey, settingsKey, legacyAnnouncementSettingsKey, announcementMessage, delaySettingsKey) {
         this.sound = sound;
         this.name = name;
         this.legacySoundSettingsKey = legacySoundSettingsKey;
         this.settingsKey = settingsKey;
         this.legacyAnnouncementSettingsKey = legacyAnnouncementSettingsKey;
         this.announcementMessage = announcementMessage;
+        this.delaySettingsKey = delaySettingsKey;
     }
     static { this._signals = ( (new Set())); }
     static register(options) {
@@ -240,7 +248,8 @@ class AccessibilitySignal {
             options.legacySoundSettingsKey,
             options.settingsKey,
             options.legacyAnnouncementSettingsKey,
-            options.announcementMessage
+            options.announcementMessage,
+            options.delaySettingsKey
         )));
         AccessibilitySignal._signals.add(signal);
         return signal;
@@ -253,18 +262,20 @@ class AccessibilitySignal {
         sound: Sound.error,
         announcementMessage: ( localizeWithPath(_moduleId, 1, 'Error')),
         settingsKey: 'accessibility.signals.positionHasError',
+        delaySettingsKey: 'accessibility.signalOptions.delays.errorAtPosition'
     }); }
     static { this.warningAtPosition = AccessibilitySignal.register({
         name: ( localizeWithPath(_moduleId, 2, 'Warning at Position')),
         sound: Sound.warning,
         announcementMessage: ( localizeWithPath(_moduleId, 3, 'Warning')),
         settingsKey: 'accessibility.signals.positionHasWarning',
+        delaySettingsKey: 'accessibility.signalOptions.delays.warningAtPosition'
     }); }
     static { this.errorOnLine = AccessibilitySignal.register({
         name: ( localizeWithPath(_moduleId, 4, 'Error on Line')),
         sound: Sound.error,
         legacySoundSettingsKey: 'audioCues.lineHasError',
-        legacyAnnouncementSettingsKey: "accessibility.alert.error" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.error',
         announcementMessage: ( localizeWithPath(_moduleId, 5, 'Error on Line')),
         settingsKey: 'accessibility.signals.lineHasError',
     }); }
@@ -272,7 +283,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 6, 'Warning on Line')),
         sound: Sound.warning,
         legacySoundSettingsKey: 'audioCues.lineHasWarning',
-        legacyAnnouncementSettingsKey: "accessibility.alert.warning" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.warning',
         announcementMessage: ( localizeWithPath(_moduleId, 7, 'Warning on Line')),
         settingsKey: 'accessibility.signals.lineHasWarning',
     }); }
@@ -280,7 +291,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 8, 'Folded Area on Line')),
         sound: Sound.foldedArea,
         legacySoundSettingsKey: 'audioCues.lineHasFoldedArea',
-        legacyAnnouncementSettingsKey: "accessibility.alert.foldedArea" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.foldedArea',
         announcementMessage: ( localizeWithPath(_moduleId, 9, 'Folded')),
         settingsKey: 'accessibility.signals.lineHasFoldedArea',
     }); }
@@ -288,7 +299,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 10, 'Breakpoint on Line')),
         sound: Sound.break,
         legacySoundSettingsKey: 'audioCues.lineHasBreakpoint',
-        legacyAnnouncementSettingsKey: "accessibility.alert.breakpoint" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.breakpoint',
         announcementMessage: ( localizeWithPath(_moduleId, 11, 'Breakpoint')),
         settingsKey: 'accessibility.signals.lineHasBreakpoint',
     }); }
@@ -302,7 +313,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 13, 'Terminal Quick Fix')),
         sound: Sound.quickFixes,
         legacySoundSettingsKey: 'audioCues.terminalQuickFix',
-        legacyAnnouncementSettingsKey: "accessibility.alert.terminalQuickFix" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.terminalQuickFix',
         announcementMessage: ( localizeWithPath(_moduleId, 14, 'Quick Fix')),
         settingsKey: 'accessibility.signals.terminalQuickFix',
     }); }
@@ -310,7 +321,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 15, 'Debugger Stopped on Breakpoint')),
         sound: Sound.break,
         legacySoundSettingsKey: 'audioCues.onDebugBreak',
-        legacyAnnouncementSettingsKey: "accessibility.alert.onDebugBreak" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.onDebugBreak',
         announcementMessage: ( localizeWithPath(_moduleId, 16, 'Breakpoint')),
         settingsKey: 'accessibility.signals.onDebugBreak',
     }); }
@@ -318,7 +329,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 17, 'No Inlay Hints on Line')),
         sound: Sound.error,
         legacySoundSettingsKey: 'audioCues.noInlayHints',
-        legacyAnnouncementSettingsKey: "accessibility.alert.noInlayHints" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.noInlayHints',
         announcementMessage: ( localizeWithPath(_moduleId, 18, 'No Inlay Hints')),
         settingsKey: 'accessibility.signals.noInlayHints',
     }); }
@@ -326,7 +337,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 19, 'Task Completed')),
         sound: Sound.taskCompleted,
         legacySoundSettingsKey: 'audioCues.taskCompleted',
-        legacyAnnouncementSettingsKey: "accessibility.alert.taskCompleted" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.taskCompleted',
         announcementMessage: ( localizeWithPath(_moduleId, 20, 'Task Completed')),
         settingsKey: 'accessibility.signals.taskCompleted',
     }); }
@@ -334,7 +345,7 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 21, 'Task Failed')),
         sound: Sound.taskFailed,
         legacySoundSettingsKey: 'audioCues.taskFailed',
-        legacyAnnouncementSettingsKey: "accessibility.alert.taskFailed" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.taskFailed',
         announcementMessage: ( localizeWithPath(_moduleId, 22, 'Task Failed')),
         settingsKey: 'accessibility.signals.taskFailed',
     }); }
@@ -342,62 +353,68 @@ class AccessibilitySignal {
         name: ( localizeWithPath(_moduleId, 23, 'Terminal Command Failed')),
         sound: Sound.error,
         legacySoundSettingsKey: 'audioCues.terminalCommandFailed',
-        legacyAnnouncementSettingsKey: "accessibility.alert.terminalCommandFailed" ,
+        legacyAnnouncementSettingsKey: 'accessibility.alert.terminalCommandFailed',
         announcementMessage: ( localizeWithPath(_moduleId, 24, 'Command Failed')),
         settingsKey: 'accessibility.signals.terminalCommandFailed',
     }); }
+    static { this.terminalCommandSucceeded = AccessibilitySignal.register({
+        name: ( localizeWithPath(_moduleId, 25, 'Terminal Command Succeeded')),
+        sound: Sound.success,
+        announcementMessage: ( localizeWithPath(_moduleId, 26, 'Command Succeeded')),
+        settingsKey: 'accessibility.signals.terminalCommandSucceeded',
+    }); }
     static { this.terminalBell = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 25, 'Terminal Bell')),
+        name: ( localizeWithPath(_moduleId, 27, 'Terminal Bell')),
         sound: Sound.terminalBell,
         legacySoundSettingsKey: 'audioCues.terminalBell',
-        legacyAnnouncementSettingsKey: "accessibility.alert.terminalBell" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 26, 'Terminal Bell')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.terminalBell',
+        announcementMessage: ( localizeWithPath(_moduleId, 28, 'Terminal Bell')),
         settingsKey: 'accessibility.signals.terminalBell',
     }); }
     static { this.notebookCellCompleted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 27, 'Notebook Cell Completed')),
+        name: ( localizeWithPath(_moduleId, 29, 'Notebook Cell Completed')),
         sound: Sound.taskCompleted,
         legacySoundSettingsKey: 'audioCues.notebookCellCompleted',
-        legacyAnnouncementSettingsKey: "accessibility.alert.notebookCellCompleted" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 28, 'Notebook Cell Completed')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.notebookCellCompleted',
+        announcementMessage: ( localizeWithPath(_moduleId, 30, 'Notebook Cell Completed')),
         settingsKey: 'accessibility.signals.notebookCellCompleted',
     }); }
     static { this.notebookCellFailed = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 29, 'Notebook Cell Failed')),
+        name: ( localizeWithPath(_moduleId, 31, 'Notebook Cell Failed')),
         sound: Sound.taskFailed,
         legacySoundSettingsKey: 'audioCues.notebookCellFailed',
-        legacyAnnouncementSettingsKey: "accessibility.alert.notebookCellFailed" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 30, 'Notebook Cell Failed')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.notebookCellFailed',
+        announcementMessage: ( localizeWithPath(_moduleId, 32, 'Notebook Cell Failed')),
         settingsKey: 'accessibility.signals.notebookCellFailed',
     }); }
     static { this.diffLineInserted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 31, 'Diff Line Inserted')),
+        name: ( localizeWithPath(_moduleId, 33, 'Diff Line Inserted')),
         sound: Sound.diffLineInserted,
         legacySoundSettingsKey: 'audioCues.diffLineInserted',
         settingsKey: 'accessibility.signals.diffLineInserted',
     }); }
     static { this.diffLineDeleted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 32, 'Diff Line Deleted')),
+        name: ( localizeWithPath(_moduleId, 34, 'Diff Line Deleted')),
         sound: Sound.diffLineDeleted,
         legacySoundSettingsKey: 'audioCues.diffLineDeleted',
         settingsKey: 'accessibility.signals.diffLineDeleted',
     }); }
     static { this.diffLineModified = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 33, 'Diff Line Modified')),
+        name: ( localizeWithPath(_moduleId, 35, 'Diff Line Modified')),
         sound: Sound.diffLineModified,
         legacySoundSettingsKey: 'audioCues.diffLineModified',
         settingsKey: 'accessibility.signals.diffLineModified',
     }); }
     static { this.chatRequestSent = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 34, 'Chat Request Sent')),
+        name: ( localizeWithPath(_moduleId, 36, 'Chat Request Sent')),
         sound: Sound.chatRequestSent,
         legacySoundSettingsKey: 'audioCues.chatRequestSent',
-        legacyAnnouncementSettingsKey: "accessibility.alert.chatRequestSent" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 35, 'Chat Request Sent')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.chatRequestSent',
+        announcementMessage: ( localizeWithPath(_moduleId, 37, 'Chat Request Sent')),
         settingsKey: 'accessibility.signals.chatRequestSent',
     }); }
     static { this.chatResponseReceived = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 36, 'Chat Response Received')),
+        name: ( localizeWithPath(_moduleId, 38, 'Chat Response Received')),
         legacySoundSettingsKey: 'audioCues.chatResponseReceived',
         sound: {
             randomOneOf: [
@@ -410,55 +427,48 @@ class AccessibilitySignal {
         settingsKey: 'accessibility.signals.chatResponseReceived'
     }); }
     static { this.progress = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 37, 'Progress')),
+        name: ( localizeWithPath(_moduleId, 39, 'Progress')),
         sound: Sound.progress,
         legacySoundSettingsKey: 'audioCues.chatResponsePending',
-        legacyAnnouncementSettingsKey: "accessibility.alert.chatResponseProgress" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 38, 'Progress')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.progress',
+        announcementMessage: ( localizeWithPath(_moduleId, 40, 'Progress')),
         settingsKey: 'accessibility.signals.progress'
     }); }
     static { this.clear = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 39, 'Clear')),
+        name: ( localizeWithPath(_moduleId, 41, 'Clear')),
         sound: Sound.clear,
         legacySoundSettingsKey: 'audioCues.clear',
-        legacyAnnouncementSettingsKey: "accessibility.alert.clear" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 40, 'Clear')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.clear',
+        announcementMessage: ( localizeWithPath(_moduleId, 42, 'Clear')),
         settingsKey: 'accessibility.signals.clear'
     }); }
     static { this.save = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 41, 'Save')),
+        name: ( localizeWithPath(_moduleId, 43, 'Save')),
         sound: Sound.save,
         legacySoundSettingsKey: 'audioCues.save',
-        legacyAnnouncementSettingsKey: "accessibility.alert.save" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 42, 'Save')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.save',
+        announcementMessage: ( localizeWithPath(_moduleId, 44, 'Save')),
         settingsKey: 'accessibility.signals.save'
     }); }
     static { this.format = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 43, 'Format')),
+        name: ( localizeWithPath(_moduleId, 45, 'Format')),
         sound: Sound.format,
         legacySoundSettingsKey: 'audioCues.format',
-        legacyAnnouncementSettingsKey: "accessibility.alert.format" ,
-        announcementMessage: ( localizeWithPath(_moduleId, 44, 'Format')),
+        legacyAnnouncementSettingsKey: 'accessibility.alert.format',
+        announcementMessage: ( localizeWithPath(_moduleId, 46, 'Format')),
         settingsKey: 'accessibility.signals.format'
     }); }
     static { this.voiceRecordingStarted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 45, 'Voice Recording Started')),
+        name: ( localizeWithPath(_moduleId, 47, 'Voice Recording Started')),
         sound: Sound.voiceRecordingStarted,
         legacySoundSettingsKey: 'audioCues.voiceRecordingStarted',
         settingsKey: 'accessibility.signals.voiceRecordingStarted'
     }); }
     static { this.voiceRecordingStopped = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 46, 'Voice Recording Stopped')),
+        name: ( localizeWithPath(_moduleId, 48, 'Voice Recording Stopped')),
         sound: Sound.voiceRecordingStopped,
         legacySoundSettingsKey: 'audioCues.voiceRecordingStopped',
         settingsKey: 'accessibility.signals.voiceRecordingStopped'
     }); }
 }
-function observableConfigValue(key, configurationService) {
-    return observableFromEvent((handleChange) => configurationService.onDidChangeConfiguration(e => {
-        if (e.affectsConfiguration(key)) {
-            handleChange(e);
-        }
-    }), () => configurationService.getValue(key));
-}
-export { AccessibilitySignal, AccessibilitySignalService, AcknowledgeDocCommentsToken, Sound, SoundSource, observableConfigValue };
+export { AccessibilitySignal, AccessibilitySignalService, AcknowledgeDocCommentsToken, Sound, SoundSource };

package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service.d.ts

@@ -13,6 +13,7 @@ interface IAccessibilitySignalService {
     })[]): Promise<void>;
     playSignalLoop(signal: AccessibilitySignal, milliseconds: number): IDisposable;
     getEnabledState(signal: AccessibilitySignal, userGesture: boolean, modality?: AccessibilityModality | undefined): IValueWithChangeEvent<boolean>;
+    getDelayMs(signal: AccessibilitySignal, modality: AccessibilityModality): number;
     /**
     * Avoid this method and prefer `.playSignal`!
     * Only use it when you want to play the sound regardless of enablement, e.g. in the settings quick pick.

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

@@ -59,6 +59,10 @@ interface ICommandAction {
     tooltip?: string | ILocalizedString;
     icon?: Icon;
     source?: ICommandActionSource;
+    /**
+     * Precondition controls enablement (for example for a menu item, show
+     * it in grey or for a command, do not allow to invoke it)
+     */
     precondition?: ContextKeyExpression;
     /**
      * The action is a toggle action. Define the context key expression that reflects its toggle-state

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

@@ -26,8 +26,13 @@ import '../../theme/common/colors/searchColors.js';
 const _moduleId = "vs/platform/actionWidget/browser/actionList";
 const acceptSelectedActionCommand = 'acceptSelectedCodeAction';
 const previewSelectedActionCommand = 'previewSelectedCodeAction';
+var ActionListItemKind;
+( ((function(ActionListItemKind) {
+    ActionListItemKind["Action"] = "action";
+    ActionListItemKind["Header"] = "header";
+})(ActionListItemKind || (ActionListItemKind = {}))));
 class HeaderRenderer {
-    get templateId() { return "header" ; }
+    get templateId() { return ActionListItemKind.Header; }
     renderTemplate(container) {
         container.classList.add('group-header');
         const text = document.createElement('span');
@@ -41,7 +46,7 @@ class HeaderRenderer {
     }
 }
 let ActionItemRenderer = class ActionItemRenderer {
-    get templateId() { return "action" ; }
+    get templateId() { return ActionListItemKind.Action; }
     constructor(_supportsPreview, _keybindingService) {
         this._supportsPreview = _supportsPreview;
         this._keybindingService = _keybindingService;
@@ -123,7 +128,7 @@ let ActionList = class ActionList extends Disposable {
         this.domNode = document.createElement('div');
         this.domNode.classList.add('actionList');
         const virtualDelegate = {
-            getHeight: element => element.kind === "header"  ? this._headerLineHeight : this._actionLineHeight,
+            getHeight: element => element.kind === ActionListItemKind.Header ? this._headerLineHeight : this._actionLineHeight,
             getTemplateId: element => element.kind
         };
         this._list = this._register(( (new List(user, this.domNode, virtualDelegate, [
@@ -135,7 +140,7 @@ let ActionList = class ActionList extends Disposable {
             keyboardNavigationLabelProvider: { getKeyboardNavigationLabel },
             accessibilityProvider: {
                 getAriaLabel: element => {
-                    if (element.kind === "action" ) {
+                    if (element.kind === ActionListItemKind.Action) {
                         let label = element.label ? stripNewlines(element?.label) : '';
                         if (element.disabled) {
                             label = ( localizeWithPath(_moduleId, 2, "{0}, Disabled Reason: {1}", label, element.disabled));
@@ -145,7 +150,7 @@ let ActionList = class ActionList extends Disposable {
                     return null;
                 },
                 getWidgetAriaLabel: () => ( localizeWithPath(_moduleId, 3, "Action Widget")),
-                getRole: (e) => e.kind === "action"  ? 'option' : 'separator',
+                getRole: (e) => e.kind === ActionListItemKind.Action ? 'option' : 'separator',
                 getWidgetRole: () => 'listbox',
             },
         }))));
@@ -161,7 +166,7 @@ let ActionList = class ActionList extends Disposable {
         }
     }
     focusCondition(element) {
-        return !element.disabled && element.kind === "action" ;
+        return !element.disabled && element.kind === ActionListItemKind.Action;
     }
     hide(didCancel) {
         this._delegate.onHide(didCancel);
@@ -240,7 +245,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 === "action" ) {
+            if (this._delegate.onHover && !element.disabled && element.kind === ActionListItemKind.Action) {
                 const result = await this._delegate.onHover(element.item, this.cts.token);
                 element.canPreview = result ? result.canPreview : undefined;
             }
@@ -263,4 +268,4 @@ ActionList = ( (__decorate([
 function stripNewlines(str) {
     return str.replace(/\r\n|\r|\n/g, ' ');
 }
-export { ActionList, acceptSelectedActionCommand, previewSelectedActionCommand };
+export { ActionList, ActionListItemKind, acceptSelectedActionCommand, previewSelectedActionCommand };

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

@@ -1,6 +1,7 @@
 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 { localizeWithPath, localize2WithPath } from '../../../nls.js';
@@ -9,8 +10,9 @@ 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 } from '../../instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } 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';
@@ -124,8 +126,8 @@ ActionWidgetService = ( (__decorate([
     ( (__param(1, IContextKeyService))),
     ( (__param(2, IInstantiationService)))
 ], ActionWidgetService)));
-registerSingleton(IActionWidgetService, ActionWidgetService, 1 );
-const weight = 100  + 1000;
+registerSingleton(IActionWidgetService, ActionWidgetService, InstantiationType.Delayed);
+const weight = KeybindingWeight.EditorContrib + 1000;
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -134,8 +136,8 @@ registerAction2(class extends Action2 {
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: 9 ,
-                secondary: [1024  | 9 ]
+                primary: KeyCode.Escape,
+                secondary: [KeyMod$1.Shift | KeyCode.Escape]
             },
         });
     }
@@ -151,9 +153,9 @@ registerAction2(class extends Action2 {
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: 16 ,
-                secondary: [2048  | 16 ],
-                mac: { primary: 16 , secondary: [2048  | 16 , 256  | 46 ] },
+                primary: KeyCode.UpArrow,
+                secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow],
+                mac: { primary: KeyCode.UpArrow, secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow, KeyMod$1.WinCtrl | KeyCode.KeyP] },
             }
         });
     }
@@ -172,9 +174,9 @@ registerAction2(class extends Action2 {
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: 18 ,
-                secondary: [2048  | 18 ],
-                mac: { primary: 18 , secondary: [2048  | 18 , 256  | 44 ] }
+                primary: KeyCode.DownArrow,
+                secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow],
+                mac: { primary: KeyCode.DownArrow, secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow, KeyMod$1.WinCtrl | KeyCode.KeyN] }
             }
         });
     }
@@ -193,8 +195,8 @@ registerAction2(class extends Action2 {
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: 3 ,
-                secondary: [2048  | 89 ],
+                primary: KeyCode.Enter,
+                secondary: [KeyMod$1.CtrlCmd | KeyCode.Period],
             }
         });
     }
@@ -213,7 +215,7 @@ registerAction2(class extends Action2 {
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
-                primary: 2048  | 3 ,
+                primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
             }
         });
     }

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

@@ -3,6 +3,7 @@ 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';
@@ -55,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(17 )) {
+            if (event.equals(KeyCode.RightArrow)) {
                 this._primaryAction.element.tabIndex = -1;
                 this._dropdown.focus();
                 event.stopPropagation();
@@ -63,7 +64,7 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
         }));
         this._register(addDisposableListener(this._dropdownContainer, EventType.KEY_DOWN, (e) => {
             const event = ( new StandardKeyboardEvent(e));
-            if (event.equals(15 )) {
+            if (event.equals(KeyCode.LeftArrow)) {
                 this._primaryAction.element.tabIndex = 0;
                 this._dropdown.setFocusable(false);
                 this._primaryAction.element?.focus();

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

@@ -5,6 +5,7 @@ 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';
@@ -17,6 +18,7 @@ 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';
@@ -288,7 +290,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, 1 ) : undefined;
+        const defaultActionId = options?.persistLastActionId ? _storageService.get(this._storageKey, StorageScope.WORKSPACE) : undefined;
         if (defaultActionId) {
             defaultAction = submenuAction.actions.find(a => defaultActionId === a.id);
         }
@@ -317,7 +319,7 @@ let DropdownWithDefaultActionViewItem = class DropdownWithDefaultActionViewItem
     }
     update(lastAction) {
         if (this._options?.persistLastActionId) {
-            this._storageService.store(this._storageKey, lastAction.id, 1 , 1 );
+            this._storageService.store(this._storageKey, lastAction.id, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         this._defaultAction.dispose();
         this._defaultAction = this._instaService.createInstance(MenuEntryActionViewItem, lastAction, { keybinding: this._getDefaultActionKeybindingLabel(lastAction) });
@@ -353,7 +355,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(17 )) {
+            if (event.equals(KeyCode.RightArrow)) {
                 this._defaultAction.element.tabIndex = -1;
                 this._dropdown.focus();
                 event.stopPropagation();
@@ -363,7 +365,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(15 )) {
+            if (event.equals(KeyCode.LeftArrow)) {
                 this._defaultAction.element.tabIndex = 0;
                 this._dropdown.setFocusable(false);
                 this._defaultAction.element?.focus();

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

@@ -20,6 +20,12 @@ import { IContextMenuService } from '../../contextview/browser/contextView.servi
 import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.service.js';
 const _moduleId = "vs/platform/actions/browser/toolbar";
+var HiddenItemStrategy;
+( ((function(HiddenItemStrategy) {
+    HiddenItemStrategy[HiddenItemStrategy["NoHide"] = -1] = "NoHide";
+    HiddenItemStrategy[HiddenItemStrategy["Ignore"] = 0] = "Ignore";
+    HiddenItemStrategy[HiddenItemStrategy["RenderInSecondaryGroup"] = 1] = "RenderInSecondaryGroup";
+})(HiddenItemStrategy || (HiddenItemStrategy = {}))));
 let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
     constructor(container, _options, _menuService, _contextKeyService, _contextMenuService, _keybindingService, _commandService, telemetryService) {
         super(container, _contextMenuService, {
@@ -48,7 +54,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
         let toggleActionsCheckedCount = 0;
         const extraSecondary = [];
         let someAreHidden = false;
-        if (this._options?.hiddenItemStrategy !== -1 ) {
+        if (this._options?.hiddenItemStrategy !== HiddenItemStrategy.NoHide) {
             for (let i = 0; i < primary.length; i++) {
                 const action = primary[i];
                 if (!(action instanceof MenuItemAction) && !(action instanceof SubmenuItemAction)) {
@@ -64,7 +70,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                 if (action.hideActions.isHidden) {
                     someAreHidden = true;
                     primary[i] = undefined;
-                    if (this._options?.hiddenItemStrategy !== 0 ) {
+                    if (this._options?.hiddenItemStrategy !== HiddenItemStrategy.Ignore) {
                         extraSecondary[i] = action;
                     }
                 }
@@ -110,7 +116,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                 }
                 if (toggleActions.length > 0) {
                     let noHide = false;
-                    if (toggleActionsCheckedCount === 1 && this._options?.hiddenItemStrategy === 0 ) {
+                    if (toggleActionsCheckedCount === 1 && this._options?.hiddenItemStrategy === HiddenItemStrategy.Ignore) {
                         noHide = true;
                         for (let i = 0; i < toggleActions.length; i++) {
                             if (toggleActions[i].checked) {
@@ -206,4 +212,4 @@ MenuWorkbenchToolBar = ( (__decorate([
     ( (__param(7, ICommandService))),
     ( (__param(8, ITelemetryService)))
 ], MenuWorkbenchToolBar)));
-export { MenuWorkbenchToolBar, WorkbenchToolBar };
+export { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar };

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

@@ -2,4 +2,5 @@ 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

@@ -9,6 +9,9 @@ import { IContextKeyService } from '../../contextkey/common/contextkey.service.j
 interface IMenuItem {
     command: ICommandAction;
     alt?: ICommandAction;
+    /**
+     * Menu item is hidden if this expression returns false.
+     */
     when?: ContextKeyExpression;
     group?: 'navigation' | string;
     order?: number;