@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js

@@ -9,9 +9,8 @@ import { Disposable } from '../../../common/lifecycle.js';
 import { isMacintosh } from '../../../common/platform.js';
 import { assertType, isUndefinedOrNull } from '../../../common/types.js';
 import './actionbar.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
-const _moduleId = "vs/base/browser/ui/actionbar/actionViewItems";
 class BaseActionViewItem extends Disposable {
     get action() {
         return this._action;
@@ -219,6 +218,9 @@ class ActionViewItem extends BaseActionViewItem {
             if (this.options.isMenu) {
                 return 'menuitem';
             }
+            else if (this.options.isTabList) {
+                return 'tab';
+            }
             else {
                 return 'button';
             }
@@ -256,7 +258,7 @@ class ActionViewItem extends BaseActionViewItem {
         else if (!this.options.label && this.action.label && this.options.icon) {
             title = this.action.label;
             if (this.options.keybinding) {
-                title = ( localizeWithPath(_moduleId, 0, "{0} ({1})", title, this.options.keybinding));
+                title = ( localize(5083, "{0} ({1})", title, this.options.keybinding));
             }
         }
         return title ?? undefined;
@@ -305,12 +307,17 @@ class ActionViewItem extends BaseActionViewItem {
         if (this.label) {
             if (this.action.checked !== undefined) {
                 this.label.classList.toggle('checked', this.action.checked);
-                this.label.setAttribute('aria-checked', this.action.checked ? 'true' : 'false');
-                this.label.setAttribute('role', 'checkbox');
+                if (this.options.isTabList) {
+                    this.label.setAttribute('aria-selected', this.action.checked ? 'true' : 'false');
+                }
+                else {
+                    this.label.setAttribute('aria-checked', this.action.checked ? 'true' : 'false');
+                    this.label.setAttribute('role', 'checkbox');
+                }
             }
             else {
                 this.label.classList.remove('checked');
-                this.label.removeAttribute('aria-checked');
+                this.label.removeAttribute(this.options.isTabList ? 'aria-selected' : 'aria-checked');
                 this.label.setAttribute('role', this.getDefaultAriaRole());
             }
         }

package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js

@@ -236,7 +236,7 @@ class ActionBar extends Disposable {
             actionViewItemElement.className = 'action-item';
             actionViewItemElement.setAttribute('role', 'presentation');
             let item;
-            const viewItemOptions = { hoverDelegate: this._hoverDelegate, ...options };
+            const viewItemOptions = { hoverDelegate: this._hoverDelegate, ...options, isTabList: this.options.ariaRole === 'tablist' };
             if (this.options.actionViewItemProvider) {
                 item = this.options.actionViewItemProvider(action, viewItemOptions);
             }

package/vscode/src/vs/base/browser/ui/button/button.js

@@ -14,9 +14,8 @@ import { KeyCode } from '../../../common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../common/lifecycle.js';
 import { ThemeIcon } from '../../../common/themables.js';
 import './button.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
-const _moduleId = "vs/base/browser/ui/button/button";
 const unthemedButtonStyles = {
     buttonBackground: '#0E639C',
     buttonHoverBackground: '#006BB3',
@@ -262,7 +261,7 @@ class ButtonWithDropdown extends Disposable {
         this.separatorContainer.style.backgroundColor = buttonBackground ?? '';
         this.separator.style.backgroundColor = options.buttonSeparator ?? '';
         this.dropdownButton = this._register(( (new Button(this.element, { ...options, title: false, supportIcons: true }))));
-        this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.dropdownButton.element, ( localizeWithPath(_moduleId, 0, 'More Actions...'))));
+        this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.dropdownButton.element, ( localize(8811, 'More Actions...'))));
         this.dropdownButton.element.setAttribute('aria-haspopup', 'true');
         this.dropdownButton.element.setAttribute('aria-expanded', 'false');
         this.dropdownButton.element.classList.add('monaco-dropdown-button');

package/vscode/src/vs/base/browser/ui/dialog/dialog.js

@@ -12,8 +12,7 @@ import { mnemonicButtonLabel } from '../../../common/labels.js';
 import { Disposable } from '../../../common/lifecycle.js';
 import { isMacintosh, isLinux, isWindows } from '../../../common/platform.js';
 import './dialog.css.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/base/browser/ui/dialog/dialog";
+import { localize } from '../../../../nls.js';
 class Dialog extends Disposable {
     constructor(container, message, buttons, options) {
         super();
@@ -31,7 +30,7 @@ class Dialog extends Disposable {
             this.buttons = buttons;
         }
         else if (!this.options.disableDefaultAction) {
-            this.buttons = [( localizeWithPath(_moduleId, 0, "OK"))];
+            this.buttons = [( localize(9514, "OK"))];
         }
         else {
             this.buttons = [];
@@ -95,16 +94,16 @@ class Dialog extends Disposable {
         this.applyStyles();
     }
     getIconAriaLabel() {
-        let typeLabel = ( localizeWithPath(_moduleId, 1, 'Info'));
+        let typeLabel = ( localize(9515, 'Info'));
         switch (this.options.type) {
             case 'error':
-                typeLabel = ( localizeWithPath(_moduleId, 2, 'Error'));
+                typeLabel = ( localize(9516, 'Error'));
                 break;
             case 'warning':
-                typeLabel = ( localizeWithPath(_moduleId, 3, 'Warning'));
+                typeLabel = ( localize(9517, 'Warning'));
                 break;
             case 'pending':
-                typeLabel = ( localizeWithPath(_moduleId, 4, 'In Progress'));
+                typeLabel = ( localize(9518, 'In Progress'));
                 break;
         }
         return typeLabel;
@@ -265,7 +264,7 @@ class Dialog extends Disposable {
                 }
                 if (!this.options.disableCloseAction) {
                     const actionBar = this._register(( (new ActionBar(this.toolbarContainer, {}))));
-                    const action = this._register(( (new Action('dialog.close', ( localizeWithPath(_moduleId, 5, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
+                    const action = this._register(( (new Action('dialog.close', ( localize(9519, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
                         resolve({
                             button: this.options.cancelId || 0,
                             checkboxChecked: this.checkbox ? this.checkbox.checked : undefined

package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { h, append, addDisposableListener, EventType, $ } from '../../dom.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { BaseActionViewItem, ActionViewItem } from '../actionbar/actionViewItems.js';
@@ -11,7 +11,6 @@ import { KeyCode } from '../../../common/keyCodes.js';
 import './dropdown.css.js';
 import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
-const _moduleId = "vs/base/browser/ui/dropdown/dropdownActionViewItem";
 class DropdownMenuActionViewItem extends BaseActionViewItem {
     constructor(action, menuActionsOrProvider, contextMenuProvider, options = Object.create(null)) {
         super(null, action, options);
@@ -130,7 +129,7 @@ class ActionWithDropdownActionViewItem extends ActionViewItem {
             const separator = h('div.action-dropdown-item-separator', [h('div', {})]).root;
             separator.classList.toggle('prominent', menuActionClassNames.includes('prominent'));
             append(this.element, separator);
-            this.dropdownMenuActionViewItem = this._register(( (new DropdownMenuActionViewItem(this._register(( (new Action('dropdownAction', ( localizeWithPath(_moduleId, 0, "More Actions...")))))), menuActionsProvider, this.contextMenuProvider, { classNames: ['dropdown', ...ThemeIcon.asClassNameArray(Codicon.dropDownButton), ...menuActionClassNames], hoverDelegate: this.options.hoverDelegate }))));
+            this.dropdownMenuActionViewItem = this._register(( (new DropdownMenuActionViewItem(this._register(( (new Action('dropdownAction', ( localize(7355, "More Actions...")))))), menuActionsProvider, this.contextMenuProvider, { classNames: ['dropdown', ...ThemeIcon.asClassNameArray(Codicon.dropDownButton), ...menuActionClassNames], hoverDelegate: this.options.hoverDelegate }))));
             this.dropdownMenuActionViewItem.render(this.element);
             this._register(addDisposableListener(this.element, EventType.KEY_DOWN, e => {
                 if (menuActionsProvider.getActions().length === 0) {

package/vscode/src/vs/base/browser/ui/findinput/findInput.js

@@ -5,11 +5,10 @@ import { Widget } from '../widget.js';
 import { Emitter } from '../../../common/event.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import './findInput.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MutableDisposable, DisposableStore } from '../../../common/lifecycle.js';
 import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
-const _moduleId = "vs/base/browser/ui/findinput/findInput";
-const NLS_DEFAULT_LABEL = ( localizeWithPath(_moduleId, 0, "input"));
+const NLS_DEFAULT_LABEL = ( localize(9823, "input"));
 class FindInput extends Widget {
     static { this.OPTION_CHANGE = 'optionChange'; }
     constructor(parent, contextViewProvider, options) {

package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js

@@ -1,11 +1,10 @@
 import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { Toggle } from '../toggle/toggle.js';
 import { Codicon } from '../../../common/codicons.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/base/browser/ui/findinput/findInputToggles";
-const NLS_CASE_SENSITIVE_TOGGLE_LABEL = ( localizeWithPath(_moduleId, 0, "Match Case"));
-const NLS_WHOLE_WORD_TOGGLE_LABEL = ( localizeWithPath(_moduleId, 1, "Match Whole Word"));
-const NLS_REGEX_TOGGLE_LABEL = ( localizeWithPath(_moduleId, 2, "Use Regular Expression"));
+import { localize } from '../../../../nls.js';
+const NLS_CASE_SENSITIVE_TOGGLE_LABEL = ( localize(9883, "Match Case"));
+const NLS_WHOLE_WORD_TOGGLE_LABEL = ( localize(9884, "Match Whole Word"));
+const NLS_REGEX_TOGGLE_LABEL = ( localize(9885, "Use Regular Expression"));
 class CaseSensitiveToggle extends Toggle {
     constructor(opts) {
         super({

package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js

@@ -6,11 +6,10 @@ import { Codicon } from '../../../common/codicons.js';
 import { Emitter } from '../../../common/event.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import './findInput.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
-const _moduleId = "vs/base/browser/ui/findinput/replaceInput";
-const NLS_DEFAULT_LABEL = ( localizeWithPath(_moduleId, 0, "input"));
-const NLS_PRESERVE_CASE_LABEL = ( localizeWithPath(_moduleId, 1, "Preserve Case"));
+const NLS_DEFAULT_LABEL = ( localize(11236, "input"));
+const NLS_PRESERVE_CASE_LABEL = ( localize(11237, "Preserve Case"));
 class PreserveCaseToggle extends Toggle {
     constructor(opts) {
         super({

package/vscode/src/vs/base/browser/ui/hover/hoverWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-hover{animation:fadein .1s linear;box-sizing:border-box;cursor:default;line-height:1.5em;overflow:hidden;position:absolute;user-select:text;-webkit-user-select:text;white-space:var(--vscode-hover-whiteSpace,normal)}.monaco-hover.hidden{display:none}.monaco-hover a:hover:not(.disabled){cursor:pointer}.monaco-hover .hover-contents:not(.html-hover-contents){padding:4px 8px}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents){word-wrap:break-word;max-width:var(--vscode-hover-maxWidth,500px)}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents) hr{min-width:100%}.monaco-hover .code,.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6,.monaco-hover p,.monaco-hover ul{margin:8px 0}.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6{line-height:1.1}.monaco-hover code{font-family:var(--monaco-monospace-font)}.monaco-hover hr{border-left:0;border-right:0;box-sizing:border-box;height:1px;margin:4px -8px -4px}.monaco-hover .code:first-child,.monaco-hover p:first-child,.monaco-hover ul:first-child{margin-top:0}.monaco-hover .code:last-child,.monaco-hover p:last-child,.monaco-hover ul:last-child{margin-bottom:0}.monaco-hover ol,.monaco-hover ul{padding-left:20px}.monaco-hover li>p{margin-bottom:0}.monaco-hover li>ul{margin-top:0}.monaco-hover code{border-radius:3px;padding:0 .4em}.monaco-hover .monaco-tokenized-source{white-space:var(--vscode-hover-sourceWhiteSpace,pre-wrap)}.monaco-hover .hover-row.status-bar{font-size:12px;line-height:22px}.monaco-hover .hover-row.status-bar .info{font-style:italic;padding:0 8px}.monaco-hover .hover-row.status-bar .actions{display:flex;padding:0 8px;width:100%}.monaco-hover .hover-row.status-bar .actions .action-container{cursor:pointer;margin-right:16px}.monaco-hover .hover-row.status-bar .actions .action-container .action .icon{padding-right:4px}.monaco-hover .hover-row.status-bar .actions .action-container a{color:var(--vscode-textLink-foreground);text-decoration:var(--text-link-decoration)}.monaco-hover .markdown-hover .hover-contents .codicon{color:inherit;font-size:inherit;vertical-align:middle}.monaco-hover .hover-contents a.code-link,.monaco-hover .hover-contents a.code-link:hover{color:inherit}.monaco-hover .hover-contents a.code-link:before{content:\"(\"}.monaco-hover .hover-contents a.code-link:after{content:\")\"}.monaco-hover .hover-contents a.code-link>span{border-bottom:1px solid transparent;color:var(--vscode-textLink-foreground);text-decoration:underline;text-underline-position:under}.monaco-hover .hover-contents a.code-link>span:hover{color:var(--vscode-textLink-activeForeground)}.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span{display:inline-block;margin-bottom:4px}.monaco-hover-content .action-container a{-webkit-user-select:none;user-select:none}.monaco-hover-content .action-container.disabled{cursor:default;opacity:.4;pointer-events:none}";
+var css = ".monaco-hover{animation:fadein .1s linear;box-sizing:border-box;cursor:default;line-height:1.5em;overflow:hidden;position:absolute;user-select:text;-webkit-user-select:text;white-space:var(--vscode-hover-whiteSpace,normal)}.monaco-hover.hidden{display:none}.monaco-hover a:hover:not(.disabled){cursor:pointer}.monaco-hover .hover-contents:not(.html-hover-contents){padding:4px 8px}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents){word-wrap:break-word;max-width:var(--vscode-hover-maxWidth,500px)}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents) hr{min-width:100%}.monaco-hover .code,.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6,.monaco-hover p,.monaco-hover ul{margin:8px 0}.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6{line-height:1.1}.monaco-hover code{font-family:var(--monaco-monospace-font)}.monaco-hover hr{border-left:0;border-right:0;box-sizing:border-box;height:1px;margin:4px -8px -4px}.monaco-hover .code:first-child,.monaco-hover p:first-child,.monaco-hover ul:first-child{margin-top:0}.monaco-hover .code:last-child,.monaco-hover p:last-child,.monaco-hover ul:last-child{margin-bottom:0}.monaco-hover ol,.monaco-hover ul{padding-left:20px}.monaco-hover li>p{margin-bottom:0}.monaco-hover li>ul{margin-top:0}.monaco-hover code{border-radius:3px;padding:0 .4em}.monaco-hover .monaco-tokenized-source{white-space:var(--vscode-hover-sourceWhiteSpace,pre-wrap)}.monaco-hover .hover-row.status-bar{font-size:12px;line-height:22px}.monaco-hover .hover-row.status-bar .info{font-style:italic;padding:0 8px}.monaco-hover .hover-row.status-bar .actions{display:flex;padding:0 8px;width:100%}.monaco-hover .hover-row.status-bar .actions .action-container{cursor:pointer;margin-right:16px}.monaco-hover .hover-row.status-bar .actions .action-container .action .icon{padding-right:4px}.monaco-hover .hover-row.status-bar .actions .action-container a{color:var(--vscode-textLink-foreground);text-decoration:var(--text-link-decoration)}.monaco-hover .markdown-hover .hover-contents .codicon{color:inherit;font-size:inherit;vertical-align:middle}.monaco-hover .hover-contents a.code-link,.monaco-hover .hover-contents a.code-link:hover{color:inherit}.monaco-hover .hover-contents a.code-link:before{content:\"(\"}.monaco-hover .hover-contents a.code-link:after{content:\")\"}.monaco-hover .hover-contents a.code-link>span{border-bottom:1px solid transparent;color:var(--vscode-textLink-foreground);text-decoration:underline;text-underline-position:under}.monaco-hover .hover-contents a.code-link>span:hover{color:var(--vscode-textLink-activeForeground)}.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span{display:inline-block;margin-bottom:4px}.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span.codicon{margin-bottom:2px}.monaco-hover-content .action-container a{-webkit-user-select:none;user-select:none}.monaco-hover-content .action-container.disabled{cursor:default;opacity:.4;pointer-events:none}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js

@@ -4,8 +4,7 @@ import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import { Disposable } from '../../../common/lifecycle.js';
 import './hoverWidget.css.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/base/browser/ui/hover/hoverWidget";
+import { localize } from '../../../../nls.js';
 const $ = $$1;
 var HoverPosition;
 ( ((function(HoverPosition) {
@@ -67,9 +66,8 @@ class HoverAction extends Disposable {
     }
 }
 function getHoverAccessibleViewHint(shouldHaveHint, keybinding) {
-    return shouldHaveHint && keybinding ? ( localizeWithPath(_moduleId, 0, "Inspect this in the accessible view with {0}.", keybinding)) : shouldHaveHint ? ( localizeWithPath(
-        _moduleId,
-        1,
+    return shouldHaveHint && keybinding ? ( localize(6985, "Inspect this in the accessible view with {0}.", keybinding)) : shouldHaveHint ? ( localize(
+        6986,
         "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
     )) : '';
 }

package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js

@@ -6,10 +6,9 @@ import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
 import { Emitter } from '../../../common/event.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../common/lifecycle.js';
 import { ThemeIcon } from '../../../common/themables.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ScrollbarVisibility } from '../../../common/scrollable.js';
 import { HighlightedLabel } from '../highlightedlabel/highlightedLabel.js';
-const _moduleId = "vs/base/browser/ui/icons/iconSelectBox";
 class IconSelectBox extends Disposable {
     static { this.InstanceCount = 0; }
     constructor(options) {
@@ -33,7 +32,7 @@ class IconSelectBox extends Disposable {
         const iconSelectInputContainer = append(iconSelectBoxContainer, $('.icon-select-input-container'));
         iconSelectInputContainer.style.paddingBottom = '10px';
         this.inputBox = disposables.add(( (new InputBox(iconSelectInputContainer, undefined, {
-            placeholder: ( localizeWithPath(_moduleId, 0, "Search icons")),
+            placeholder: ( localize(10918, "Search icons")),
             inputBoxStyles: this.options.inputBoxStyles,
         }))));
         const iconsContainer = this.iconsContainer = $('.icon-select-icons-container', { id: `${this.domId}_icons` });
@@ -101,7 +100,7 @@ class IconSelectBox extends Disposable {
             }
         }
         else {
-            const noResults = ( localizeWithPath(_moduleId, 1, "No results"));
+            const noResults = ( localize(10919, "No results"));
             append(container, $('.icon-no-results', undefined, noResults));
             alert(noResults);
         }

package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js

@@ -13,8 +13,7 @@ import { HistoryNavigator } from '../../../common/history.js';
 import { equals } from '../../../common/objects.js';
 import { ScrollbarVisibility } from '../../../common/scrollable.js';
 import './inputBox.css.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/base/browser/ui/inputbox/inputBox";
+import { localize } from '../../../../nls.js';
 const $ = $$1;
 var MessageType;
 ( ((function(MessageType) {
@@ -348,13 +347,13 @@ class InputBox extends Widget {
         });
         let alertText;
         if (this.message.type === MessageType.ERROR) {
-            alertText = ( localizeWithPath(_moduleId, 0, "Error: {0}", this.message.content));
+            alertText = ( localize(9824, "Error: {0}", this.message.content));
         }
         else if (this.message.type === MessageType.WARNING) {
-            alertText = ( localizeWithPath(_moduleId, 1, "Warning: {0}", this.message.content));
+            alertText = ( localize(9825, "Warning: {0}", this.message.content));
         }
         else {
-            alertText = ( localizeWithPath(_moduleId, 2, "Info: {0}", this.message.content));
+            alertText = ( localize(9826, "Info: {0}", this.message.content));
         }
         alert(alertText);
         this.state = 'open';
@@ -437,8 +436,8 @@ class InputBox extends Widget {
 }
 class HistoryInputBox extends InputBox {
     constructor(container, contextViewProvider, options) {
-        const NLS_PLACEHOLDER_HISTORY_HINT_SUFFIX_NO_PARENS = ( localizeWithPath(_moduleId, 3, ' or {0} for history', `\u21C5`));
-        const NLS_PLACEHOLDER_HISTORY_HINT_SUFFIX_IN_PARENS = ( localizeWithPath(_moduleId, 4, ' ({0} for history)', `\u21C5`));
+        const NLS_PLACEHOLDER_HISTORY_HINT_SUFFIX_NO_PARENS = ( localize(9827, ' or {0} for history', `\u21C5`));
+        const NLS_PLACEHOLDER_HISTORY_HINT_SUFFIX_IN_PARENS = ( localize(9828, ' ({0} for history)', `\u21C5`));
         super(container, contextViewProvider, options);
         this._onDidFocus = this._register(( (new Emitter())));
         this.onDidFocus = this._onDidFocus.event;
@@ -530,7 +529,7 @@ class HistoryInputBox extends InputBox {
             next = next === this.value ? this.getNextValue() : next;
         }
         this.value = next ?? '';
-        status(this.value ? this.value : ( localizeWithPath(_moduleId, 5, "Cleared Input")));
+        status(this.value ? this.value : ( localize(9829, "Cleared Input")));
     }
     showPreviousValue() {
         if (!( (this.history.has(this.value)))) {

package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js

@@ -5,8 +5,7 @@ import { UILabelProvider } from '../../../common/keybindingLabels.js';
 import { Disposable } from '../../../common/lifecycle.js';
 import { equals } from '../../../common/objects.js';
 import './keybindingLabel.css.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/base/browser/ui/keybindingLabel/keybindingLabel";
+import { localize } from '../../../../nls.js';
 const $ = $$1;
 const unthemedKeybindingLabelOptions = {
     keybindingLabelBackground: undefined,
@@ -91,7 +90,7 @@ class KeybindingLabel extends Disposable {
         }
     }
     renderUnbound(parent) {
-        append(parent, this.createKeyElement(( localizeWithPath(_moduleId, 0, "Unbound"))));
+        append(parent, this.createKeyElement(( localize(10294, "Unbound"))));
     }
     createKeyElement(label, extraClass = '') {
         const keyElement = $('span.monaco-keybinding-key' + extraClass, undefined, label);

package/vscode/src/vs/base/browser/ui/list/listView.js

@@ -1,6 +1,6 @@
 import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
 import { DataTransfers } from '../../dnd.js';
-import { getContentWidth, scheduleAtNextAnimationFrame, getWindow, addDisposableListener, getContentHeight, $, getTopLeftOffset, animate, isHTMLElement, isAncestor } from '../../dom.js';
+import { getContentWidth, scheduleAtNextAnimationFrame, getWindow, addDisposableListener, getContentHeight, $, getTopLeftOffset, animate, isHTMLElement, isSVGElement, isAncestor } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { Gesture, EventType } from '../../touch.js';
 import { SmoothScrollableElement } from '../scrollbar/scrollableElement.js';
@@ -961,7 +961,7 @@ class ListView {
     getItemIndexFromEventTarget(target) {
         const scrollableElement = this.scrollableElement.getDomNode();
         let element = target;
-        while (isHTMLElement(element) && element !== this.rowsContainer && scrollableElement.contains(element)) {
+        while ((isHTMLElement(element) || isSVGElement(element)) && element !== this.rowsContainer && scrollableElement.contains(element)) {
             const rawIndex = element.getAttribute('data-index');
             if (rawIndex) {
                 const index = Number(rawIndex);

package/vscode/src/vs/base/browser/ui/menu/menubar.js

@@ -15,9 +15,8 @@ import { Disposable, DisposableStore, dispose } from '../../../common/lifecycle.
 import { isMacintosh } from '../../../common/platform.js';
 import { escape, ltrim, rtrim } from '../../../common/strings.js';
 import './menubar.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { mainWindow } from '../../window.js';
-const _moduleId = "vs/base/browser/ui/menu/menubar";
 const $ = $$1;
 var MenubarState;
 ( ((function(MenubarState) {
@@ -220,7 +219,7 @@ class MenuBar extends Disposable {
         });
     }
     createOverflowMenu() {
-        const label = this.isCompact ? ( localizeWithPath(_moduleId, 0, 'Application Menu')) : ( localizeWithPath(_moduleId, 1, 'More'));
+        const label = this.isCompact ? ( localize(10542, 'Application Menu')) : ( localize(10543, 'More'));
         const buttonElement = $('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': this.isCompact ? 0 : -1, 'aria-label': label, 'aria-haspopup': true });
         const titleElement = $('div.menubar-menu-title.toolbar-toggle-more' + ThemeIcon.asCSSSelector(Codicon.menuBarMore), { 'role': 'none', 'aria-hidden': true });
         buttonElement.appendChild(titleElement);

package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js

@@ -13,8 +13,7 @@ import { Disposable } from '../../../common/lifecycle.js';
 import { isMacintosh } from '../../../common/platform.js';
 import { ScrollbarVisibility } from '../../../common/scrollable.js';
 import './selectBoxCustom.css.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/base/browser/ui/selectBox/selectBoxCustom";
+import { localize } from '../../../../nls.js';
 const $ = $$1;
 const SELECT_OPTION_ENTRY_TEMPLATE_ID = 'selectOption.entry.template';
 class SelectListRenderer {
@@ -487,7 +486,7 @@ class SelectBoxList extends Disposable {
         }
         this.selectDropDownListContainer = append(parent, $('.select-box-dropdown-list-container'));
         this.listRenderer = ( (new SelectListRenderer()));
-        this.selectList = ( (new List(
+        this.selectList = this._register(( (new List(
             'SelectBoxCustom',
             this.selectDropDownListContainer,
             this,
@@ -511,12 +510,12 @@ class SelectBoxList extends Disposable {
                         }
                         return label;
                     },
-                    getWidgetAriaLabel: () => ( localizeWithPath(_moduleId, 0, "Select Box")),
+                    getWidgetAriaLabel: () => ( localize(10917, "Select Box")),
                     getRole: () => isMacintosh ? '' : 'option',
                     getWidgetRole: () => 'listbox'
                 }
             }
-        )));
+        ))));
         if (this.selectBoxOptions.ariaLabel) {
             this.selectList.ariaLabel = this.selectBoxOptions.ariaLabel;
         }

package/vscode/src/vs/base/browser/ui/splitview/paneview.js

@@ -10,9 +10,8 @@ import { Emitter, Event } from '../../../common/event.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../common/lifecycle.js';
 import './paneview.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { SplitView, Sizing } from './splitview.js';
-const _moduleId = "vs/base/browser/ui/splitview/paneview";
 class Pane extends Disposable {
     static { this.HEADER_SIZE = 22; }
     get ariaHeaderLabel() {
@@ -81,7 +80,7 @@ class Pane extends Disposable {
         this.orthogonalSize = 0;
         this._expanded = typeof options.expanded === 'undefined' ? true : !!options.expanded;
         this._orientation = typeof options.orientation === 'undefined' ? Orientation.VERTICAL : options.orientation;
-        this._ariaHeaderLabel = ( localizeWithPath(_moduleId, 0, "{0} Section", options.title));
+        this._ariaHeaderLabel = ( localize(9986, "{0} Section", options.title));
         this._minimumBodySize = typeof options.minimumBodySize === 'number' ? options.minimumBodySize : this._orientation === Orientation.HORIZONTAL ? 200 : 120;
         this._maximumBodySize = typeof options.maximumBodySize === 'number' ? options.maximumBodySize : Number.POSITIVE_INFINITY;
         this.element = $('.pane');

package/vscode/src/vs/base/browser/ui/table/tableWidget.js

@@ -1,4 +1,4 @@
-import { append, $, createStyleSheet, getContentHeight, getContentWidth, clearNode } from '../../dom.js';
+import { append, $, clearNode, createStyleSheet, getContentHeight, getContentWidth } from '../../dom.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { List, unthemedListStyles } from '../list/listWidget.js';

package/vscode/src/vs/base/browser/ui/toggle/toggle.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-custom-toggle{border:1px solid transparent;border-radius:3px;box-sizing:border-box;cursor:pointer;float:left;height:20px;margin-left:2px;overflow:hidden;padding:1px;user-select:none;-webkit-user-select:none;width:20px}.monaco-custom-toggle:hover{background-color:var(--vscode-inputOption-hoverBackground)}.hc-black .monaco-custom-toggle:hover,.hc-light .monaco-custom-toggle:hover{border:1px dashed var(--vscode-focusBorder)}.hc-black .monaco-custom-toggle,.hc-black .monaco-custom-toggle:hover,.hc-light .monaco-custom-toggle,.hc-light .monaco-custom-toggle:hover{background:none}.monaco-custom-toggle.monaco-checkbox{background-size:16px!important;border:1px solid transparent;border-radius:3px;height:18px;margin-left:0;margin-right:9px;opacity:1;padding:0;width:18px}.monaco-action-bar .checkbox-action-item{align-items:center;display:flex}.monaco-action-bar .checkbox-action-item>.monaco-custom-toggle.monaco-checkbox{margin-right:4px}.monaco-action-bar .checkbox-action-item>.checkbox-label{font-size:12px}.monaco-custom-toggle.monaco-checkbox:not(.checked):before{visibility:hidden}";
+var css = ".monaco-custom-toggle{border:1px solid transparent;border-radius:3px;box-sizing:border-box;cursor:pointer;float:left;height:20px;margin-left:2px;overflow:hidden;padding:1px;user-select:none;-webkit-user-select:none;width:20px}.monaco-custom-toggle:hover{background-color:var(--vscode-inputOption-hoverBackground)}.hc-black .monaco-custom-toggle:hover,.hc-light .monaco-custom-toggle:hover{border:1px dashed var(--vscode-focusBorder)}.hc-black .monaco-custom-toggle,.hc-black .monaco-custom-toggle:hover,.hc-light .monaco-custom-toggle,.hc-light .monaco-custom-toggle:hover{background:none}.monaco-custom-toggle.monaco-checkbox{background-size:16px!important;border:1px solid transparent;border-radius:3px;height:18px;margin-left:0;margin-right:9px;opacity:1;padding:0;width:18px}.monaco-action-bar .checkbox-action-item{align-items:center;border-radius:2px;display:flex;padding-right:2px}.monaco-action-bar .checkbox-action-item:hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-action-bar .checkbox-action-item>.monaco-custom-toggle.monaco-checkbox{margin-right:4px}.monaco-action-bar .checkbox-action-item>.checkbox-label{font-size:12px}.monaco-custom-toggle.monaco-checkbox:not(.checked):before{visibility:hidden}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js

@@ -6,9 +6,8 @@ import { ThemeIcon } from '../../../common/themables.js';
 import { EventMultiplexer } from '../../../common/event.js';
 import { Disposable, DisposableStore } from '../../../common/lifecycle.js';
 import './toolbar.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
-const _moduleId = "vs/base/browser/ui/toolbar/toolbar";
 class ToolBar extends Disposable {
     constructor(container, contextMenuProvider, options = { orientation: ActionsOrientation.HORIZONTAL }) {
         super();
@@ -144,7 +143,7 @@ class ToolBar extends Disposable {
 class ToggleMenuAction extends Action {
     static { this.ID = 'toolbar.toggle.more'; }
     constructor(toggleDropdownMenu, title) {
-        title = title || ( localizeWithPath(_moduleId, 0, "More Actions..."));
+        title = title || ( localize(10094, "More Actions..."));
         super(ToggleMenuAction.ID, title, undefined, true);
         this._menuActions = [];
         this.toggleDropdownMenu = toggleDropdownMenu;

package/vscode/src/vs/base/browser/ui/tree/abstractTree.js

@@ -1,4 +1,4 @@
-import { append, $, clearNode, createStyleSheet, isActiveElement, asCssValueWithDefault, isKeyboardEvent, hasParentWithClass, h, getWindow } from '../../dom.js';
+import { createStyleSheet, isActiveElement, asCssValueWithDefault, isKeyboardEvent, append, $, clearNode, addDisposableListener, hasParentWithClass, h, getWindow } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { ActionBar } from '../actionbar/actionbar.js';
@@ -18,17 +18,16 @@ import { SetMap } from '../../../common/map.js';
 import { Event, EventBufferer, Emitter, Relay } from '../../../common/event.js';
 import { FuzzyScore, fuzzyScore } from '../../../common/filters.js';
 import { KeyCode } from '../../../common/keyCodes.js';
-import { Disposable, DisposableStore, toDisposable, dispose } from '../../../common/lifecycle.js';
+import { DisposableStore, dispose, Disposable, toDisposable } from '../../../common/lifecycle.js';
 import { clamp } from '../../../common/numbers.js';
 import { isNumber } from '../../../common/types.js';
 import './media/tree.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import '../../../common/observableInternal/derived.js';
 import { autorun } from '../../../common/observableInternal/autorun.js';
 import { constObservable } from '../../../common/observableInternal/utils.js';
 import '../../../common/cancellation.js';
-const _moduleId = "vs/base/browser/ui/tree/abstractTree";
 class TreeElementsDragAndDropData extends ElementsDragAndDropData {
     set context(context) {
         this.data.context = context;
@@ -535,7 +534,7 @@ class ModeToggle extends Toggle {
     constructor(opts) {
         super({
             icon: Codicon.listFilter,
-            title: ( localizeWithPath(_moduleId, 0, "Filter")),
+            title: ( localize(4648, "Filter")),
             isChecked: opts.isChecked ?? false,
             hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
             inputActiveOptionBorder: opts.inputActiveOptionBorder,
@@ -548,7 +547,7 @@ class FuzzyToggle extends Toggle {
     constructor(opts) {
         super({
             icon: Codicon.searchFuzzy,
-            title: ( localizeWithPath(_moduleId, 1, "Fuzzy Match")),
+            title: ( localize(4649, "Fuzzy Match")),
             isChecked: opts.isChecked ?? false,
             hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
             inputActiveOptionBorder: opts.inputActiveOptionBorder,
@@ -578,7 +577,7 @@ var TreeFindMatchType;
 class FindWidget extends Disposable {
     set mode(mode) {
         this.modeToggle.checked = mode === TreeFindMode.Filter;
-        this.findInput.inputBox.setPlaceHolder(mode === TreeFindMode.Filter ? ( localizeWithPath(_moduleId, 2, "Type to filter")) : ( localizeWithPath(_moduleId, 3, "Type to search")));
+        this.findInput.inputBox.setPlaceHolder(mode === TreeFindMode.Filter ? ( localize(4650, "Type to filter")) : ( localize(4651, "Type to search")));
     }
     set matchType(matchType) {
         this.matchTypeToggle.checked = matchType === TreeFindMatchType.Fuzzy;
@@ -629,7 +628,7 @@ class FindWidget extends Disposable {
             this._store
         )));
         this.findInput = this._register(( (new FindInput(this.elements.findInput, contextViewProvider, {
-            label: ( localizeWithPath(_moduleId, 3, "Type to search")),
+            label: ( localize(4651, "Type to search")),
             additionalToggles: [this.modeToggle, this.matchTypeToggle],
             showCommonFindToggles: false,
             inputBoxStyles: styles.inputBoxStyles,
@@ -667,7 +666,7 @@ class FindWidget extends Disposable {
                 return;
             }
         }));
-        const closeAction = this._register(( (new Action('close', ( localizeWithPath(_moduleId, 4, "Close")), 'codicon codicon-close', true, () => this.dispose()))));
+        const closeAction = this._register(( (new Action('close', ( localize(4652, "Close")), 'codicon codicon-close', true, () => this.dispose()))));
         this.actionbar.push(closeAction, { icon: true, label: false });
         const onGrabMouseDown = this._register(( (new DomEmitter(this.elements.grab, 'mousedown'))));
         this._register(onGrabMouseDown.event(e => {
@@ -889,7 +888,7 @@ class FindController {
         const noMatches = this.filter.totalCount > 0 && this.filter.matchCount === 0;
         if (this.pattern && noMatches) {
             if (this.tree.options.showNotFoundMessage ?? true) {
-                this.widget?.showMessage({ type: MessageType.WARNING, content: ( localizeWithPath(_moduleId, 5, "No elements found.")) });
+                this.widget?.showMessage({ type: MessageType.WARNING, content: ( localize(4653, "No elements found.")) });
             }
             else {
                 this.widget?.showMessage({ type: MessageType.WARNING });
@@ -1369,8 +1368,8 @@ class StickyScrollFocus extends Disposable {
         this._onContextMenu = ( (new Emitter()));
         this.onContextMenu = this._onContextMenu.event;
         this._domHasFocus = false;
-        this.container.addEventListener('focus', () => this.onFocus());
-        this.container.addEventListener('blur', () => this.onBlur());
+        this._register(addDisposableListener(this.container, 'focus', () => this.onFocus()));
+        this._register(addDisposableListener(this.container, 'blur', () => this.onBlur()));
         this._register(this.view.onDidFocus(() => this.toggleStickyScrollFocused(false)));
         this._register(this.view.onKeyDown((e) => this.onKeyDown(e)));
         this._register(this.view.onMouseDown((e) => this.onMouseDown(e)));

package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js

@@ -1,9 +1,8 @@
 import { Action } from '../../../common/actions.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/base/browser/ui/tree/treeDefaults";
+import { localize } from '../../../../nls.js';
 class CollapseAllAction extends Action {
     constructor(viewer, enabled) {
-        super('vs.tree.collapse', ( localizeWithPath(_moduleId, 0, "Collapse All")), 'collapse-all', enabled);
+        super('vs.tree.collapse', ( localize(10914, "Collapse All")), 'collapse-all', enabled);
         this.viewer = viewer;
     }
     async run() {

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

@@ -1,7 +1,6 @@
 import { Emitter } from './event.js';
 import { Disposable } from './lifecycle.js';
-import { localizeWithPath } from '../../nls.js';
-const _moduleId = "vs/base/common/actions";
+import { localize } from '../../nls.js';
 class Action extends Disposable {
     constructor(id, label = '', cssClass = '', enabled = true, actionCallback) {
         super();
@@ -150,7 +149,7 @@ class SubmenuAction {
 class EmptySubmenuAction extends Action {
     static { this.ID = 'vs.actions.empty'; }
     constructor() {
-        super(EmptySubmenuAction.ID, ( localizeWithPath(_moduleId, 0, '(empty)')), undefined, false);
+        super(EmptySubmenuAction.ID, ( localize(1073, '(empty)')), undefined, false);
     }
 }
 function toAction(props) {

package/vscode/src/vs/base/common/arrays.js

@@ -544,4 +544,10 @@ class Permutation {
         return ( new Permutation(inverseIndexMap));
     }
 }
-export { ArrayQueue, CallbackIterable, CompareResult, Permutation, arrayInsert, asArray, binarySearch, binarySearch2, booleanComparator, coalesce, coalesceInPlace, commonPrefixLength, compareBy, delta, distinct, equals, firstOrDefault, forEachAdjacent, forEachWithNeighbors, groupAdjacentBy, groupBy, index, insert, insertInto, isFalsyOrEmpty, isNonEmptyArray, lastOrDefault, mapArrayOrNot, move, numberComparator, pushMany, pushToEnd, pushToStart, quickSelect, range, remove, removeFastWithoutKeepingOrder, reverseOrder, shuffle, sortedDiff, splice, tail, tail2, tieBreakComparators, top, uniqueFilter };
+async function findAsync(array, predicate) {
+    const results = await Promise.all(( array.map(
+        async (element, index) => ({ element, ok: await predicate(element, index) })
+    )));
+    return results.find(r => r.ok)?.element;
+}
+export { ArrayQueue, CallbackIterable, CompareResult, Permutation, arrayInsert, asArray, binarySearch, binarySearch2, booleanComparator, coalesce, coalesceInPlace, commonPrefixLength, compareBy, delta, distinct, equals, findAsync, firstOrDefault, forEachAdjacent, forEachWithNeighbors, groupAdjacentBy, groupBy, index, insert, insertInto, isFalsyOrEmpty, isNonEmptyArray, lastOrDefault, mapArrayOrNot, move, numberComparator, pushMany, pushToEnd, pushToStart, quickSelect, range, remove, removeFastWithoutKeepingOrder, reverseOrder, shuffle, sortedDiff, splice, tail, tail2, tieBreakComparators, top, uniqueFilter };