@codingame/monaco-vscode-api 26.2.2 → 28.0.0

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

@@ -10,7 +10,8 @@ import { SelectBoxNative } from './selectBoxNative.js';
 registerCss(selectBox);
 const SeparatorSelectOption = ( Object.freeze({
     text: "─────────",
-    isDisabled: true
+    isDisabled: true,
+    isSeparator: true
 }));
 class SelectBox extends Widget {
     constructor(options, selected, contextViewProvider, styles, selectBoxOptions) {

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

@@ -6,8 +6,8 @@
 .monaco-select-box-dropdown-container {
 	display: none;
 	box-sizing: border-box;
-	border-radius: 4px;
-	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	border-radius: var(--vscode-cornerRadius-large);
+	box-shadow: var(--vscode-shadow-lg);
 }
 
 .monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown * {
@@ -45,6 +45,11 @@
 	padding: 5px 6px;
 }
 
+/* Remove list-level focus ring — individual rows show their own focus indicators */
+.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list:focus::before {
+	outline: 0 !important;
+}
+
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row {
 	cursor: pointer;
 	padding-left: 2px;
@@ -53,7 +58,7 @@
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row > .option-text {
 	text-overflow: ellipsis;
 	overflow: hidden;
-	padding-left: 3.5px;
+	padding-left: 6px;
 	white-space: nowrap;
 	float: left;
 }
@@ -61,7 +66,7 @@
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row > .option-detail {
 	text-overflow: ellipsis;
 	overflow: hidden;
-	padding-left: 3.5px;
+	padding-left: 6px;
 	white-space: nowrap;
 	float: left;
 	opacity: 0.7;
@@ -76,6 +81,38 @@
 }
 
 
+/* Separator styling */
+.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.option-separator {
+	cursor: default;
+	border-radius: 0;
+	padding: 0;
+}
+
+.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.option-separator > .option-text {
+	visibility: hidden;
+	width: 0;
+	float: none;
+}
+
+.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.option-separator > .option-detail {
+	display: none;
+}
+
+.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.option-separator > .option-decorator-right {
+	color: var(--vscode-descriptionForeground);
+	font-size: 12px;
+}
+
+.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.option-separator::after {
+	content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 50%;
+	height: 1px;
+	background-color: var(--vscode-menu-separatorBackground);
+}
+
 /* Accepted CSS hiding technique for accessibility reader text  */
 /* https://webaim.org/techniques/css/invisiblecontent/ */
 
@@ -100,7 +137,7 @@
 }
 
 .monaco-select-box-dropdown-container > .select-box-dropdown-container-width-control > .width-control-div > .option-text-width-control {
-	padding-left: 4px;
+	padding-left: 8px;
 	padding-right: 8px;
 	white-space: nowrap;
 }

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

@@ -13,11 +13,12 @@ import { createStyleSheet } from '../../domStylesheets.js';
 import { DomEmitter } from '../../event.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { renderMarkdown } from '../../markdownRenderer.js';
-import { AnchorPosition } from '../contextview/contextview.js';
+import '../contextview/contextview.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { List } from '../list/listWidget.js';
 import * as selectBoxCustom from './selectBoxCustom.css';
+import { AnchorPosition } from '../../../common/layout.js';
 
 registerCss(selectBoxCustom);
 const $ = $$1;
@@ -48,6 +49,12 @@ class SelectListRenderer {
         } else {
             data.root.classList.remove("option-disabled");
         }
+        if (element.isSeparator) {
+            data.root.classList.add("option-separator");
+            data.root.classList.add("option-disabled");
+        } else {
+            data.root.classList.remove("option-separator");
+        }
     }
     disposeTemplate(_templateData) {}
 }
