@codingame/monaco-vscode-api 26.2.2 → 28.0.0

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

@@ -1,10 +1,11 @@
 
 import { registerCss } from '../../../../../../../css.js';
 import { BrowserFeatures } from '../../canIUse.js';
-import { $, hide, createElement, addStandardDisposableListener, clearNode, show, isHTMLElement, getDomNodePagePosition, getDomNodeZoomLevel, getTotalWidth, getTotalHeight, getActiveWindow, getActiveElement, getWindow, isAncestor } from '../../dom.js';
+import { isHTMLElement, getDomNodePagePosition, getDomNodeZoomLevel, $, hide, createElement, addStandardDisposableListener, clearNode, show, getActiveWindow, getTotalHeight, getTotalWidth, getActiveElement, getWindow, isAncestor } from '../../dom.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../common/lifecycle.js';
+import { layout2d, AnchorPosition, AnchorAlignment } from '../../../common/layout.js';
+export { AnchorAxisAlignment } from '../../../common/layout.js';
 import { isIOS } from '../../../common/platform.js';
-import { Range } from '../../../common/range.js';
 import * as contextview from './contextview.css';
 
 registerCss(contextview);
@@ -18,50 +19,30 @@ function isAnchor(obj) {
     const anchor = obj;
     return !!anchor && typeof anchor.x === "number" && typeof anchor.y === "number";
 }
