@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -7,12 +7,11 @@ import { derived } from '../../../base/common/observableInternal/derived.js';
 import '../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent, ValueWithChangeEventFromObservable } from '../../../base/common/observableInternal/utils.js';
 import '../../../base/common/cancellation.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } 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');
 let AccessibilitySignalService = class AccessibilitySignalService extends Disposable {
     constructor(configurationService, accessibilityService, telemetryService) {
@@ -89,7 +88,7 @@ let AccessibilitySignalService = class AccessibilitySignalService extends Dispos
         });
     }
     getVolumeInPercent() {
-        const volume = this.configurationService.getValue('accessibilitySignals.volume');
+        const volume = this.configurationService.getValue('accessibility.signalOptions.volume');
         if (typeof volume !== 'number') {
             return 50;
         }
@@ -239,14 +238,13 @@ class SoundSource {
     }
 }
 class AccessibilitySignal {
-    constructor(sound, name, legacySoundSettingsKey, settingsKey, legacyAnnouncementSettingsKey, announcementMessage, delaySettingsKey) {
+    constructor(sound, name, legacySoundSettingsKey, settingsKey, legacyAnnouncementSettingsKey, announcementMessage) {
         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) {
@@ -259,8 +257,7 @@ class AccessibilitySignal {
             options.legacySoundSettingsKey,
             options.settingsKey,
             options.legacyAnnouncementSettingsKey,
-            options.announcementMessage,
-            options.delaySettingsKey
+            options.announcementMessage
         )));
         AccessibilitySignal._signals.add(signal);
         return signal;
@@ -269,163 +266,163 @@ class AccessibilitySignal {
         return [...this._signals];
     }
     static { this.errorAtPosition = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 0, 'Error at Position')),
+        name: ( localize(2271, 'Error at Position')),
         sound: Sound.error,
-        announcementMessage: ( localizeWithPath(_moduleId, 1, 'Error')),
+        announcementMessage: ( localize(2272, 'Error')),
         settingsKey: 'accessibility.signals.positionHasError',
         delaySettingsKey: 'accessibility.signalOptions.delays.errorAtPosition'
     }); }
     static { this.warningAtPosition = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 2, 'Warning at Position')),
+        name: ( localize(2273, 'Warning at Position')),
         sound: Sound.warning,
-        announcementMessage: ( localizeWithPath(_moduleId, 3, 'Warning')),
+        announcementMessage: ( localize(2274, 'Warning')),
         settingsKey: 'accessibility.signals.positionHasWarning',
         delaySettingsKey: 'accessibility.signalOptions.delays.warningAtPosition'
     }); }
     static { this.errorOnLine = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 4, 'Error on Line')),
+        name: ( localize(2275, 'Error on Line')),
         sound: Sound.error,
         legacySoundSettingsKey: 'audioCues.lineHasError',
         legacyAnnouncementSettingsKey: 'accessibility.alert.error',
-        announcementMessage: ( localizeWithPath(_moduleId, 5, 'Error on Line')),
+        announcementMessage: ( localize(2276, 'Error on Line')),
         settingsKey: 'accessibility.signals.lineHasError',
     }); }
     static { this.warningOnLine = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 6, 'Warning on Line')),
+        name: ( localize(2277, 'Warning on Line')),
         sound: Sound.warning,
         legacySoundSettingsKey: 'audioCues.lineHasWarning',
         legacyAnnouncementSettingsKey: 'accessibility.alert.warning',
-        announcementMessage: ( localizeWithPath(_moduleId, 7, 'Warning on Line')),
+        announcementMessage: ( localize(2278, 'Warning on Line')),
         settingsKey: 'accessibility.signals.lineHasWarning',
     }); }
     static { this.foldedArea = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 8, 'Folded Area on Line')),
+        name: ( localize(2279, 'Folded Area on Line')),
         sound: Sound.foldedArea,
         legacySoundSettingsKey: 'audioCues.lineHasFoldedArea',
         legacyAnnouncementSettingsKey: 'accessibility.alert.foldedArea',
-        announcementMessage: ( localizeWithPath(_moduleId, 9, 'Folded')),
+        announcementMessage: ( localize(2280, 'Folded')),
         settingsKey: 'accessibility.signals.lineHasFoldedArea',
     }); }
     static { this.break = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 10, 'Breakpoint on Line')),
