@codingame/monaco-vscode-api 7.1.0 → 7.1.1

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js

@@ -7,7 +7,7 @@ import { Event } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { uppercaseFirstLetter } from '../../../../../base/common/strings.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
 import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
@@ -27,7 +27,6 @@ import { URI } from '../../../../../base/common/uri.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
 import { EnablementState } from '../../../../services/extensionManagement/common/extensionManagement.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy";
 function isKernelPick(item) {
     return 'kernel' in item;
 }
@@ -60,10 +59,10 @@ function toKernelQuickPick(kernel, selected) {
     };
     if (kernel.id === selected?.id) {
         if (!res.description) {
-            res.description = ( localizeWithPath(_moduleId, 0, "Currently Selected"));
+            res.description = ( localize(7818, "Currently Selected"));
         }
         else {
-            res.description = ( localizeWithPath(_moduleId, 1, "{0} - Currently Selected", res.description));
+            res.description = ( localize(7819, "{0} - Currently Selected", res.description));
         }
     }
     return res;
@@ -110,15 +109,13 @@ class KernelPickerStrategyBase {
         quickPick.items = quickPickItems;
         quickPick.canSelectMany = false;
         quickPick.placeholder = selected
-            ? ( localizeWithPath(
-            _moduleId,
-            2,
+            ? ( localize(
+            7820,
             "Change kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ))
-            : ( localizeWithPath(
-            _moduleId,
-            3,
+            : ( localize(
+            7821,
             "Select kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ));
@@ -269,13 +266,13 @@ class KernelPickerStrategyBase {
             quickPickItems.push({
                 id: 'installSuggested',
                 description: suggestedExtension.displayName ?? suggestedExtension.extensionIds.join(', '),
-                label: `$(${Codicon.lightbulb.id}) ` + ( localizeWithPath(_moduleId, 4, 'Install/Enable suggested extensions')),
+                label: `$(${Codicon.lightbulb.id}) ` + ( localize(7822, 'Install/Enable suggested extensions')),
                 extensionIds: suggestedExtension.extensionIds
             });
         }
         quickPickItems.push({
             id: 'install',
-            label: ( localizeWithPath(_moduleId, 5, "Browse marketplace for kernel extensions")),
+            label: ( localize(7823, "Browse marketplace for kernel extensions")),
         });
         return quickPickItems;
     }
@@ -322,7 +319,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         }
         quickPickItems.push({
             id: 'selectAnother',
-            label: ( localizeWithPath(_moduleId, 6, "Select Another Kernel...")),
+            label: ( localize(7824, "Select Another Kernel...")),
             autoRun: shouldAutoRun
         });
         return quickPickItems;
@@ -356,8 +353,8 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         const disposables = ( (new DisposableStore()));
         const quickPick = this._quickInputService.createQuickPick();
         const quickPickItem = await ( (new Promise(resolve => {
-            quickPick.title = kernelListEmpty ? ( localizeWithPath(_moduleId, 7, "Select Kernel")) : ( localizeWithPath(_moduleId, 8, "Select Another Kernel"));
-            quickPick.placeholder = ( localizeWithPath(_moduleId, 9, "Type to choose a kernel source"));
+            quickPick.title = kernelListEmpty ? ( localize(7825, "Select Kernel")) : ( localize(7826, "Select Another Kernel"));
+            quickPick.placeholder = ( localize(7827, "Type to choose a kernel source"));
             quickPick.busy = true;
             quickPick.buttons = [this._quickInputService.backButton];
             quickPick.show();
@@ -476,7 +473,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         quickPickItems.push(...( (validActions.map(action => {
             const buttons = action.documentation ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.info),
-                    tooltip: ( localizeWithPath(_moduleId, 10, 'Learn More')),
+                    tooltip: ( localize(7828, 'Learn More')),
                 }] : [];
             return {
                 id: typeof action.command === 'string' ? action.command : action.command.id,
@@ -503,7 +500,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         const quickPick = this._quickInputService.createQuickPick();
         quickPick.items = quickPickItems;
         quickPick.canSelectMany = false;
-        quickPick.title = ( localizeWithPath(_moduleId, 11, "Select Kernel from {0}", source));
+        quickPick.title = ( localize(7829, "Select Kernel from {0}", source));
         quickPick.onDidAccept(async () => {
             if (quickPick.selectedItems && quickPick.selectedItems.length > 0 && isKernelPick(quickPick.selectedItems[0])) {
                 await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
@@ -542,16 +539,11 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                 action.label = info.selected.label;
                 const kernelInfo = info.selected.description ?? info.selected.detail;
                 action.tooltip = kernelInfo
-                    ? ( localizeWithPath(
-                    _moduleId,
-                    12,
-                    "Selected Kernel: {0} (Kernel Detection Tasks Running)",
-                    kernelInfo
-                ))
-                    : ( localizeWithPath(_moduleId, 13, "Detecting Kernels"));
+                    ? ( localize(7830, "Selected Kernel: {0} (Kernel Detection Tasks Running)", kernelInfo))
+                    : ( localize(7831, "Detecting Kernels"));
             }
             else {
-                action.label = ( localizeWithPath(_moduleId, 13, "Detecting Kernels"));
+                action.label = ( localize(7831, "Detecting Kernels"));
             }
             return;
         }
@@ -572,7 +564,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
             action.tooltip = selected.description ?? selected.detail ?? '';
         }
         else {
-            action.label = ( localizeWithPath(_moduleId, 7, "Select Kernel"));
+            action.label = ( localize(7831, "Select Kernel"));
             action.class = ThemeIcon.asClassName(selectKernelIcon);
             action.tooltip = '';
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { ActionViewItem } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { Action } from '../../../../../base/common/actions.js';
-import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
+import { localize2, localize } from '../../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
@@ -14,7 +14,6 @@ import { KernelPickerMRUStrategy } from './notebookKernelQuickPickStrategy.js';
 import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT } from '../../common/notebookContextKeys.js';
 import { INotebookKernelService, INotebookKernelHistoryService } from '../../common/notebookKernelService.service.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView";
 function getEditorFromContext(editorService, context) {
     let editor;
     if (context !== undefined && 'notebookEditorId' in context) {
@@ -38,7 +37,7 @@ registerAction2(class extends Action2 {
         super({
             id: SELECT_KERNEL_ID,
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            title: ( localize2WithPath(_moduleId, 0, 'Select Notebook Kernel')),
+            title: ( localize2(10677, 'Select Notebook Kernel')),
             icon: selectKernelIcon,
             f1: true,
             precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -62,7 +61,7 @@ registerAction2(class extends Action2 {
                     order: -10
                 }],
             metadata: {
-                description: ( localizeWithPath(_moduleId, 1, "Notebook Kernel Args")),
+                description: ( localize(10678, "Notebook Kernel Args")),
                 args: [
                     {
                         name: 'kernelInfo',

package/vscode/src/vs/workbench/contrib/notebook/common/notebookContextKeys.js

@@ -26,6 +26,8 @@ const NOTEBOOK_CELL_LINE_NUMBERS = ( new RawContextKey('notebookCellLineNumbers'
 const NOTEBOOK_CELL_EXECUTION_STATE = ( new RawContextKey('notebookCellExecutionState', undefined));
 const NOTEBOOK_CELL_EXECUTING = ( new RawContextKey('notebookCellExecuting', false));
 const NOTEBOOK_CELL_HAS_OUTPUTS = ( new RawContextKey('notebookCellHasOutputs', false));
+const NOTEBOOK_CELL_IS_FIRST_OUTPUT = ( new RawContextKey('notebookCellIsFirstOutput', false));
+const NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS = ( new RawContextKey('hasHiddenOutputs', false));
 const NOTEBOOK_CELL_INPUT_COLLAPSED = ( new RawContextKey('notebookCellInputIsCollapsed', false));
 const NOTEBOOK_CELL_OUTPUT_COLLAPSED = ( new RawContextKey('notebookCellOutputIsCollapsed', false));
 const NOTEBOOK_CELL_RESOURCE = ( new RawContextKey('notebookCellResource', ''));
@@ -38,4 +40,4 @@ const NOTEBOOK_KERNEL_SELECTED = ( new RawContextKey('notebookKernelSelected', f
 const NOTEBOOK_INTERRUPTIBLE_KERNEL = ( new RawContextKey('notebookInterruptibleKernel', false));
 const NOTEBOOK_MISSING_KERNEL_EXTENSION = ( new RawContextKey('notebookMissingKernelExtension', false));
 const NOTEBOOK_HAS_OUTPUTS = ( new RawContextKey('notebookHasOutputs', false));
-export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };
+export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js

@@ -15,12 +15,11 @@ import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.service.js';
 var NotebookEditorInput_1;
-const _moduleId = "vs/workbench/contrib/notebook/common/notebookEditorInput";
 let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEditorInput {
     static { NotebookEditorInput_1 = this; }
     static getOrCreate(instantiationService, resource, preferredResource, viewType, options = {}) {
@@ -59,7 +58,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
                     }
                 }
                 return true;
-            })(), ( localizeWithPath(_moduleId, 0, "Notebook '{0}' could not be saved.", this.resource.path)));
+            })(), ( localize(7629, "Notebook '{0}' could not be saved.", this.resource.path)));
         }));
     }
     dispose() {

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/keybindings.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { OS } from '../../../../base/common/platform.js';
 import { DisposableStore, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { Emitter } from '../../../../base/common/event.js';
@@ -31,7 +31,6 @@ import { Promises, timeout } from '../../../../base/common/async.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { defaultInputBoxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 var DefineKeybindingWidget_1, DefineKeybindingOverlayWidget_1;
-const _moduleId = "vs/workbench/contrib/preferences/browser/keybindingWidgets";
 let KeybindingsSearchWidget = class KeybindingsSearchWidget extends SearchWidget {
     constructor(parent, options, contextViewService, instantiationService, contextKeyService, keybindingService) {
         super(parent, options, contextViewService, instantiationService, contextKeyService, keybindingService);
@@ -130,7 +129,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
         this._domNode.setClassName('defineKeybindingWidget');
         this._domNode.setWidth(DefineKeybindingWidget_1.WIDTH);
         this._domNode.setHeight(DefineKeybindingWidget_1.HEIGHT);
-        const message = ( localizeWithPath(_moduleId, 0, "Press desired key combination and then press ENTER."));
+        const message = ( localize(8667, "Press desired key combination and then press ENTER."));
         append(this._domNode.domNode, $('.message', undefined, message));
         this._domNode.domNode.style.backgroundColor = asCssVariable(editorWidgetBackground);
         this._domNode.domNode.style.color = asCssVariable(editorWidgetForeground);
@@ -178,12 +177,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
     printExisting(numberOfExisting) {
         if (numberOfExisting > 0) {
             const existingElement = $('span.existingText');
-            const text = numberOfExisting === 1 ? ( localizeWithPath(_moduleId, 1, "1 existing command has this keybinding", numberOfExisting)) : ( localizeWithPath(
-                _moduleId,
-                2,
-                "{0} existing commands have this keybinding",
-                numberOfExisting
-            ));
+            const text = numberOfExisting === 1 ? ( localize(8668, "1 existing command has this keybinding", numberOfExisting)) : ( localize(8669, "{0} existing commands have this keybinding", numberOfExisting));
             append(existingElement, document.createTextNode(text));
             alert(text);
             this._showExistingKeybindingsNode.appendChild(existingElement);
@@ -201,7 +195,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
         firstLabel.set(this._chords?.[0] ?? undefined);
         if (this._chords) {
             for (let i = 1; i < this._chords.length; i++) {
-                this._outputNode.appendChild(document.createTextNode(( localizeWithPath(_moduleId, 3, "chord to"))));
+                this._outputNode.appendChild(document.createTextNode(( localize(8670, "chord to"))));
                 const chordLabel = this._keybindingDisposables.add(( (new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles))));
                 chordLabel.set(this._chords[i]);
             }

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js

@@ -1,29 +1,19 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const _moduleId = "vs/workbench/contrib/preferences/browser/preferencesIcons";
-const settingsScopeDropDownIcon = registerIcon('settings-folder-dropdown', Codicon.triangleDown, ( localizeWithPath(
- _moduleId,
- 0,
+const settingsScopeDropDownIcon = registerIcon('settings-folder-dropdown', Codicon.triangleDown, ( localize(
+ 6271,
  'Icon for the folder dropdown button in the split JSON Settings editor.'
 )));
-const settingsMoreActionIcon = registerIcon('settings-more-action', Codicon.gear, ( localizeWithPath(_moduleId, 1, 'Icon for the \'more actions\' action in the Settings UI.')));
-const keybindingsRecordKeysIcon = registerIcon('keybindings-record-keys', Codicon.recordKeys, ( localizeWithPath(_moduleId, 2, 'Icon for the \'record keys\' action in the keybinding UI.')));
-const keybindingsSortIcon = registerIcon('keybindings-sort', Codicon.sortPrecedence, ( localizeWithPath(
- _moduleId,
- 3,
- 'Icon for the \'sort by precedence\' toggle in the keybinding UI.'
-)));
-const keybindingsEditIcon = registerIcon('keybindings-edit', Codicon.edit, ( localizeWithPath(_moduleId, 4, 'Icon for the edit action in the keybinding UI.')));
-const keybindingsAddIcon = registerIcon('keybindings-add', Codicon.add, ( localizeWithPath(_moduleId, 5, 'Icon for the add action in the keybinding UI.')));
-const settingsEditIcon = registerIcon('settings-edit', Codicon.edit, ( localizeWithPath(_moduleId, 6, 'Icon for the edit action in the Settings UI.')));
-const settingsRemoveIcon = registerIcon('settings-remove', Codicon.close, ( localizeWithPath(_moduleId, 7, 'Icon for the remove action in the Settings UI.')));
-const settingsDiscardIcon = registerIcon('settings-discard', Codicon.discard, ( localizeWithPath(_moduleId, 8, 'Icon for the discard action in the Settings UI.')));
-const preferencesClearInputIcon = registerIcon('preferences-clear-input', Codicon.clearAll, ( localizeWithPath(_moduleId, 9, 'Icon for clear input in the Settings and keybinding UI.')));
-const preferencesFilterIcon = registerIcon('preferences-filter', Codicon.filter, ( localizeWithPath(
- _moduleId,
- 10,
- 'Icon for the button that suggests filters for the Settings UI.'
-)));
-const preferencesOpenSettingsIcon = registerIcon('preferences-open-settings', Codicon.goToFile, ( localizeWithPath(_moduleId, 11, 'Icon for open settings commands.')));
+const settingsMoreActionIcon = registerIcon('settings-more-action', Codicon.gear, ( localize(6272, 'Icon for the \'more actions\' action in the Settings UI.')));
+const keybindingsRecordKeysIcon = registerIcon('keybindings-record-keys', Codicon.recordKeys, ( localize(6273, 'Icon for the \'record keys\' action in the keybinding UI.')));
+const keybindingsSortIcon = registerIcon('keybindings-sort', Codicon.sortPrecedence, ( localize(6274, 'Icon for the \'sort by precedence\' toggle in the keybinding UI.')));
+const keybindingsEditIcon = registerIcon('keybindings-edit', Codicon.edit, ( localize(6275, 'Icon for the edit action in the keybinding UI.')));
+const keybindingsAddIcon = registerIcon('keybindings-add', Codicon.add, ( localize(6276, 'Icon for the add action in the keybinding UI.')));
+const settingsEditIcon = registerIcon('settings-edit', Codicon.edit, ( localize(6277, 'Icon for the edit action in the Settings UI.')));
+const settingsRemoveIcon = registerIcon('settings-remove', Codicon.close, ( localize(6278, 'Icon for the remove action in the Settings UI.')));
+const settingsDiscardIcon = registerIcon('settings-discard', Codicon.discard, ( localize(6279, 'Icon for the discard action in the Settings UI.')));
+const preferencesClearInputIcon = registerIcon('preferences-clear-input', Codicon.clearAll, ( localize(6280, 'Icon for clear input in the Settings and keybinding UI.')));
+const preferencesFilterIcon = registerIcon('preferences-filter', Codicon.filter, ( localize(6281, 'Icon for the button that suggests filters for the Settings UI.')));
+const preferencesOpenSettingsIcon = registerIcon('preferences-open-settings', Codicon.goToFile, ( localize(6282, 'Icon for open settings commands.')));
 export { keybindingsAddIcon, keybindingsEditIcon, keybindingsRecordKeysIcon, keybindingsSortIcon, preferencesClearInputIcon, preferencesFilterIcon, preferencesOpenSettingsIcon, settingsDiscardIcon, settingsEditIcon, settingsMoreActionIcon, settingsRemoveIcon, settingsScopeDropDownIcon };

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -14,7 +14,7 @@ import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
 import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
@@ -42,7 +42,6 @@ import { IWorkbenchEnvironmentService } from '../../../services/environment/comm
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
-const _moduleId = "vs/workbench/contrib/preferences/browser/preferencesWidgets";
 let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends BaseActionViewItem {
     constructor(action, contextService, contextMenuService, hoverService) {
         super(null, action);
@@ -205,17 +204,18 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     resetLabels() {
         const remoteAuthority = this.environmentService.remoteAuthority;
         const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
-        this.userLocalSettings.label = ( localizeWithPath(_moduleId, 0, "User"));
-        this.userRemoteSettings.label = ( localizeWithPath(_moduleId, 1, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
-        this.workspaceSettings.label = ( localizeWithPath(_moduleId, 2, "Workspace"));
-        this.folderSettingsAction.label = ( localizeWithPath(_moduleId, 3, "Folder"));
+        this.userLocalSettings.label = ( localize(10331, "User"));
+        this.userRemoteSettings.label = ( localize(10332, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
+        this.workspaceSettings.label = ( localize(10333, "Workspace"));
+        this.folderSettingsAction.label = ( localize(10334, "Folder"));
     }
     create(parent) {
         const settingsTabsWidget = append(parent, $('.settings-tabs-widget'));
         this.settingsSwitcherBar = this._register(( (new ActionBar(settingsTabsWidget, {
             orientation: ActionsOrientation.HORIZONTAL,
             focusOnlyEnabledItems: true,
-            ariaLabel: ( localizeWithPath(_moduleId, 4, "Settings Switcher")),
+            ariaLabel: ( localize(10335, "Settings Switcher")),
+            ariaRole: 'tablist',
             actionViewItemProvider: (action, options) => action.id === 'folderSettings' ? this.folderSettings : undefined
         }))));
         this.userLocalSettings = ( (new Action(
@@ -225,7 +225,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
             true,
             () => this.updateTarget(ConfigurationTarget.USER_LOCAL)
         )));
-        this.userLocalSettings.tooltip = ( localizeWithPath(_moduleId, 0, "User"));
+        this.userLocalSettings.tooltip = ( localize(10335, "User"));
         this.userRemoteSettings = ( (new Action(
             'userSettingsRemote',
             '',
@@ -235,7 +235,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         )));
         const remoteAuthority = this.environmentService.remoteAuthority;
         const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
-        this.userRemoteSettings.tooltip = ( localizeWithPath(_moduleId, 1, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
+        this.userRemoteSettings.tooltip = ( localize(10335, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
         this.workspaceSettings = ( (new Action(
             'workspaceSettings',
             '',
@@ -269,14 +269,14 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     }
     setResultCount(settingsTarget, count) {
         if (settingsTarget === ConfigurationTarget.WORKSPACE) {
-            let label = ( localizeWithPath(_moduleId, 2, "Workspace"));
+            let label = ( localize(10335, "Workspace"));
             if (count) {
                 label += ` (${count})`;
             }
             this.workspaceSettings.label = label;
         }
         else if (settingsTarget === ConfigurationTarget.USER_LOCAL) {
-            let label = ( localizeWithPath(_moduleId, 0, "User"));
+            let label = ( localize(10335, "User"));
             if (count) {
                 label += ` (${count})`;
             }
@@ -322,7 +322,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         this.userRemoteSettings.enabled = !!(this.options.enableRemoteSettings && this.environmentService.remoteAuthority);
         this.workspaceSettings.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
         this.folderSettings.action.enabled = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.contextService.getWorkspace().folders.length > 0;
-        this.workspaceSettings.tooltip = ( localizeWithPath(_moduleId, 2, "Workspace"));
+        this.workspaceSettings.tooltip = ( localize(10335, "Workspace"));
     }
 };
 SettingsTargetsWidget = ( (__decorate([