-var AnchorAlignment;
-(function(AnchorAlignment) {
-    AnchorAlignment[AnchorAlignment["LEFT"] = 0] = "LEFT";
-    AnchorAlignment[AnchorAlignment["RIGHT"] = 1] = "RIGHT";
-})(AnchorAlignment || (AnchorAlignment = {}));
-var AnchorPosition;
-(function(AnchorPosition) {
-    AnchorPosition[AnchorPosition["BELOW"] = 0] = "BELOW";
-    AnchorPosition[AnchorPosition["ABOVE"] = 1] = "ABOVE";
-})(AnchorPosition || (AnchorPosition = {}));
-var AnchorAxisAlignment;
-(function(AnchorAxisAlignment) {
-    AnchorAxisAlignment[AnchorAxisAlignment["VERTICAL"] = 0] = "VERTICAL";
-    AnchorAxisAlignment[AnchorAxisAlignment["HORIZONTAL"] = 1] = "HORIZONTAL";
-})(AnchorAxisAlignment || (AnchorAxisAlignment = {}));
-var LayoutAnchorPosition;
-(function(LayoutAnchorPosition) {
-    LayoutAnchorPosition[LayoutAnchorPosition["Before"] = 0] = "Before";
-    LayoutAnchorPosition[LayoutAnchorPosition["After"] = 1] = "After";
-})(LayoutAnchorPosition || (LayoutAnchorPosition = {}));
-var LayoutAnchorMode;
-(function(LayoutAnchorMode) {
-    LayoutAnchorMode[LayoutAnchorMode["AVOID"] = 0] = "AVOID";
-    LayoutAnchorMode[LayoutAnchorMode["ALIGN"] = 1] = "ALIGN";
-})(LayoutAnchorMode || (LayoutAnchorMode = {}));
-function layout(viewportSize, viewSize, anchor) {
-    const layoutAfterAnchorBoundary = anchor.mode === LayoutAnchorMode.ALIGN ? anchor.offset : anchor.offset + anchor.size;
-    const layoutBeforeAnchorBoundary = anchor.mode === LayoutAnchorMode.ALIGN ? anchor.offset + anchor.size : anchor.offset;
-    if (anchor.position === LayoutAnchorPosition.Before) {
-        if (viewSize <= viewportSize - layoutAfterAnchorBoundary) {
-            return layoutAfterAnchorBoundary;
-        }
-        if (viewSize <= layoutBeforeAnchorBoundary) {
-            return layoutBeforeAnchorBoundary - viewSize;
-        }
-        return Math.max(viewportSize - viewSize, 0);
+function getAnchorRect(anchor) {
+    if (isHTMLElement(anchor)) {
+        const elementPosition = getDomNodePagePosition(anchor);
+        const zoom = getDomNodeZoomLevel(anchor);
+        return {
+            top: elementPosition.top * zoom,
+            left: elementPosition.left * zoom,
+            width: elementPosition.width * zoom,
+            height: elementPosition.height * zoom
+        };
+    } else if (isAnchor(anchor)) {
+        return {
+            top: anchor.y,
+            left: anchor.x,
+            width: anchor.width || 1,
+            height: anchor.height || 2
+        };
     } else {
-        if (viewSize <= layoutBeforeAnchorBoundary) {
-            return layoutBeforeAnchorBoundary - viewSize;
-        }
-        if (viewSize <= viewportSize - layoutAfterAnchorBoundary && layoutBeforeAnchorBoundary < viewSize / 2) {
-            return layoutAfterAnchorBoundary;
-        }
-        return 0;
+        return {
+            top: anchor.posy,
+            left: anchor.posx,
+            width: 2,
+            height: 2
+        };
     }
 }
 class ContextView extends Disposable {
@@ -169,87 +150,28 @@ class ContextView extends Disposable {
         if (!this.isVisible()) {
             return;
         }
-        const anchor = this.delegate.getAnchor();
-        let around;
-        if (isHTMLElement(anchor)) {
-            const elementPosition = getDomNodePagePosition(anchor);
-            const zoom = getDomNodeZoomLevel(anchor);
-            around = {
-                top: elementPosition.top * zoom,
-                left: elementPosition.left * zoom,
-                width: elementPosition.width * zoom,
-                height: elementPosition.height * zoom
-            };
-        } else if (isAnchor(anchor)) {
-            around = {
-                top: anchor.y,
-                left: anchor.x,
-                width: anchor.width || 1,
-                height: anchor.height || 2
-            };
-        } else {
-            around = {
-                top: anchor.posy,
-                left: anchor.posx,
-                width: 2,
-                height: 2
-            };
-        }
-        const viewSizeWidth = getTotalWidth(this.view);
-        const viewSizeHeight = getTotalHeight(this.view);
-        const anchorPosition = this.delegate.anchorPosition ?? AnchorPosition.BELOW;
-        const anchorAlignment = this.delegate.anchorAlignment ?? AnchorAlignment.LEFT;
-        const anchorAxisAlignment = this.delegate.anchorAxisAlignment ?? AnchorAxisAlignment.VERTICAL;
-        let top;
-        let left;
+        const anchor = getAnchorRect(this.delegate.getAnchor());
         const activeWindow = getActiveWindow();
-        if (anchorAxisAlignment === AnchorAxisAlignment.VERTICAL) {
-            const verticalAnchor = {
-                offset: around.top - activeWindow.pageYOffset,
-                size: around.height,
-                position: anchorPosition === AnchorPosition.BELOW ? LayoutAnchorPosition.Before : LayoutAnchorPosition.After
-            };
-            const horizontalAnchor = {
-                offset: around.left,
-                size: around.width,
-                position: anchorAlignment === AnchorAlignment.LEFT ? LayoutAnchorPosition.Before : LayoutAnchorPosition.After,
-                mode: LayoutAnchorMode.ALIGN
-            };
-            top = layout(activeWindow.innerHeight, viewSizeHeight, verticalAnchor) + activeWindow.pageYOffset;
-            if (Range.intersects({
-                start: top,
-                end: top + viewSizeHeight
-            }, {
-                start: verticalAnchor.offset,
-                end: verticalAnchor.offset + verticalAnchor.size
-            })) {
-                horizontalAnchor.mode = LayoutAnchorMode.AVOID;
-            }
-            left = layout(activeWindow.innerWidth, viewSizeWidth, horizontalAnchor);
-        } else {
-            const horizontalAnchor = {
-                offset: around.left,
-                size: around.width,
-                position: anchorAlignment === AnchorAlignment.LEFT ? LayoutAnchorPosition.Before : LayoutAnchorPosition.After
-            };
-            const verticalAnchor = {
-                offset: around.top,
-                size: around.height,
-                position: anchorPosition === AnchorPosition.BELOW ? LayoutAnchorPosition.Before : LayoutAnchorPosition.After,
-                mode: LayoutAnchorMode.ALIGN
-            };
-            left = layout(activeWindow.innerWidth, viewSizeWidth, horizontalAnchor);
-            if (Range.intersects({
-                start: left,
-                end: left + viewSizeWidth
-            }, {
-                start: horizontalAnchor.offset,
-                end: horizontalAnchor.offset + horizontalAnchor.size
-            })) {
-                verticalAnchor.mode = LayoutAnchorMode.AVOID;
-            }
-            top = layout(activeWindow.innerHeight, viewSizeHeight, verticalAnchor) + activeWindow.pageYOffset;
-        }
+        const viewport = {
+            top: activeWindow.pageYOffset,
+            width: activeWindow.innerWidth,
+            height: activeWindow.innerHeight
+        };
+        const view = {
+            width: getTotalWidth(this.view),
+            height: getTotalHeight(this.view)
+        };
+        const anchorPosition = this.delegate.anchorPosition;
+        const anchorAlignment = this.delegate.anchorAlignment;
+        const anchorAxisAlignment = this.delegate.anchorAxisAlignment;
+        const {
+            top,
+            left
+        } = layout2d(viewport, view, anchor, {
+            anchorAlignment,
+            anchorPosition,
+            anchorAxisAlignment
+        });
         this.view.classList.remove("top", "bottom", "left", "right");
         this.view.classList.add(anchorPosition === AnchorPosition.BELOW ? "bottom" : "top");
         this.view.classList.add(anchorAlignment === AnchorAlignment.LEFT ? "left" : "right");
@@ -328,4 +250,4 @@ const SHADOW_ROOT_CSS =  `
     :host-context(.linux:lang(ko)) { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; }
 `;
 
-export { AnchorAlignment, AnchorAxisAlignment, AnchorPosition, ContextView, ContextViewDOMPosition, LayoutAnchorMode, LayoutAnchorPosition, isAnchor, layout };
+export { AnchorAlignment, AnchorPosition, ContextView, ContextViewDOMPosition, getAnchorRect, isAnchor };

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

@@ -27,10 +27,12 @@
 	width: min-content;
 	min-width: 500px;
 	max-width: 90vw;
+	max-height: 90vh;
 	min-height: 75px;
 	padding: 10px;
 	transform: translate3d(0px, 0px, 0px);
-	border-radius: 3px;
+	border-radius: var(--vscode-cornerRadius-large);
+	box-shadow: var(--vscode-shadow-xl);
 }
 
 .monaco-dialog-box.align-vertical {
@@ -54,12 +56,18 @@
 	flex-grow: 1;
 	align-items: center;
 	padding: 0 10px;
+	min-height: 0; /* allow flex item to shrink below content size */
+	overflow: hidden;
 }
 
 .monaco-dialog-box.align-vertical .dialog-message-row {
 	flex-direction: column;
 }
 
+.monaco-dialog-box.align-vertical .dialog-message-row .dialog-message-container {
+	min-height: 0; /* allow flex item to shrink below content size in column layout */
+}
+
 .monaco-dialog-box .dialog-message-row > .dialog-icon.codicon {
 	flex: 0 0 48px;
 	height: 48px;
@@ -76,12 +84,17 @@
 	align-self: baseline;
 }
 
+.monaco-dialog-box:not(.align-vertical) .dialog-message-row .dialog-message-container {
+	align-self: stretch; /* fill row height so overflow-y scrolling works */
+}
+
 /** Dialog: Message/Footer Container */
 .monaco-dialog-box .dialog-message-row .dialog-message-container,
 .monaco-dialog-box .dialog-footer-row {
 	display: flex;
 	flex-direction: column;
-	overflow: hidden;
+	overflow-y: auto;
+	overflow-x: hidden;
 	text-overflow: ellipsis;
 	user-select: text;
 	-webkit-user-select: text;
@@ -238,3 +251,7 @@
 .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-dropdown-button {
 	padding: 0 4px;
 }
+
+.monaco-dialog-modal-block .dialog-shadow {
+	border-radius: var(--vscode-cornerRadius-large);
+}

package/vscode/src/vs/base/browser/ui/dialog/dialog.d.ts

@@ -42,6 +42,7 @@ export interface IDialogOptions {
     readonly disableCloseAction?: boolean;
     readonly disableCloseButton?: boolean;
     readonly disableDefaultAction?: boolean;
+    readonly onVisibilityChange?: (window: Window, visible: boolean) => void;
     readonly buttonStyles: IButtonStyles;
     readonly checkboxStyles: ICheckboxStyles;
     readonly inputBoxStyles: IInputBoxStyles;

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

@@ -385,6 +385,8 @@ class Dialog extends Disposable {
                 "monaco-dialog-icon monaco-dialog-message-text monaco-dialog-message-detail monaco-dialog-message-body monaco-dialog-footer"
             );
             show(this.element);
+            this.options.onVisibilityChange?.(window, true);
+            this._register(toDisposable(() => this.options.onVisibilityChange?.(window, false)));
             if (this.inputs.length > 0) {
                 this.inputs[0].focus();
                 this.inputs[0].select();

package/vscode/src/vs/base/browser/ui/dropdown/dropdown.css

@@ -20,6 +20,11 @@
 	cursor: default;
 }
 
+.monaco-dropdown .dropdown-menu {
+	border-radius: var(--vscode-cornerRadius-large);
+	box-shadow: var(--vscode-shadow-lg);
+}
+
 .monaco-dropdown-with-primary {
 	display: flex !important;
 	flex-direction: row;

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

@@ -3,13 +3,14 @@ import { registerCss } from '../../../../../../../css.js';
 import { append, $, EventType, addDisposableListener, EventHelper, isMouseEvent } from '../../dom.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { EventType as EventType$1, Gesture } from '../../touch.js';
-import { AnchorAlignment } from '../contextview/contextview.js';
+import '../contextview/contextview.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { ActionRunner } from '../../../common/actions.js';
 import { Emitter } from '../../../common/event.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import * as dropdown from './dropdown.css';
+import { AnchorAlignment } from '../../../common/layout.js';
 
 registerCss(dropdown);
 class BaseDropdown extends ActionRunner {

package/vscode/src/vs/base/browser/ui/grid/grid.d.ts

@@ -275,8 +275,9 @@ export declare class Grid<T extends IView = IView> extends Disposable {
     /**
      * Maximizes the specified view and hides all other views.
      * @param view The view to maximize.
+     * @param excludeViews Optional array of views to exclude from being hidden.
      */
-    maximizeView(view: T): void;
+    maximizeView(view: T, excludeViews?: readonly T[]): void;
     exitMaximizedView(): void;
     /**
      * Expand the size of a {@link IView view} by collapsing all other views

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

@@ -321,12 +321,12 @@ class Grid extends Disposable {
         const location = this.getViewLocation(view);
         return this.gridview.getViewCachedVisibleSize(location);
     }
-    maximizeView(view) {
+    maximizeView(view, excludeViews = []) {
         if (this.views.size < 2) {
             throw ( new Error("At least two views are required to maximize a view"));
         }
         const location = this.getViewLocation(view);
-        this.gridview.maximizeView(location);
+        this.gridview.maximizeView(location, excludeViews);
     }
     exitMaximizedView() {
         this.gridview.exitMaximizedView();

package/vscode/src/vs/base/browser/ui/grid/gridview.d.ts

@@ -521,7 +521,7 @@ export declare class GridView implements IDisposable {
      * @param location The {@link GridLocation location} of the view.
      */
     isViewExpanded(location: GridLocation): boolean;
-    maximizeView(location: GridLocation): void;
+    maximizeView(location: GridLocation, excludeViews?: readonly IView[]): void;
     exitMaximizedView(): void;
     hasMaximizedView(): boolean;
     /**

package/vscode/src/vs/base/browser/ui/grid/gridview.js

@@ -466,6 +466,7 @@ class BranchNode {
             child.dispose();
         }
         this._onDidChange.dispose();
+        this._onDidScroll.dispose();
         this._onDidSashReset.dispose();
         this._onDidVisibilityChange.dispose();
         this.childrenVisibilityChangeDisposable.dispose();
@@ -625,6 +626,7 @@ class LeafNode {
         this.view.setVisible?.(visible);
     }
     dispose() {
+        this._onDidSetLinkedNode.dispose();
         this.disposables.dispose();
     }
 }
@@ -1001,7 +1003,7 @@ class GridView {
         }
         return true;
     }
-    maximizeView(location) {
+    maximizeView(location, excludeViews = []) {
         const [, nodeToMaximize] = this.getNode(location);
         if (!(nodeToMaximize instanceof LeafNode)) {
             throw ( new Error("Location is not a LeafNode"));
@@ -1012,11 +1014,12 @@ class GridView {
         if (this.hasMaximizedView()) {
             this.exitMaximizedView();
         }
+        const excludeViewSet = ( new Set(excludeViews));
         function hideAllViewsBut(parent, exclude) {
             for (let i = 0; i < parent.children.length; i++) {
                 const child = parent.children[i];
                 if (child instanceof LeafNode) {
-                    if (child !== exclude) {
+                    if (child !== exclude && !( excludeViewSet.has(child.view))) {
                         parent.setChildVisible(i, false);
                     }
                 } else {
@@ -1213,6 +1216,7 @@ class GridView {
         }
     }
     dispose() {
+        this._onDidChangeViewMaximized.dispose();
         this.onDidSashResetRelay.dispose();
         this.root.dispose();
         this.element.remove();

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

@@ -103,4 +103,5 @@
 	background-repeat: no-repeat;
 	width: 16px;
 	height: 16px;
+	color: var(--vscode-icon-foreground);
 }

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

@@ -1,12 +1,12 @@
 
 import { registerCss } from '../../../../../../../css.js';
-import { $ as $$1, append, getTotalHeight, isActiveElement, getTotalWidth } from '../../dom.js';
+import { $ as $$1, append, isShadowRoot, getTotalHeight, isActiveElement, getTotalWidth } from '../../dom.js';
 import { asCssValueWithDefault } from '../../cssValue.js';
 import { DomEmitter } from '../../event.js';
 import { renderFormattedText, renderText } from '../../formattedTextRenderer.js';
 import { ActionBar } from '../actionbar/actionbar.js';
 import { alert, status } from '../aria/aria.js';
-import { AnchorAlignment } from '../contextview/contextview.js';
+import '../contextview/contextview.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 import { ScrollableElement } from '../scrollbar/scrollableElement.js';
 import { Widget } from '../widget.js';
@@ -18,6 +18,7 @@ import * as inputBox from './inputBox.css';
 import { localize } from '../../../../nls.js';
 import { MutableDisposable } from '../../../common/lifecycle.js';
 import { mainWindow } from '../../window.js';
+import { AnchorAlignment } from '../../../common/layout.js';
 
 registerCss(inputBox);
 const $ = $$1;
@@ -90,7 +91,11 @@ class InputBox extends Widget {
             this._register(this.scrollableElement.onScroll(e => this.input.scrollTop = e.scrollTop));
             const onSelectionChange = this._register(( new DomEmitter(container.ownerDocument, "selectionchange")));
             const onAnchoredSelectionChange = Event.filter(onSelectionChange.event, () => {
-                const selection = container.getRootNode().getSelection();
+                let selection = container.ownerDocument.getSelection();
+                const rootNode = container.getRootNode();
+                if (isShadowRoot(rootNode)) {
+                    selection = rootNode.getSelection?.() ?? selection;
+                }
                 return selection?.anchorNode === wrapper;
             });
             this._register(onAnchoredSelectionChange(this.updateScrollDimensions, this));

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

@@ -183,6 +183,7 @@ class ListView {
                 scrollWidth: this.renderWidth
             });
             this.rowsContainer.style.width = "";
+            this.domNode.style.removeProperty("--list-scroll-right-offset");
         }
     }
     constructor(container, virtualDelegate, renderers, options = DefaultOptions) {
@@ -201,8 +202,8 @@ class ListView {
         this.onDragLeaveTimeout = Disposable.None;
         this.currentSelectionDisposable = Disposable.None;
         this.disposables = ( new DisposableStore());
-        this._onDidChangeContentHeight = ( new Emitter());
-        this._onDidChangeContentWidth = ( new Emitter());
+        this._onDidChangeContentHeight = this.disposables.add(( new Emitter()));
+        this._onDidChangeContentWidth = this.disposables.add(( new Emitter()));
         this.onDidChangeContentHeight = Event.latch(this._onDidChangeContentHeight.event, undefined, this.disposables);
         this.onDidChangeContentWidth = Event.latch(this._onDidChangeContentWidth.event, undefined, this.disposables);
         this._horizontalScrolling = false;
@@ -661,6 +662,10 @@ class ListView {
             this.scrollableElement.setScrollDimensions({
                 width: typeof width === "number" ? width : getContentWidth(this.domNode)
             });
+            const scrollPos = this.scrollableElement.getScrollPosition();
+            const scrollDims = this.scrollableElement.getScrollDimensions();
+            const rightOffset = Math.max(0, scrollDims.scrollWidth - scrollPos.scrollLeft - this.renderWidth);
+            this.domNode.style.setProperty("--list-scroll-right-offset", `${Math.max(rightOffset - 12, 0)}px`);
         }
     }
     render(
@@ -699,6 +704,8 @@ class ListView {
         this.rowsContainer.style.top = `-${renderTop}px`;
         if (this.horizontalScrolling && scrollWidth !== undefined) {
             this.rowsContainer.style.width = `${Math.max(scrollWidth, this.renderWidth)}px`;
+            const rightOffset = Math.max(0, scrollWidth - (renderLeft ?? 0) - this.renderWidth);
+            this.domNode.style.setProperty("--list-scroll-right-offset", `${Math.max(rightOffset - 12, 0)}px`);
         }
         this.lastRenderTop = renderTop;
         this.lastRenderHeight = renderHeight;

package/vscode/src/vs/base/browser/ui/menu/menu.d.ts

@@ -1,10 +1,10 @@
 import { ActionBar, IActionViewItemProvider } from "../actionbar/actionbar.js";
-import { AnchorAlignment } from "../contextview/contextview.js";
 import { IAction, IActionRunner } from "../../../common/actions.js";
 import { ThemeIcon } from "../../../common/themables.js";
 import { Event } from "../../../common/event.js";
 import { ResolvedKeybinding } from "../../../common/keybindings.js";
 import { ScrollEvent } from "../../../common/scrollable.js";
+import { AnchorAlignment } from "../../../common/layout.js";
 export declare const MENU_MNEMONIC_REGEX: RegExp;
 export declare const MENU_ESCAPED_MNEMONIC_REGEX: RegExp;
 export declare enum HorizontalDirection {

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

@@ -7,7 +7,6 @@ import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { StandardMouseEvent } from '../../mouseEvent.js';
 import { ActionBar, ActionsOrientation } from '../actionbar/actionbar.js';
 import { BaseActionViewItem, ActionViewItem } from '../actionbar/actionViewItems.js';
-import { layout, LayoutAnchorPosition } from '../contextview/contextview.js';
 import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
 import { Separator, SubmenuAction, EmptySubmenuAction } from '../../../common/actions.js';
 import { RunOnceScheduler } from '../../../common/async.js';
@@ -20,6 +19,7 @@ import { DisposableStore } from '../../../common/lifecycle.js';
 import { isMacintosh, isLinux } from '../../../common/platform.js';
 import { ScrollbarVisibility } from '../../../common/scrollable.js';
 import { escape, ltrim, rtrim } from '../../../common/strings.js';
+import { layout, LayoutAnchorPosition } from '../../../common/layout.js';
 
 const MENU_MNEMONIC_REGEX = /\(&([^\s&])\)|(^|[^&])&([^\s&])/;
 const MENU_ESCAPED_MNEMONIC_REGEX = /(&)?(&)([^\s&])/g;
@@ -34,6 +34,7 @@ var VerticalDirection;
     VerticalDirection[VerticalDirection["Below"] = 1] = "Below";
 })(VerticalDirection || (VerticalDirection = {}));
 const unthemedMenuStyles = {
+    shadowColor: undefined,
     scrollbarShadow: undefined,
     scrollbarSliderBackground: undefined,
     scrollbarSliderHoverBackground: undefined,
@@ -219,13 +220,11 @@ class Menu extends ActionBar {
         const fgColor = style.foregroundColor ?? "";
         const bgColor = style.backgroundColor ?? "";
         const border = style.borderColor ? `1px solid ${style.borderColor}` : "";
-        const borderRadius = "5px";
-        const shadow = style.shadowColor ? `0 2px 8px ${style.shadowColor}` : "";
+        const borderRadius = "var(--vscode-cornerRadius-large)";
         scrollElement.style.outline = border;
         scrollElement.style.borderRadius = borderRadius;
         scrollElement.style.color = fgColor;
         scrollElement.style.backgroundColor = bgColor;
-        scrollElement.style.boxShadow = shadow;
     }
     getContainer() {
         return this.scrollableElement.getDomNode();
@@ -639,7 +638,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
             position: expandDirection.horizontal === HorizontalDirection.Right ? LayoutAnchorPosition.Before : LayoutAnchorPosition.After,
             offset: entry.left,
             size: entry.width
-        });
+        }).position;
         if (ret.left >= entry.left && ret.left < entry.left + entry.width) {
             if (entry.left + 10 + submenu.width <= windowDimensions.width) {
                 ret.left = entry.left + 10;
@@ -651,7 +650,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
             position: LayoutAnchorPosition.Before,
             offset: entry.top,
             size: 0
-        });
+        }).position;
         if (ret.top + submenu.height === entry.top && ret.top + entry.height + submenu.height <= windowDimensions.height) {
             ret.top += entry.height;
         }
@@ -770,7 +769,7 @@ function getMenuWidgetCSS(style, isForShadowDom) {
     let result =  `
 .monaco-menu {
     font-size: 13px;
-    border-radius: 5px;
+    border-radius: var(--vscode-cornerRadius-large);
     min-width: 160px;
 }
 
@@ -885,11 +884,11 @@ ${formatRule(Codicon.menuSubmenu)}
 .monaco-menu .monaco-action-bar.vertical .action-menu-item {
     flex: 1 1 auto;
     display: flex;
-    height: 2em;
+    height: 24px;
     align-items: center;
     position: relative;
     margin: 0 4px;
-    border-radius: 4px;
+    border-radius: var(--vscode-cornerRadius-medium);
 }
 
 .monaco-menu .monaco-action-bar.vertical .action-menu-item:hover .keybinding,
@@ -989,6 +988,9 @@ ${formatRule(Codicon.menuSubmenu)}
     border: none;
     animation: fadeIn 0.083s linear;
     -webkit-app-region: no-drag;
+    box-shadow: var(--vscode-shadow-lg${style.shadowColor ? `, 0 0 12px ${style.shadowColor}` : ""});
+    border-radius: var(--vscode-cornerRadius-large);
+    overflow: hidden;
 }
 
 .context-view.monaco-menu-container :focus,
@@ -1018,7 +1020,7 @@ ${formatRule(Codicon.menuSubmenu)}
 }
 
 .monaco-menu .monaco-action-bar.vertical .action-menu-item {
-    height: 2em;
+    height: 24px;
 }
 
 .monaco-menu .monaco-action-bar.vertical .action-label:not(.separator),

package/vscode/src/vs/base/browser/ui/progressbar/progressbar.d.ts

@@ -1,5 +1,6 @@
 import { Disposable } from "../../../common/lifecycle.js";
 export interface IProgressBarOptions extends IProgressBarStyles {
+    ariaLabel?: string;
 }
 export interface IProgressBarStyles {
     progressBarBackground: string | undefined;

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

@@ -5,6 +5,7 @@ import { getProgressAccessibilitySignalScheduler } from './progressAccessibility
 import { RunOnceScheduler } from '../../../common/async.js';
 import { Disposable, MutableDisposable } from '../../../common/lifecycle.js';
 import { isNumber } from '../../../common/types.js';
+import { localize } from '../../../../nls.js';
 import * as progressbar from './progressbar.css';
 
 registerCss(progressbar);
@@ -13,6 +14,7 @@ const CSS_ACTIVE = "active";
 const CSS_INFINITE = "infinite";
 const CSS_INFINITE_LONG_RUNNING = "infinite-long-running";
 const CSS_DISCRETE = "discrete";
+const NLS_PROGRESS_LABEL = ( localize(29, "Progress"));
 class ProgressBar extends Disposable {
     static {
         this.LONG_RUNNING_INFINITE_THRESHOLD = 10000;
@@ -36,6 +38,10 @@ class ProgressBar extends Disposable {
         this.element.classList.add("monaco-progress-container");
         this.element.setAttribute("role", "progressbar");
         this.element.setAttribute("aria-valuemin", "0");
+        this.element.setAttribute(
+            "aria-label",
+            options?.ariaLabel && options.ariaLabel.trim() ? options.ariaLabel : NLS_PROGRESS_LABEL
+        );
         container.appendChild(this.element);
         this.bit = createElement("div");
         this.bit.classList.add("progress-bit");

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

@@ -6,7 +6,7 @@
 .monaco-select-box {
 	width: 100%;
 	cursor: pointer;
-	border-radius: 4px;
+	border-radius: var(--vscode-cornerRadius-small);
 }
 
 .monaco-select-box-dropdown-container {
@@ -30,6 +30,6 @@
 
 .mac .monaco-action-bar .action-item .monaco-select-box {
 	font-size: 11px;
-	border-radius: 4px;
+	border-radius: var(--vscode-cornerRadius-small);
 	min-height: 24px;
 }

package/vscode/src/vs/base/browser/ui/selectBox/selectBox.d.ts

@@ -30,6 +30,7 @@ export interface ISelectOptionItem {
     descriptionIsMarkdown?: boolean;
     readonly descriptionMarkdownActionHandler?: MarkdownActionHandler;
     isDisabled?: boolean;
+    isSeparator?: boolean;
 }
 export declare const SeparatorSelectOption: Readonly<ISelectOptionItem>;
 export interface ISelectBoxStyles extends IListStyles {