+        name: ( localize(2281, 'Breakpoint on Line')),
         sound: Sound.break,
         legacySoundSettingsKey: 'audioCues.lineHasBreakpoint',
         legacyAnnouncementSettingsKey: 'accessibility.alert.breakpoint',
-        announcementMessage: ( localizeWithPath(_moduleId, 11, 'Breakpoint')),
+        announcementMessage: ( localize(2282, 'Breakpoint')),
         settingsKey: 'accessibility.signals.lineHasBreakpoint',
     }); }
     static { this.inlineSuggestion = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 12, 'Inline Suggestion on Line')),
+        name: ( localize(2283, 'Inline Suggestion on Line')),
         sound: Sound.quickFixes,
         legacySoundSettingsKey: 'audioCues.lineHasInlineSuggestion',
         settingsKey: 'accessibility.signals.lineHasInlineSuggestion',
     }); }
     static { this.terminalQuickFix = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 13, 'Terminal Quick Fix')),
+        name: ( localize(2284, 'Terminal Quick Fix')),
         sound: Sound.quickFixes,
         legacySoundSettingsKey: 'audioCues.terminalQuickFix',
         legacyAnnouncementSettingsKey: 'accessibility.alert.terminalQuickFix',
-        announcementMessage: ( localizeWithPath(_moduleId, 14, 'Quick Fix')),
+        announcementMessage: ( localize(2285, 'Quick Fix')),
         settingsKey: 'accessibility.signals.terminalQuickFix',
     }); }
     static { this.onDebugBreak = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 15, 'Debugger Stopped on Breakpoint')),
+        name: ( localize(2286, 'Debugger Stopped on Breakpoint')),
         sound: Sound.break,
         legacySoundSettingsKey: 'audioCues.onDebugBreak',
         legacyAnnouncementSettingsKey: 'accessibility.alert.onDebugBreak',
-        announcementMessage: ( localizeWithPath(_moduleId, 16, 'Breakpoint')),
+        announcementMessage: ( localize(2287, 'Breakpoint')),
         settingsKey: 'accessibility.signals.onDebugBreak',
     }); }
     static { this.noInlayHints = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 17, 'No Inlay Hints on Line')),
+        name: ( localize(2288, 'No Inlay Hints on Line')),
         sound: Sound.error,
         legacySoundSettingsKey: 'audioCues.noInlayHints',
         legacyAnnouncementSettingsKey: 'accessibility.alert.noInlayHints',
-        announcementMessage: ( localizeWithPath(_moduleId, 18, 'No Inlay Hints')),
+        announcementMessage: ( localize(2289, 'No Inlay Hints')),
         settingsKey: 'accessibility.signals.noInlayHints',
     }); }
     static { this.taskCompleted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 19, 'Task Completed')),
+        name: ( localize(2290, 'Task Completed')),
         sound: Sound.taskCompleted,
         legacySoundSettingsKey: 'audioCues.taskCompleted',
         legacyAnnouncementSettingsKey: 'accessibility.alert.taskCompleted',
-        announcementMessage: ( localizeWithPath(_moduleId, 20, 'Task Completed')),
+        announcementMessage: ( localize(2291, 'Task Completed')),
         settingsKey: 'accessibility.signals.taskCompleted',
     }); }
     static { this.taskFailed = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 21, 'Task Failed')),
+        name: ( localize(2292, 'Task Failed')),
         sound: Sound.taskFailed,
         legacySoundSettingsKey: 'audioCues.taskFailed',
         legacyAnnouncementSettingsKey: 'accessibility.alert.taskFailed',
-        announcementMessage: ( localizeWithPath(_moduleId, 22, 'Task Failed')),
+        announcementMessage: ( localize(2293, 'Task Failed')),
         settingsKey: 'accessibility.signals.taskFailed',
     }); }
     static { this.terminalCommandFailed = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 23, 'Terminal Command Failed')),
+        name: ( localize(2294, 'Terminal Command Failed')),
         sound: Sound.error,
         legacySoundSettingsKey: 'audioCues.terminalCommandFailed',
         legacyAnnouncementSettingsKey: 'accessibility.alert.terminalCommandFailed',