@@ -299,12 +306,12 @@ class SelectBoxList extends Disposable {
         }
         if (this.styles.listFocusOutline) {
             content.push(
-                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.focused { outline: 1.6px dotted ${this.styles.listFocusOutline} !important; outline-offset: -1.6px !important; }`
+                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.focused { outline: 1px solid ${this.styles.listFocusOutline} !important; outline-offset: -1px !important; }`
             );
         }
         if (this.styles.listHoverOutline) {
             content.push(
-                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row:not(.option-disabled):not(.focused):hover { outline: 1.6px dashed ${this.styles.listHoverOutline} !important; outline-offset: -1.6px !important; }`
+                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row:not(.option-disabled):not(.focused):hover { outline: 1px solid ${this.styles.listHoverOutline} !important; outline-offset: -1px !important; }`
             );
         }
         content.push(
@@ -326,11 +333,9 @@ class SelectBoxList extends Disposable {
     styleList() {
         const background = this.styles.selectBackground ?? "";
         const listBackground = asCssValueWithDefault(this.styles.selectListBackground, background);
+        this.selectDropDownContainer.style.backgroundColor = listBackground;
         this.selectDropDownListContainer.style.backgroundColor = listBackground;
         this.selectionDetailsPane.style.backgroundColor = listBackground;
-        const optionsBorder = this.styles.focusBorder ?? "";
-        this.selectDropDownContainer.style.outlineColor = optionsBorder;
-        this.selectDropDownContainer.style.outlineOffset = "-1px";
         this.selectList.style(this.styles);
     }
     createOption(value, index, disabled) {
@@ -386,6 +391,10 @@ class SelectBoxList extends Disposable {
     }
     renderSelectDropDown(container, preLayoutPosition) {
         container.appendChild(this.selectDropDownContainer);
+        const computedFontSize = getWindow(this.selectElement).getComputedStyle(this.selectElement).fontSize;
+        if (computedFontSize) {
+            this.selectDropDownContainer.style.fontSize = computedFontSize;
+        }
         this.layoutSelectDropDown(preLayoutPosition);
         return {
             dispose: () => {
@@ -524,6 +533,9 @@ class SelectBoxList extends Disposable {
                 mouseSupport: false,
                 accessibilityProvider: {
                     getAriaLabel: element => {
+                        if (element.isSeparator) {
+                            return localize(30, "separator");
+                        }
                         let label = element.text;
                         if (element.detail) {
                             label += `. ${element.detail}`;
@@ -536,7 +548,7 @@ class SelectBoxList extends Disposable {
                         }
                         return label;
                     },
-                    getWidgetAriaLabel: () => ( localize(29, "Select Box")),
+                    getWidgetAriaLabel: () => ( localize(31, "Select Box")),
                     getRole: () => isMacintosh ? "" : "option",
                     getWidgetRole: () => "listbox"
                 }
@@ -584,9 +596,9 @@ class SelectBoxList extends Disposable {
             EventType.POINTER_UP,
             e => this.onPointerUp(e)
         ));
-        this._register(
-            this.selectList.onMouseOver(e => typeof e.index !== "undefined" && this.selectList.setFocus([e.index]))
-        );
+        this._register(this.selectList.onMouseOver(
+            e => typeof e.index !== "undefined" && !this.options[e.index]?.isDisabled && this.selectList.setFocus([e.index])
+        ));
         this._register(this.selectList.onDidChangeFocus(e => this.onListFocus(e)));
         this._register(
             addDisposableListener(this.selectDropDownContainer, EventType.FOCUS_OUT, e => {
@@ -702,6 +714,10 @@ class SelectBoxList extends Disposable {
     }
     onEnter(e) {
         EventHelper.stop(e);
+        if (this.options[this.selected]?.isDisabled) {
+            this.hideSelectDropDown(true);
+            return;
+        }
         if (this.selected !== this._currentSelection) {
             this._currentSelection = this.selected;
             this._onDidSelect.fire({
@@ -717,14 +733,14 @@ class SelectBoxList extends Disposable {
     onDownArrow(e) {
         if (this.selected < this.options.length - 1) {
             EventHelper.stop(e, true);
-            const nextOptionDisabled = this.options[this.selected + 1].isDisabled;
-            if (nextOptionDisabled && this.options.length > this.selected + 2) {
-                this.selected += 2;
-            } else if (nextOptionDisabled) {
+            let next = this.selected + 1;
+            while (next < this.options.length && this.options[next].isDisabled) {
+                next++;
+            }
+            if (next >= this.options.length) {
                 return;
-            } else {
-                this.selected++;
             }
+            this.selected = next;
             this.select(this.selected);
             this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selectList.getFocus()[0]);
@@ -733,12 +749,14 @@ class SelectBoxList extends Disposable {
     onUpArrow(e) {
         if (this.selected > 0) {
             EventHelper.stop(e, true);
-            const previousOptionDisabled = this.options[this.selected - 1].isDisabled;
-            if (previousOptionDisabled && this.selected > 1) {
-                this.selected -= 2;
-            } else {
-                this.selected--;
+            let prev = this.selected - 1;
+            while (prev >= 0 && this.options[prev].isDisabled) {
+                prev--;
+            }
+            if (prev < 0) {
+                return;
             }
+            this.selected = prev;
             this.select(this.selected);
             this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selectList.getFocus()[0]);
@@ -748,11 +766,15 @@ class SelectBoxList extends Disposable {
         EventHelper.stop(e);
         this.selectList.focusPreviousPage();
         setTimeout(() => {
-            this.selected = this.selectList.getFocus()[0];
-            if (this.options[this.selected].isDisabled && this.selected < this.options.length - 1) {
-                this.selected++;
-                this.selectList.setFocus([this.selected]);
+            let candidate = this.selectList.getFocus()[0];
+            while (candidate > 0 && this.options[candidate].isDisabled) {
+                candidate--;
             }
+            if (this.options[candidate].isDisabled) {
+                return;
+            }
+            this.selected = candidate;
+            this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selected);
             this.select(this.selected);
         }, 1);
@@ -761,11 +783,15 @@ class SelectBoxList extends Disposable {
         EventHelper.stop(e);
         this.selectList.focusNextPage();
         setTimeout(() => {
-            this.selected = this.selectList.getFocus()[0];
-            if (this.options[this.selected].isDisabled && this.selected > 0) {
-                this.selected--;
-                this.selectList.setFocus([this.selected]);
+            let candidate = this.selectList.getFocus()[0];
+            while (candidate < this.options.length - 1 && this.options[candidate].isDisabled) {
+                candidate++;
             }
+            if (this.options[candidate].isDisabled) {
+                return;
+            }
+            this.selected = candidate;
+            this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selected);
             this.select(this.selected);
         }, 1);
@@ -775,10 +801,14 @@ class SelectBoxList extends Disposable {
         if (this.options.length < 2) {
             return;
         }
-        this.selected = 0;
-        if (this.options[this.selected].isDisabled && this.selected > 1) {
-            this.selected++;
+        let candidate = 0;
+        while (candidate < this.options.length - 1 && this.options[candidate].isDisabled) {
+            candidate++;
+        }
+        if (this.options[candidate].isDisabled) {
+            return;
         }
+        this.selected = candidate;
         this.selectList.setFocus([this.selected]);
         this.selectList.reveal(this.selected);
         this.select(this.selected);
@@ -788,10 +818,14 @@ class SelectBoxList extends Disposable {
         if (this.options.length < 2) {
             return;
         }
-        this.selected = this.options.length - 1;
-        if (this.options[this.selected].isDisabled && this.selected > 1) {
-            this.selected--;
+        let candidate = this.options.length - 1;
+        while (candidate > 0 && this.options[candidate].isDisabled) {
+            candidate--;
+        }
+        if (this.options[candidate].isDisabled) {
+            return;
         }
+        this.selected = candidate;
         this.selectList.setFocus([this.selected]);
         this.selectList.reveal(this.selected);
         this.select(this.selected);

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

@@ -67,7 +67,9 @@ class SelectBoxNative extends Disposable {
             this.options = options;
             this.selectElement.options.length = 0;
             this.options.forEach((option, index) => {
-                this.selectElement.add(this.createOption(option.text, index, option.isDisabled));
+                this.selectElement.add(
+                    this.createOption(option.text, index, option.isDisabled, option.isSeparator)
+                );
             });
         }
         if (selected !== undefined) {
@@ -130,11 +132,14 @@ class SelectBoxNative extends Disposable {
             this.selectElement.style.borderColor = this.styles.selectBorder ?? "";
         }
     }
-    createOption(value, index, disabled) {
+    createOption(value, index, disabled, isSeparator) {
         const option = createElement("option");
         option.value = value;
         option.text = value;
-        option.disabled = !!disabled;
+        option.disabled = !!disabled || !!isSeparator;
+        if (isSeparator) {
+            option.setAttribute("role", "separator");
+        }
         return option;
     }
 }

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

@@ -67,7 +67,7 @@ class Pane extends Disposable {
         return headerSize + maximumBodySize;
     }
     getAriaHeaderLabel(title) {
-        return localize(30, "{0} Section", title);
+        return localize(32, "{0} Section", title);
     }
     constructor(options) {
         super();

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

@@ -111,7 +111,7 @@ class ColumnHeader extends Disposable {
         super();
         this.column = column;
         this.index = index;
-        this._onDidLayout = ( new Emitter());
+        this._onDidLayout = this._register(( new Emitter()));
         this.onDidLayout = this._onDidLayout.event;
         this.element = $(".monaco-table-th", {
             "data-col-index": index

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

@@ -283,7 +283,7 @@ class ToggleMenuAction extends Action {
         this.ID = "toolbar.toggle.more";
     }
     constructor(toggleDropdownMenu, title) {
-        title = title || ( localize(31, "More Actions..."));
+        title = title || ( localize(33, "More Actions..."));
         super(ToggleMenuAction.ID, title, undefined, true);
         this._menuActions = [];
         this.toggleDropdownMenu = toggleDropdownMenu;

package/vscode/src/vs/base/browser/ui/tree/abstractTree.d.ts

@@ -56,6 +56,7 @@ export declare enum RenderIndentGuides {
 }
 interface ITreeRendererOptions<T> {
     readonly indent?: number;
+    readonly defaultIndent?: number;
     readonly renderIndentGuides?: RenderIndentGuides;
     readonly hideTwistiesOfChildlessElements?: boolean;
     readonly twistieAdditionalCssClass?: (element: T) => string | undefined;
@@ -74,6 +75,7 @@ export declare class TreeRenderer<T, TFilterData, TRef, TTemplateData> implement
     private renderedElements;
     private renderedNodes;
     private indent;
+    private defaultIndent;
     private hideTwistiesOfChildlessElements;
     private twistieAdditionalCssClass?;
     private shouldRenderIndentGuides;
@@ -270,6 +272,7 @@ declare class StickyScrollController<T, TFilterData, TRef> extends Disposable {
     };
 }
 export interface IAbstractTreeOptionsUpdate<T> extends ITreeRendererOptions<T> {
+    readonly defaultIndent?: number;
     readonly multipleSelectionSupport?: boolean;
     readonly typeNavigationEnabled?: boolean;
     readonly typeNavigationMode?: TypeNavigationMode;

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

@@ -300,6 +300,7 @@ class TreeRenderer {
         this.renderedElements = ( new Map());
         this.renderedNodes = ( new Map());
         this.indent = TreeRenderer.DefaultIndent;
+        this.defaultIndent = TreeRenderer.DefaultIndent;
         this.hideTwistiesOfChildlessElements = false;
         this.shouldRenderIndentGuides = false;
         this.activeIndentNodes = ( new Set());
@@ -311,12 +312,16 @@ class TreeRenderer {
         renderer.onDidChangeTwistieState?.(this.onDidChangeTwistieState, this, this.disposables);
     }
     updateOptions(options = {}) {
-        if (typeof options.indent !== "undefined") {
-            const indent = clamp(options.indent, 0, 40);
-            if (indent !== this.indent) {
+        if (typeof options.defaultIndent !== "undefined") {
+            this.defaultIndent = options.defaultIndent;
+        }
+        if (typeof options.indent !== "undefined" || typeof options.defaultIndent !== "undefined") {
+            const indent = typeof options.indent !== "undefined" ? clamp(options.indent, 0, 40) : this.indent;
+            const needsRerender = indent !== this.indent || typeof options.defaultIndent !== "undefined";
+            if (needsRerender) {
                 this.indent = indent;
                 for (const [node, templateData] of this.renderedNodes) {
-                    templateData.indentSize = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent;
+                    templateData.indentSize = this.defaultIndent + (node.depth - 1) * this.indent;
                     this.renderTreeElement(node, templateData);
                 }
             }
@@ -360,7 +365,7 @@ class TreeRenderer {
         };
     }
     renderElement(node, index, templateData, details) {
-        templateData.indentSize = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent;
+        templateData.indentSize = this.defaultIndent + (node.depth - 1) * this.indent;
         this.renderedNodes.set(node, templateData);
         this.renderedElements.set(node.element, node);
         this.renderTreeElement(node, templateData);
@@ -708,7 +713,7 @@ class FindWidget extends Disposable {
             h(".monaco-tree-type-filter-actionbar@actionbar")
         ]);
         this.toggles = [];
-        this._onDidDisable = ( new Emitter());
+        this._onDidDisable = this._register(( new Emitter()));
         this.onDidDisable = this._onDidDisable.event;
         container.appendChild(this.elements.root);
         this._register(toDisposable(() => this.elements.root.remove()));
@@ -729,7 +734,7 @@ class FindWidget extends Disposable {
         }))))));
         const history = options?.history || [];
         this.findInput = this._register(( new FindInput(this.elements.findInput, contextViewProvider, {
-            label: ( localize(32, "Type to search")),
+            label: ( localize(34, "Type to search")),
             placeholder,
             additionalToggles: this.toggles,
             showCommonFindToggles: false,
@@ -767,7 +772,7 @@ class FindWidget extends Disposable {
                 return;
             }
         }));
-        const closeAction = this._register(( new Action("close", ( localize(33, "Close")), "codicon codicon-close", true, () => this.dispose())));
+        const closeAction = this._register(( new Action("close", ( localize(35, "Close")), "codicon codicon-close", true, () => this.dispose())));
         this.actionbar.push(closeAction, {
             icon: true,
             label: false
@@ -836,7 +841,7 @@ class AbstractFindController {
         this.enabledDisposables = ( new DisposableStore());
         this.disposables = ( new DisposableStore());
         this.toggles = ( new FindToggles(options.toggles ?? []));
-        this._placeholder = options.placeholder ?? ( localize(32, "Type to search"));
+        this._placeholder = options.placeholder ?? ( localize(34, "Type to search"));
     }
     isOpened() {
         return !!this.widget;
@@ -903,7 +908,7 @@ class AbstractFindController {
             if (this.tree.options.showNotFoundMessage ?? true) {
                 this.widget?.showMessage({
                     type: MessageType.WARNING,
-                    content: warningMessage ?? ( localize(34, "No results found."))
+                    content: warningMessage ?? ( localize(36, "No results found."))
                 });
             } else {
                 this.widget?.showMessage({
@@ -916,9 +921,9 @@ class AbstractFindController {
     }
     alertResults(results) {
         if (!results) {
-            alert(( localize(35, "No results")));
+            alert(( localize(37, "No results")));
         } else {
-            alert(( localize(36, "{0} results", results)));
+            alert(( localize(38, "{0} results", results)));
         }
     }
     dispose() {
@@ -938,7 +943,7 @@ class FindController extends AbstractFindController {
         }
         const isFilterMode = mode === TreeFindMode.Filter;
         this.updateToggleState(DefaultTreeToggles.Mode, isFilterMode);
-        this.placeholder = isFilterMode ? ( localize(37, "Type to filter")) : ( localize(32, "Type to search"));
+        this.placeholder = isFilterMode ? ( localize(39, "Type to filter")) : ( localize(34, "Type to search"));
         this.filter.findMode = mode;
         this.tree.refilter();
         this.render();
@@ -963,12 +968,12 @@ class FindController extends AbstractFindController {
         const toggleContributions = [{
             id: DefaultTreeToggles.Mode,
             icon: Codicon.listFilter,
-            title: ( localize(38, "Filter")),
+            title: ( localize(40, "Filter")),
             isChecked: defaultFindMode === TreeFindMode.Filter
         }, {
             id: DefaultTreeToggles.MatchType,
             icon: Codicon.searchFuzzy,
-            title: ( localize(39, "Fuzzy Match")),
+            title: ( localize(41, "Fuzzy Match")),
             isChecked: defaultFindMatchType === TreeFindMatchType.Fuzzy
         }];
         filter.findMatchType = defaultFindMatchType;
@@ -1162,7 +1167,7 @@ class StickyScrollController extends Disposable {
     }
     update() {
         const firstVisibleNode = this.getNodeAtHeight(this.paddingTop);
-        if (!firstVisibleNode || this.tree.scrollTop <= this.paddingTop) {
+        if (!firstVisibleNode || this.tree.scrollTop <= this.paddingTop || this.view.renderHeight === 0) {
             this._widget.setState(undefined);
             return;
         }
@@ -1548,9 +1553,9 @@ class StickyScrollFocus extends Disposable {
         this.view = view;
         this.focusedIndex = -1;
         this.elements = [];
-        this._onDidChangeHasFocus = ( new Emitter());
+        this._onDidChangeHasFocus = this._register(( new Emitter()));
         this.onDidChangeHasFocus = this._onDidChangeHasFocus.event;
-        this._onContextMenu = ( new Emitter());
+        this._onContextMenu = this._register(( new Emitter()));
         this.onContextMenu = this._onContextMenu.event;
         this._domHasFocus = false;
         this._register(addDisposableListener(this.container, "focus", () => this.onFocus()));
@@ -2687,7 +2692,7 @@ class AbstractTree {
                     deep
                 } = e;
                 if (node.collapsible && !deep && this.isDOMFocused()) {
-                    alert(node.collapsed ? ( localize(40, "collapsed")) : ( localize(41, "expanded")));
+                    alert(node.collapsed ? ( localize(42, "collapsed")) : ( localize(43, "expanded")));
                 }
             }));
         }

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

@@ -291,7 +291,7 @@ class AsyncFindController extends FindController {
         this.toggles.set(e.id, e.isChecked);
         this.filter.findMode = this.mode;
         this.filter.findMatchType = this.matchType;
-        this.placeholder = this.mode === TreeFindMode.Filter ? ( localize(42, "Type to filter")) : ( localize(43, "Type to search"));
+        this.placeholder = this.mode === TreeFindMode.Filter ? ( localize(44, "Type to filter")) : ( localize(45, "Type to search"));
         this.applyPattern(this.pattern);
     }
     shouldAllowFocus(node) {
@@ -1119,6 +1119,8 @@ class AsyncDataTree {
         };
     }
     dispose() {
+        this._onDidRender.dispose();
+        this._onDidChangeNodeSlowState.dispose();
         this.disposables.dispose();
         this.tree.dispose();
     }

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

@@ -4,7 +4,7 @@ import { localize } from '../../../../nls.js';
 
 class CollapseAllAction extends Action {
     constructor(viewer, enabled) {
-        super("vs.tree.collapse", ( localize(44, "Collapse All")), "collapse-all", enabled);
+        super("vs.tree.collapse", ( localize(46, "Collapse All")), "collapse-all", enabled);
         this.viewer = viewer;
     }
     async run() {

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

@@ -101,6 +101,10 @@ export declare class Separator implements IAction {
      * Joins all non-empty lists of actions with separators.
      */
     static join(...actionLists: readonly IAction[][]): IAction[];
+    /**
+     * Removes leading, trailing, and consecutive duplicate separators in-place and returns the actions.
+     */
+    static clean(actions: IAction[]): IAction[];
     static readonly ID = "vs.actions.separator";
     readonly id: string;
     readonly label: string;

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

@@ -151,6 +151,20 @@ class Separator {
         }
         return out;
     }
+    static clean(actions) {
+        while (actions.length > 0 && actions[0].id === Separator.ID) {
+            actions.shift();
+        }
+        while (actions.length > 0 && actions[actions.length - 1].id === Separator.ID) {
+            actions.pop();
+        }
+        for (let i = actions.length - 2; i >= 0; i--) {
+            if (actions[i].id === Separator.ID && actions[i + 1].id === Separator.ID) {
+                actions.splice(i + 1, 1);
+            }
+        }
+        return actions;
+    }
     static {
         this.ID = "vs.actions.separator";
     }
@@ -176,7 +190,7 @@ class EmptySubmenuAction extends Action {
         this.ID = "vs.actions.empty";
     }
     constructor() {
-        super(EmptySubmenuAction.ID, ( localize(45, "(empty)")), undefined, false);
+        super(EmptySubmenuAction.ID, ( localize(47, "(empty)")), undefined, false);
     }
 }
 function toAction(props) {

package/vscode/src/vs/base/common/codicons.d.ts

@@ -718,4 +718,6 @@ export declare const Codicon: {
     readonly ask: ThemeIcon;
     readonly openai: ThemeIcon;
     readonly claude: ThemeIcon;
+    readonly openInWindow: ThemeIcon;
+    readonly newSession: ThemeIcon;
 };

package/vscode/src/vs/base/common/codiconsLibrary.d.ts

@@ -644,4 +644,6 @@ export declare const codiconsLibrary: {
     readonly ask: import("./themables.js").ThemeIcon;
     readonly openai: import("./themables.js").ThemeIcon;
     readonly claude: import("./themables.js").ThemeIcon;
+    readonly openInWindow: import("./themables.js").ThemeIcon;
+    readonly newSession: import("./themables.js").ThemeIcon;
 };

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

@@ -647,6 +647,8 @@ const codiconsLibrary = {
     ask: register('ask', 0xec80),
     openai: register('openai', 0xec81),
     claude: register('claude', 0xec82),
+    openInWindow: register('open-in-window', 0xec83),
+    newSession: register('new-session', 0xec84),
 };
 
 export { codiconsLibrary };