-        announcementMessage: ( localizeWithPath(_moduleId, 24, 'Command Failed')),
+        announcementMessage: ( localize(2295, 'Command Failed')),
         settingsKey: 'accessibility.signals.terminalCommandFailed',
     }); }
     static { this.terminalCommandSucceeded = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 25, 'Terminal Command Succeeded')),
+        name: ( localize(2296, 'Terminal Command Succeeded')),
         sound: Sound.success,
-        announcementMessage: ( localizeWithPath(_moduleId, 26, 'Command Succeeded')),
+        announcementMessage: ( localize(2297, 'Command Succeeded')),
         settingsKey: 'accessibility.signals.terminalCommandSucceeded',
     }); }
     static { this.terminalBell = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 27, 'Terminal Bell')),
+        name: ( localize(2298, 'Terminal Bell')),
         sound: Sound.terminalBell,
         legacySoundSettingsKey: 'audioCues.terminalBell',
         legacyAnnouncementSettingsKey: 'accessibility.alert.terminalBell',
-        announcementMessage: ( localizeWithPath(_moduleId, 28, 'Terminal Bell')),
+        announcementMessage: ( localize(2299, 'Terminal Bell')),
         settingsKey: 'accessibility.signals.terminalBell',
     }); }
     static { this.notebookCellCompleted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 29, 'Notebook Cell Completed')),
+        name: ( localize(2300, 'Notebook Cell Completed')),
         sound: Sound.taskCompleted,
         legacySoundSettingsKey: 'audioCues.notebookCellCompleted',
         legacyAnnouncementSettingsKey: 'accessibility.alert.notebookCellCompleted',
-        announcementMessage: ( localizeWithPath(_moduleId, 30, 'Notebook Cell Completed')),
+        announcementMessage: ( localize(2301, 'Notebook Cell Completed')),
         settingsKey: 'accessibility.signals.notebookCellCompleted',
     }); }
     static { this.notebookCellFailed = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 31, 'Notebook Cell Failed')),
+        name: ( localize(2302, 'Notebook Cell Failed')),
         sound: Sound.taskFailed,
         legacySoundSettingsKey: 'audioCues.notebookCellFailed',
         legacyAnnouncementSettingsKey: 'accessibility.alert.notebookCellFailed',
-        announcementMessage: ( localizeWithPath(_moduleId, 32, 'Notebook Cell Failed')),
+        announcementMessage: ( localize(2303, 'Notebook Cell Failed')),
         settingsKey: 'accessibility.signals.notebookCellFailed',
     }); }
     static { this.diffLineInserted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 33, 'Diff Line Inserted')),
+        name: ( localize(2304, 'Diff Line Inserted')),
         sound: Sound.diffLineInserted,
         legacySoundSettingsKey: 'audioCues.diffLineInserted',
         settingsKey: 'accessibility.signals.diffLineInserted',
     }); }
     static { this.diffLineDeleted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 34, 'Diff Line Deleted')),
+        name: ( localize(2305, 'Diff Line Deleted')),
         sound: Sound.diffLineDeleted,
         legacySoundSettingsKey: 'audioCues.diffLineDeleted',
         settingsKey: 'accessibility.signals.diffLineDeleted',
     }); }
     static { this.diffLineModified = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 35, 'Diff Line Modified')),
+        name: ( localize(2306, 'Diff Line Modified')),
         sound: Sound.diffLineModified,
         legacySoundSettingsKey: 'audioCues.diffLineModified',
         settingsKey: 'accessibility.signals.diffLineModified',
     }); }
     static { this.chatRequestSent = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 36, 'Chat Request Sent')),
+        name: ( localize(2307, 'Chat Request Sent')),
         sound: Sound.chatRequestSent,
         legacySoundSettingsKey: 'audioCues.chatRequestSent',
         legacyAnnouncementSettingsKey: 'accessibility.alert.chatRequestSent',
-        announcementMessage: ( localizeWithPath(_moduleId, 37, 'Chat Request Sent')),
+        announcementMessage: ( localize(2308, 'Chat Request Sent')),
         settingsKey: 'accessibility.signals.chatRequestSent',
     }); }
     static { this.chatResponseReceived = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 38, 'Chat Response Received')),
+        name: ( localize(2309, 'Chat Response Received')),
         legacySoundSettingsKey: 'audioCues.chatResponseReceived',
         sound: {
             randomOneOf: [
@@ -438,45 +435,45 @@ class AccessibilitySignal {
         settingsKey: 'accessibility.signals.chatResponseReceived'
     }); }
     static { this.progress = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 39, 'Progress')),
+        name: ( localize(2310, 'Progress')),
         sound: Sound.progress,
         legacySoundSettingsKey: 'audioCues.chatResponsePending',
         legacyAnnouncementSettingsKey: 'accessibility.alert.progress',
-        announcementMessage: ( localizeWithPath(_moduleId, 40, 'Progress')),
+        announcementMessage: ( localize(2311, 'Progress')),
         settingsKey: 'accessibility.signals.progress'
     }); }
     static { this.clear = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 41, 'Clear')),
+        name: ( localize(2312, 'Clear')),
         sound: Sound.clear,
         legacySoundSettingsKey: 'audioCues.clear',
         legacyAnnouncementSettingsKey: 'accessibility.alert.clear',
-        announcementMessage: ( localizeWithPath(_moduleId, 42, 'Clear')),
+        announcementMessage: ( localize(2313, 'Clear')),
         settingsKey: 'accessibility.signals.clear'
     }); }
     static { this.save = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 43, 'Save')),
+        name: ( localize(2314, 'Save')),
         sound: Sound.save,
         legacySoundSettingsKey: 'audioCues.save',
         legacyAnnouncementSettingsKey: 'accessibility.alert.save',
-        announcementMessage: ( localizeWithPath(_moduleId, 44, 'Save')),
+        announcementMessage: ( localize(2315, 'Save')),
         settingsKey: 'accessibility.signals.save'
     }); }
     static { this.format = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 45, 'Format')),
+        name: ( localize(2316, 'Format')),
         sound: Sound.format,
         legacySoundSettingsKey: 'audioCues.format',
         legacyAnnouncementSettingsKey: 'accessibility.alert.format',
-        announcementMessage: ( localizeWithPath(_moduleId, 46, 'Format')),
+        announcementMessage: ( localize(2317, 'Format')),
         settingsKey: 'accessibility.signals.format'
     }); }
     static { this.voiceRecordingStarted = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 47, 'Voice Recording Started')),
+        name: ( localize(2318, 'Voice Recording Started')),
         sound: Sound.voiceRecordingStarted,
         legacySoundSettingsKey: 'audioCues.voiceRecordingStarted',
         settingsKey: 'accessibility.signals.voiceRecordingStarted'
     }); }
     static { this.voiceRecordingStopped = AccessibilitySignal.register({
-        name: ( localizeWithPath(_moduleId, 48, 'Voice Recording Stopped')),
+        name: ( localize(2319, 'Voice Recording Stopped')),
         sound: Sound.voiceRecordingStopped,
         legacySoundSettingsKey: 'audioCues.voiceRecordingStopped',
         settingsKey: 'accessibility.signals.voiceRecordingStopped'

package/vscode/src/vs/platform/action/common/actionCommonCategories.js

@@ -1,11 +1,10 @@
-import { localize2WithPath } from '../../../nls.js';
-const _moduleId = "vs/platform/action/common/actionCommonCategories";
+import { localize2 } from '../../../nls.js';
 const Categories = ( (Object.freeze({
-    View: ( localize2WithPath(_moduleId, 0, 'View')),
-    Help: ( localize2WithPath(_moduleId, 1, 'Help')),
-    Test: ( localize2WithPath(_moduleId, 2, 'Test')),
-    File: ( localize2WithPath(_moduleId, 3, 'File')),
-    Preferences: ( localize2WithPath(_moduleId, 4, 'Preferences')),
-    Developer: ( localize2WithPath(_moduleId, 5, "Developer")),
+    View: ( localize2(4492, 'View')),
+    Help: ( localize2(4493, 'Help')),
+    Test: ( localize2(4494, 'Test')),
+    File: ( localize2(4495, 'File')),
+    Preferences: ( localize2(4496, 'Preferences')),
+    Developer: ( localize2(4497, "Developer")),
 })));
 export { Categories };

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

@@ -8,7 +8,7 @@ import { Disposable } from '../../../base/common/lifecycle.js';
 import { OS } from '../../../base/common/platform.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import './actionWidget.css.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { IContextViewService } from '../../contextview/browser/contextView.service.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
 import { defaultListStyles } from '../../theme/browser/defaultStyles.js';
@@ -23,7 +23,6 @@ import '../../theme/common/colors/minimapColors.js';
 import '../../theme/common/colors/miscColors.js';
 import '../../theme/common/colors/quickpickColors.js';
 import '../../theme/common/colors/searchColors.js';
-const _moduleId = "vs/platform/actionWidget/browser/actionList";
 const acceptSelectedActionCommand = 'acceptSelectedCodeAction';
 const previewSelectedActionCommand = 'previewSelectedCodeAction';
 var ActionListItemKind;
@@ -87,10 +86,10 @@ let ActionItemRenderer = class ActionItemRenderer {
         }
         else if (actionTitle && previewTitle) {
             if (this._supportsPreview && element.canPreview) {
-                data.container.title = ( localizeWithPath(_moduleId, 0, "{0} to Apply, {1} to Preview", actionTitle, previewTitle));
+                data.container.title = ( localize(11229, "{0} to Apply, {1} to Preview", actionTitle, previewTitle));
             }
             else {
-                data.container.title = ( localizeWithPath(_moduleId, 1, "{0} to Apply", actionTitle));
+                data.container.title = ( localize(11230, "{0} to Apply", actionTitle));
             }
         }
         else {
@@ -143,13 +142,13 @@ let ActionList = class ActionList extends Disposable {
                     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));
+                            label = ( localize(11231, "{0}, Disabled Reason: {1}", label, element.disabled));
                         }
                         return label;
                     }
                     return null;
                 },
-                getWidgetAriaLabel: () => ( localizeWithPath(_moduleId, 3, "Action Widget")),
+                getWidgetAriaLabel: () => ( localize(11232, "Action Widget")),
                 getRole: (e) => e.kind === ActionListItemKind.Action ? 'option' : 'separator',
                 getWidgetRole: () => 'listbox',
             },

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

@@ -4,7 +4,7 @@ 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';
+import { localize, localize2 } from '../../../nls.js';
 import { acceptSelectedActionCommand, previewSelectedActionCommand, ActionList } from './actionList.js';
 import { registerAction2, Action2 } from '../../actions/common/actions.js';
 import { RawContextKey } from '../../contextkey/common/contextkey.js';
@@ -24,10 +24,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';
-const _moduleId = "vs/platform/actionWidget/browser/actionWidget";
-registerColor('actionBar.toggledBackground', inputActiveOptionBackground, ( localizeWithPath(_moduleId, 0, 'Background color for toggled action items in action bar.')));
+registerColor('actionBar.toggledBackground', inputActiveOptionBackground, ( localize(9867, 'Background color for toggled action items in action bar.')));
 const ActionWidgetContextKeys = {
-    Visible: ( (new RawContextKey('codeActionMenuVisible', false, ( localizeWithPath(_moduleId, 1, "Whether the action widget list is visible")))))
+    Visible: ( (new RawContextKey('codeActionMenuVisible', false, ( localize(9868, "Whether the action widget list is visible")))))
 };
 const IActionWidgetService = ( (createDecorator('actionWidgetService')));
 let ActionWidgetService = class ActionWidgetService extends Disposable {
@@ -132,7 +131,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'hideCodeActionWidget',
-            title: ( localize2WithPath(_moduleId, 2, "Hide action widget")),
+            title: ( localize2(9869, "Hide action widget")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -149,7 +148,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'selectPrevCodeAction',
-            title: ( localize2WithPath(_moduleId, 3, "Select previous action")),
+            title: ( localize2(9870, "Select previous action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -170,7 +169,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'selectNextCodeAction',
-            title: ( localize2WithPath(_moduleId, 4, "Select next action")),
+            title: ( localize2(9871, "Select next action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -191,7 +190,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: acceptSelectedActionCommand,
-            title: ( localize2WithPath(_moduleId, 5, "Accept selected action")),
+            title: ( localize2(9872, "Accept selected action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -211,7 +210,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: previewSelectedActionCommand,
-            title: ( localize2WithPath(_moduleId, 6, "Preview selected action")),
+            title: ( localize2(9873, "Preview selected action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,

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

@@ -6,7 +6,7 @@ import { Codicon } from '../../../base/common/codicons.js';
 import { Emitter } from '../../../base/common/event.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
 import { MenuItemAction } from '../common/actions.js';
 import { IMenuService } from '../common/actions.service.js';
@@ -15,7 +15,6 @@ import { IContextMenuService } from '../../contextview/browser/contextView.servi
 import { IHoverService } from '../../hover/browser/hover.service.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.service.js';
-const _moduleId = "vs/platform/actions/browser/buttonbar";
 let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
     constructor(container, _options, _contextMenuService, _keybindingService, telemetryService, _hoverService) {
         super(container);
@@ -87,7 +86,7 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
             const kb = this._keybindingService.lookupKeybinding(action.id);
             let tooltip;
             if (kb) {
-                tooltip = ( localizeWithPath(_moduleId, 0, "{0} ({1})", action.label, kb.getLabel()));
+                tooltip = ( localize(11519, "{0} ({1})", action.label, kb.getLabel()));
             }
             else {
                 tooltip = action.label;
@@ -100,12 +99,12 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
         if (secondary.length > 0) {
             const btn = this.addButton({
                 secondary: true,
-                ariaLabel: ( localizeWithPath(_moduleId, 1, "More Actions"))
+                ariaLabel: ( localize(11520, "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, ( localizeWithPath(_moduleId, 1, "More Actions"))));
+            this._updateStore.add(this._hoverService.setupManagedHover(hoverDelegate, btn.element, ( localize(11520, "More Actions"))));
             this._updateStore.add(btn.onDidClick(async () => {
                 this._contextMenuService.showContextMenu({
                     getAnchor: () => btn.element,

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

@@ -9,7 +9,7 @@ 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';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { MenuItemAction, SubmenuItemAction } from '../common/actions.js';
 import { IMenuService } from '../common/actions.service.js';
 import { isICommandActionToggleInfo } from '../../action/common/action.js';
@@ -37,15 +37,46 @@ import '../../theme/common/colors/quickpickColors.js';
 import '../../theme/common/colors/searchColors.js';
 import { defaultSelectBoxStyles } from '../../theme/browser/defaultStyles.js';
 import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
-const _moduleId = "vs/platform/actions/browser/menuEntryActionViewItem";
-function createAndFillInContextMenuActions(menu, options, target, primaryGroup) {
-    const groups = menu.getActions(options);
+function createAndFillInContextMenuActions(menu, optionsOrTarget, targetOrPrimaryGroup, primaryGroupOrUndefined) {
+    let target;
+    let primaryGroup;
+    let groups;
+    if (Array.isArray(menu)) {
+        groups = menu;
+        target = optionsOrTarget;
+        primaryGroup = targetOrPrimaryGroup;
+    }
+    else {
+        const options = optionsOrTarget;
+        groups = menu.getActions(options);
+        target = targetOrPrimaryGroup;
+        primaryGroup = primaryGroupOrUndefined;
+    }
     const modifierKeyEmitter = ModifierKeyEmitter.getInstance();
     const useAlternativeActions = modifierKeyEmitter.keyStatus.altKey || ((isWindows || isLinux) && modifierKeyEmitter.keyStatus.shiftKey);
     fillInActions(groups, target, useAlternativeActions, primaryGroup ? actionGroup => actionGroup === primaryGroup : actionGroup => actionGroup === 'navigation');
 }
-function createAndFillInActionBarActions(menu, options, target, primaryGroup, shouldInlineSubmenu, useSeparatorsInPrimaryActions) {
-    const groups = menu.getActions(options);
+function createAndFillInActionBarActions(menu, optionsOrTarget, targetOrPrimaryGroup, primaryGroupOrShouldInlineSubmenu, shouldInlineSubmenuOrUseSeparatorsInPrimaryActions, useSeparatorsInPrimaryActionsOrUndefined) {
+    let target;
+    let primaryGroup;
+    let shouldInlineSubmenu;
+    let useSeparatorsInPrimaryActions;
+    let groups;
+    if (Array.isArray(menu)) {
+        groups = menu;
+        target = optionsOrTarget;
+        primaryGroup = targetOrPrimaryGroup;
+        shouldInlineSubmenu = primaryGroupOrShouldInlineSubmenu;
+        useSeparatorsInPrimaryActions = shouldInlineSubmenuOrUseSeparatorsInPrimaryActions;
+    }
+    else {
+        const options = optionsOrTarget;
+        groups = menu.getActions(options);
+        target = targetOrPrimaryGroup;
+        primaryGroup = primaryGroupOrShouldInlineSubmenu;
+        shouldInlineSubmenu = shouldInlineSubmenuOrUseSeparatorsInPrimaryActions;
+        useSeparatorsInPrimaryActions = useSeparatorsInPrimaryActionsOrUndefined;
+    }
     const isPrimaryAction = typeof primaryGroup === 'string' ? (actionGroup) => actionGroup === primaryGroup : primaryGroup;
     fillInActions(groups, target, false, isPrimaryAction, shouldInlineSubmenu, useSeparatorsInPrimaryActions);
 }
@@ -164,18 +195,17 @@ let MenuEntryActionViewItem = class MenuEntryActionViewItem extends ActionViewIt
         const keybindingLabel = keybinding && keybinding.getLabel();
         const tooltip = this._commandAction.tooltip || this._commandAction.label;
         let title = keybindingLabel
-            ? ( localizeWithPath(_moduleId, 0, "{0} ({1})", tooltip, keybindingLabel))
+            ? ( localize(4573, "{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
-                ? ( localizeWithPath(_moduleId, 0, "{0} ({1})", altTooltip, altKeybindingLabel))
+                ? ( localize(4573, "{0} ({1})", altTooltip, altKeybindingLabel))
                 : altTooltip;
-            title = ( localizeWithPath(
-                _moduleId,
-                1,
+            title = ( localize(
+                4574,
                 "{0}\n[{1}] {2}",
                 title,
                 UILabelProvider.modifierLabels[OS].altKey,
@@ -251,10 +281,10 @@ class TextOnlyMenuEntryActionViewItem extends MenuEntryActionViewItem {
         if (this.label) {
             const kb2 = TextOnlyMenuEntryActionViewItem._symbolPrintEnter(kb);
             if (this._options?.conversational) {
-                this.label.textContent = ( localizeWithPath(_moduleId, 2, '{1} to {0}', this._action.label, kb2));
+                this.label.textContent = ( localize(4575, '{1} to {0}', this._action.label, kb2));
             }
             else {
-                this.label.textContent = ( localizeWithPath(_moduleId, 3, '{0} ({1})', this._action.label, kb2));
+                this.label.textContent = ( localize(4576, '{0} ({1})', this._action.label, kb2));
             }
         }
     }

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

@@ -9,7 +9,7 @@ import { BugIndicatingError } from '../../../base/common/errors.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
 import { MenuItemAction, SubmenuItemAction } from '../common/actions.js';
 import { IMenuService } from '../common/actions.service.js';
@@ -19,7 +19,6 @@ 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';
-const _moduleId = "vs/platform/actions/browser/toolbar";
 var HiddenItemStrategy;
 ( ((function(HiddenItemStrategy) {
     HiddenItemStrategy[HiddenItemStrategy["NoHide"] = -1] = "NoHide";
@@ -112,8 +111,8 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     primaryActions.push(action.menuKeybinding);
                 }
                 else if (!(action instanceof SubmenuItemAction || action instanceof ToggleMenuAction)) {
-                    const isDisabled = action.id.startsWith('statusbaraction');
-                    primaryActions.push(createConfigureKeybindingAction(this._commandService, this._keybindingService, action.id, undefined, !isDisabled));
+                    const supportsKeybindings = !!this._keybindingService.lookupKeybinding(action.id);
+                    primaryActions.push(createConfigureKeybindingAction(this._commandService, this._keybindingService, action.id, undefined, supportsKeybindings));
                 }
                 if (toggleActions.length > 0) {
                     let noHide = false;
@@ -141,7 +140,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     else {
                         primaryActions.push(toAction({
                             id: 'label',
-                            label: ( localizeWithPath(_moduleId, 0, "Hide")),
+                            label: ( localize(5551, "Hide")),
                             enabled: false,
                             run() { }
                         }));
@@ -155,7 +154,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     actions.push(( (new Separator())));
                     actions.push(toAction({
                         id: 'resetThisMenu',
-                        label: ( localizeWithPath(_moduleId, 1, "Reset Menu")),
+                        label: ( localize(5552, "Reset Menu")),
                         run: () => this._menuService.resetHiddenStates(menuIds)
                     }));
                 }