@codingame/monaco-vscode-api 20.4.1 → 21.0.0

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

@@ -222,8 +222,10 @@ class ContextView extends Disposable {
         this.view.classList.add(anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
         this.view.classList.toggle('fixed', this.useFixedPosition);
         const containerPosition = getDomNodePagePosition(this.container);
-        this.view.style.top = `${top - (this.useFixedPosition ? getDomNodePagePosition(this.view).top : containerPosition.top)}px`;
-        this.view.style.left = `${left - (this.useFixedPosition ? getDomNodePagePosition(this.view).left : containerPosition.left)}px`;
+        const containerScrollTop = this.container.scrollTop || 0;
+        const containerScrollLeft = this.container.scrollLeft || 0;
+        this.view.style.top = `${top - (this.useFixedPosition ? getDomNodePagePosition(this.view).top : containerPosition.top) + containerScrollTop}px`;
+        this.view.style.left = `${left - (this.useFixedPosition ? getDomNodePagePosition(this.view).left : containerPosition.left) + containerScrollLeft}px`;
         this.view.style.width = 'initial';
     }
     hide(data) {

package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.d.ts

@@ -27,7 +27,7 @@ export declare class DropdownMenuActionViewItem extends BaseActionViewItem {
     private contextMenuProvider;
     private actionItem;
     private _onDidChangeVisibility;
-    readonly onDidChangeVisibility: import("../../../common/event.js").Event<boolean>;
+    get onDidChangeVisibility(): import("../../../common/event.js").Event<boolean>;
     protected readonly options: IDropdownMenuActionViewItemOptions;
     constructor(action: IAction, menuActionsOrProvider: readonly IAction[] | IActionProvider, contextMenuProvider: IContextMenuProvider, options?: IDropdownMenuActionViewItemOptions);
     render(container: HTMLElement): void;

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

@@ -16,11 +16,11 @@ import { DropdownMenu } from './dropdown.js';
 
 registerCss(dropdown);
 class DropdownMenuActionViewItem extends BaseActionViewItem {
+    get onDidChangeVisibility() { return this._onDidChangeVisibility.event; }
     constructor(action, menuActionsOrProvider, contextMenuProvider, options = Object.create(null)) {
         super(null, action, options);
         this.actionItem = null;
         this._onDidChangeVisibility = this._register(( new Emitter()));
-        this.onDidChangeVisibility = this._onDidChangeVisibility.event;
         this.menuActionsOrProvider = menuActionsOrProvider;
         this.contextMenuProvider = contextMenuProvider;
         this.options = options;

package/vscode/src/vs/base/browser/ui/findinput/findInput.d.ts

@@ -42,19 +42,19 @@ export declare class FindInput extends Widget {
     readonly domNode: HTMLElement;
     readonly inputBox: HistoryInputBox;
     private readonly _onDidOptionChange;
-    readonly onDidOptionChange: Event<boolean>;
+    get onDidOptionChange(): Event<boolean>;
     private readonly _onKeyDown;
-    readonly onKeyDown: Event<IKeyboardEvent>;
+    get onKeyDown(): Event<IKeyboardEvent>;
     private readonly _onMouseDown;
-    readonly onMouseDown: Event<IMouseEvent>;
+    get onMouseDown(): Event<IMouseEvent>;
     private readonly _onInput;
-    readonly onInput: Event<void>;
+    get onInput(): Event<void>;
     private readonly _onKeyUp;
-    readonly onKeyUp: Event<IKeyboardEvent>;
+    get onKeyUp(): Event<IKeyboardEvent>;
     private _onCaseSensitiveKeyDown;
-    readonly onCaseSensitiveKeyDown: Event<IKeyboardEvent>;
+    get onCaseSensitiveKeyDown(): Event<IKeyboardEvent>;
     private _onRegexKeyDown;
-    readonly onRegexKeyDown: Event<IKeyboardEvent>;
+    get onRegexKeyDown(): Event<IKeyboardEvent>;
     constructor(parent: HTMLElement | null, contextViewProvider: IContextViewProvider | undefined, options: IFindInputOptions);
     get isImeSessionInProgress(): boolean;
     get onDidChange(): Event<string>;

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

@@ -15,6 +15,13 @@ registerCss(findInput);
 const NLS_DEFAULT_LABEL = ( localize(10, "input"));
 class FindInput extends Widget {
     static { this.OPTION_CHANGE = 'optionChange'; }
+    get onDidOptionChange() { return this._onDidOptionChange.event; }
+    get onKeyDown() { return this._onKeyDown.event; }
+    get onMouseDown() { return this._onMouseDown.event; }
+    get onInput() { return this._onInput.event; }
+    get onKeyUp() { return this._onKeyUp.event; }
+    get onCaseSensitiveKeyDown() { return this._onCaseSensitiveKeyDown.event; }
+    get onRegexKeyDown() { return this._onRegexKeyDown.event; }
     constructor(parent, contextViewProvider, options) {
         super();
         this.fixFocusOnOptionClickEnabled = true;
@@ -22,19 +29,12 @@ class FindInput extends Widget {
         this.additionalTogglesDisposables = this._register(( new MutableDisposable()));
         this.additionalToggles = [];
         this._onDidOptionChange = this._register(( new Emitter()));
-        this.onDidOptionChange = this._onDidOptionChange.event;
         this._onKeyDown = this._register(( new Emitter()));
-        this.onKeyDown = this._onKeyDown.event;
         this._onMouseDown = this._register(( new Emitter()));
-        this.onMouseDown = this._onMouseDown.event;
         this._onInput = this._register(( new Emitter()));
-        this.onInput = this._onInput.event;
         this._onKeyUp = this._register(( new Emitter()));
-        this.onKeyUp = this._onKeyUp.event;
         this._onCaseSensitiveKeyDown = this._register(( new Emitter()));
-        this.onCaseSensitiveKeyDown = this._onCaseSensitiveKeyDown.event;
         this._onRegexKeyDown = this._register(( new Emitter()));
-        this.onRegexKeyDown = this._onRegexKeyDown.event;
         this._lastHighlightFindOptions = 0;
         this.placeholder = options.placeholder || '';
         this.validation = options.validation;

package/vscode/src/vs/base/browser/ui/findinput/replaceInput.d.ts

@@ -33,17 +33,17 @@ export declare class ReplaceInput extends Widget {
     domNode: HTMLElement;
     inputBox: HistoryInputBox;
     private readonly _onDidOptionChange;
-    readonly onDidOptionChange: Event<boolean>;
+    get onDidOptionChange(): Event<boolean>;
     private readonly _onKeyDown;
-    readonly onKeyDown: Event<IKeyboardEvent>;
+    get onKeyDown(): Event<IKeyboardEvent>;
     private readonly _onMouseDown;
-    readonly onMouseDown: Event<IMouseEvent>;
+    get onMouseDown(): Event<IMouseEvent>;
     private readonly _onInput;
-    readonly onInput: Event<void>;
+    get onInput(): Event<void>;
     private readonly _onKeyUp;
-    readonly onKeyUp: Event<IKeyboardEvent>;
+    get onKeyUp(): Event<IKeyboardEvent>;
     private _onPreserveCaseKeyDown;
-    readonly onPreserveCaseKeyDown: Event<IKeyboardEvent>;
+    get onPreserveCaseKeyDown(): Event<IKeyboardEvent>;
     constructor(parent: HTMLElement | null, contextViewProvider: IContextViewProvider | undefined, _showOptionButtons: boolean, options: IReplaceInputOptions);
     enable(): void;
     disable(): void;

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

@@ -29,23 +29,23 @@ class PreserveCaseToggle extends Toggle {
 }
 class ReplaceInput extends Widget {
     static { this.OPTION_CHANGE = 'optionChange'; }
+    get onDidOptionChange() { return this._onDidOptionChange.event; }
+    get onKeyDown() { return this._onKeyDown.event; }
+    get onMouseDown() { return this._onMouseDown.event; }
+    get onInput() { return this._onInput.event; }
+    get onKeyUp() { return this._onKeyUp.event; }
+    get onPreserveCaseKeyDown() { return this._onPreserveCaseKeyDown.event; }
     constructor(parent, contextViewProvider, _showOptionButtons, options) {
         super();
         this._showOptionButtons = _showOptionButtons;
         this.fixFocusOnOptionClickEnabled = true;
         this.cachedOptionsWidth = 0;
         this._onDidOptionChange = this._register(( new Emitter()));
-        this.onDidOptionChange = this._onDidOptionChange.event;
         this._onKeyDown = this._register(( new Emitter()));
-        this.onKeyDown = this._onKeyDown.event;
         this._onMouseDown = this._register(( new Emitter()));
-        this.onMouseDown = this._onMouseDown.event;
         this._onInput = this._register(( new Emitter()));
-        this.onInput = this._onInput.event;
         this._onKeyUp = this._register(( new Emitter()));
-        this.onKeyUp = this._onKeyUp.event;
         this._onPreserveCaseKeyDown = this._register(( new Emitter()));
-        this.onPreserveCaseKeyDown = this._onPreserveCaseKeyDown.event;
         this._lastHighlightFindOptions = 0;
         this.contextViewProvider = contextViewProvider;
         this.placeholder = options.placeholder || '';

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

@@ -138,6 +138,7 @@
 
 .monaco-hover .hover-row.status-bar .actions .action-container .action .icon {
 	padding-right: 4px;
+	vertical-align: middle;
 }
 
 .monaco-hover .hover-row.status-bar .actions .action-container a {
@@ -145,6 +146,10 @@
 	text-decoration: var(--text-link-decoration);
 }
 
+.monaco-hover .hover-row.status-bar .actions .action-container a .icon.codicon {
+	color: var(--vscode-textLink-foreground);
+}
+
 .monaco-hover .markdown-hover .hover-contents .codicon {
 	color: inherit;
 	font-size: inherit;

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

@@ -49,7 +49,8 @@ class HoverAction extends Disposable {
         this.action = append(this.actionContainer, $('a.action'));
         this.action.setAttribute('role', 'button');
         if (actionOptions.iconClass) {
-            append(this.action, $(`span.icon.${actionOptions.iconClass}`));
+            const iconElement = append(this.action, $(`span.icon`));
+            iconElement.classList.add(...actionOptions.iconClass.split(' '));
         }
         this.actionRenderedLabel = keybindingLabel ? `${actionOptions.label} (${keybindingLabel})` : actionOptions.label;
         const label = append(this.action, $('span'));

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

@@ -198,14 +198,14 @@ class Label {
         this.options = options;
         if (typeof label === 'string') {
             if (!this.singleLabel) {
-                this.container.innerText = '';
+                this.container.textContent = '';
                 this.container.classList.remove('multiple');
                 this.singleLabel = append(this.container, $('a.label-name', { id: options?.domId }));
             }
             this.singleLabel.textContent = label;
         }
         else {
-            this.container.innerText = '';
+            this.container.textContent = '';
             this.container.classList.add('multiple');
             this.singleLabel = undefined;
             for (let i = 0; i < label.length; i++) {
@@ -250,7 +250,7 @@ class LabelWithHighlights extends Disposable {
         this.options = options;
         if (typeof label === 'string') {
             if (!this.singleLabel) {
-                this.container.innerText = '';
+                this.container.textContent = '';
                 this.container.classList.remove('multiple');
                 this.singleLabel = this._register(( new HighlightedLabel(
                     append(this.container, $('a.label-name', { id: options?.domId })),
@@ -260,7 +260,7 @@ class LabelWithHighlights extends Disposable {
             this.singleLabel.set(label, options?.matches, undefined, options?.labelEscapeNewLines);
         }
         else {
-            this.container.innerText = '';
+            this.container.textContent = '';
             this.container.classList.add('multiple');
             this.singleLabel = undefined;
             const separator = options?.separator || '/';

package/vscode/src/vs/base/browser/ui/inputbox/inputBox.d.ts

@@ -72,9 +72,9 @@ export declare class InputBox extends Widget {
     private scrollableElement;
     private readonly hover;
     private _onDidChange;
-    readonly onDidChange: Event<string>;
+    get onDidChange(): Event<string>;
     private _onDidHeightChange;
-    readonly onDidHeightChange: Event<number>;
+    get onDidHeightChange(): Event<number>;
     constructor(container: HTMLElement, contextViewProvider: IContextViewProvider | undefined, options: IInputOptions);
     protected onBlur(): void;
     protected onFocus(): void;

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

@@ -41,15 +41,15 @@ const unthemedInboxStyles = {
     inputValidationWarningForeground: undefined
 };
 class InputBox extends Widget {
+    get onDidChange() { return this._onDidChange.event; }
+    get onDidHeightChange() { return this._onDidHeightChange.event; }
     constructor(container, contextViewProvider, options) {
         super();
         this.state = 'idle';
         this.maxHeight = Number.POSITIVE_INFINITY;
         this.hover = this._register(( new MutableDisposable()));
         this._onDidChange = this._register(( new Emitter()));
-        this.onDidChange = this._onDidChange.event;
         this._onDidHeightChange = this._register(( new Emitter()));
-        this.onDidHeightChange = this._onDidHeightChange.event;
         this.contextViewProvider = contextViewProvider;
         this.options = options;
         this.message = null;

package/vscode/src/vs/base/browser/ui/list/listWidget.d.ts

@@ -29,10 +29,10 @@ export declare function isSelectionRangeChangeEvent(event: IListMouseEvent<any>
 export declare class MouseController<T> implements IDisposable {
     protected list: List<T>;
     private multipleSelectionController;
-    private mouseSupport;
+    private readonly mouseSupport;
     private readonly disposables;
-    private _onPointer;
-    readonly onPointer: Event<IListMouseEvent<T>>;
+    private readonly _onPointer;
+    get onPointer(): Event<IListMouseEvent<T>>;
     constructor(list: List<T>);
     updateOptions(optionsUpdate: IListOptionsUpdate): void;
     protected isSelectionSingleChangeEvent(event: IListMouseEvent<any> | IListTouchEvent<any>): boolean;

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

@@ -84,6 +84,7 @@ class TraitRenderer {
     }
 }
 class Trait {
+    get onChange() { return this._onChange.event; }
     get name() { return this._trait; }
     get renderer() {
         return ( new TraitRenderer(this));
@@ -93,7 +94,6 @@ class Trait {
         this.indexes = [];
         this.sortedIndexes = [];
         this._onChange = ( new Emitter());
-        this.onChange = this._onChange.event;
     }
     splice(start, deleteCount, elements) {
         const diff = elements.length - deleteCount;
@@ -516,11 +516,11 @@ const DefaultMultipleSelectionController = {
     isSelectionRangeChangeEvent
 };
 class MouseController {
+    get onPointer() { return this._onPointer.event; }
     constructor(list) {
         this.list = list;
         this.disposables = ( new DisposableStore());
-        this._onPointer = ( new Emitter());
-        this.onPointer = this._onPointer.event;
+        this._onPointer = this.disposables.add(( new Emitter()));
         if (list.options.multipleSelectionSupport !== false) {
             this.multipleSelectionController = this.list.options.multipleSelectionController || DefaultMultipleSelectionController;
         }

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

@@ -67,3 +67,4 @@ export declare class Menu extends ActionBar {
 }
 export declare function cleanMnemonic(label: string): string;
 export declare function formatRule(c: ThemeIcon): string;
+export declare function getMenuWidgetCSS(style: IMenuStyles, isForShadowDom: boolean): string;

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

@@ -33,6 +33,12 @@ var VerticalDirection;
     VerticalDirection[VerticalDirection["Above"] = 0] = "Above";
     VerticalDirection[VerticalDirection["Below"] = 1] = "Below";
 })(VerticalDirection || (VerticalDirection = {}));
+const unthemedMenuStyles = {
+    scrollbarShadow: undefined,
+    scrollbarSliderBackground: undefined,
+    scrollbarSliderHoverBackground: undefined,
+    scrollbarSliderActiveBackground: undefined
+};
 class Menu extends ActionBar {
     constructor(container, actions, options, menuStyles) {
         container.classList.add('monaco-menu-container');
@@ -288,16 +294,12 @@ class Menu extends ActionBar {
             return menuActionViewItem;
         }
         else {
-            const menuItemOptions = { enableMnemonics: options.enableMnemonics, useEventAsContext: options.useEventAsContext };
-            if (options.getKeyBinding) {
-                const keybinding = options.getKeyBinding(action);
-                if (keybinding) {
-                    const keybindingLabel = keybinding.getLabel();
-                    if (keybindingLabel) {
-                        menuItemOptions.keybinding = keybindingLabel;
-                    }
-                }
-            }
+            const keybindingLabel = options.getKeyBinding?.(action)?.getLabel();
+            const menuItemOptions = {
+                enableMnemonics: options.enableMnemonics,
+                useEventAsContext: options.useEventAsContext,
+                keybinding: keybindingLabel,
+            };
             const menuActionViewItem = ( new BaseMenuActionViewItem(options.context, action, menuItemOptions, this.menuStyles));
             if (options.enableMnemonics) {
                 const mnemonic = menuActionViewItem.getMnemonic();
@@ -316,12 +318,15 @@ class Menu extends ActionBar {
 }
 class BaseMenuActionViewItem extends BaseActionViewItem {
     constructor(ctx, action, options, menuStyle) {
-        options.isMenu = true;
+        options = {
+            ...options,
+            isMenu: true,
+            icon: options.icon !== undefined ? options.icon : false,
+            label: options.label !== undefined ? options.label : true,
+        };
         super(action, action, options);
         this.menuStyle = menuStyle;
         this.options = options;
-        this.options.icon = options.icon !== undefined ? options.icon : false;
-        this.options.label = options.label !== undefined ? options.label : true;
         this.cssClass = '';
         if (this.options.label && options.enableMnemonics) {
             const label = this.action.label;
@@ -428,12 +433,12 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
                         this.label.append(ltrim(replaceDoubleEscapes(label.substr(0, escMatch.index)), ' '), $('u', { 'aria-hidden': 'true' }, escMatch[3]), rtrim(replaceDoubleEscapes(label.substr(escMatch.index + escMatch[0].length)), ' '));
                     }
                     else {
-                        this.label.innerText = replaceDoubleEscapes(label).trim();
+                        this.label.textContent = replaceDoubleEscapes(label).trim();
                     }
                     this.item?.setAttribute('aria-keyshortcuts', (!!matches[1] ? matches[1] : matches[3]).toLocaleLowerCase());
                 }
                 else {
-                    this.label.innerText = label.replace(/&&/g, '&').trim();
+                    this.label.textContent = label.replace(/&&/g, '&').trim();
                 }
             }
         }
@@ -1127,4 +1132,4 @@ ${formatRule(Codicon.menuSubmenu)}
     return result;
 }
 
-export { HorizontalDirection, MENU_ESCAPED_MNEMONIC_REGEX, MENU_MNEMONIC_REGEX, Menu, VerticalDirection, cleanMnemonic, formatRule };
+export { HorizontalDirection, MENU_ESCAPED_MNEMONIC_REGEX, MENU_MNEMONIC_REGEX, Menu, VerticalDirection, cleanMnemonic, formatRule, getMenuWidgetCSS, unthemedMenuStyles };

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

@@ -11,9 +11,9 @@ export interface IResizeEvent {
 export declare class ResizableHTMLElement {
     readonly domNode: HTMLElement;
     private readonly _onDidWillResize;
-    readonly onDidWillResize: Event<void>;
+    get onDidWillResize(): Event<void>;
     private readonly _onDidResize;
-    readonly onDidResize: Event<IResizeEvent>;
+    get onDidResize(): Event<IResizeEvent>;
     private readonly _northSash;
     private readonly _eastSash;
     private readonly _southSash;

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

@@ -5,11 +5,11 @@ import { Emitter, Event } from '../../../common/event.js';
 import { DisposableStore } from '../../../common/lifecycle.js';
 
 class ResizableHTMLElement {
+    get onDidWillResize() { return this._onDidWillResize.event; }
+    get onDidResize() { return this._onDidResize.event; }
     constructor() {
         this._onDidWillResize = ( new Emitter());
-        this.onDidWillResize = this._onDidWillResize.event;
         this._onDidResize = ( new Emitter());
-        this.onDidResize = this._onDidResize.event;
         this._sashListener = ( new DisposableStore());
         this._size = ( new Dimension(0, 0));
         this._minSize = ( new Dimension(0, 0));

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

@@ -149,20 +149,20 @@ export declare class Sash extends Disposable {
     /**
      * An event which fires whenever the user starts dragging this sash.
      */
-    readonly onDidStart: Event<ISashEvent>;
+    get onDidStart(): Event<ISashEvent>;
     /**
      * An event which fires whenever the user moves the mouse while
      * dragging this sash.
      */
-    readonly onDidChange: Event<ISashEvent>;
+    get onDidChange(): Event<ISashEvent>;
     /**
      * An event which fires whenever the user double clicks this sash.
      */
-    readonly onDidReset: Event<void>;
+    get onDidReset(): Event<void>;
     /**
      * An event which fires whenever the user stops dragging this sash.
      */
-    readonly onDidEnd: Event<void>;
+    get onDidEnd(): Event<void>;
     /**
      * A linked sash will be forwarded the same user interactions and events
      * so it moves exactly the same way as this sash.

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

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
-import { getWindow, append, $, EventHelper, isHTMLElement } from '../../dom.js';
+import { getWindow, append, $, addDisposableListener, EventHelper, isHTMLElement } from '../../dom.js';
 import { createStyleSheet } from '../../domStylesheets.js';
 import { DomEmitter } from '../../event.js';
 import { EventType, Gesture } from '../../touch.js';
@@ -121,6 +121,10 @@ class Sash extends Disposable {
         this._state = state;
         this.onDidEnablementChange.fire(state);
     }
+    get onDidStart() { return this._onDidStart.event; }
+    get onDidChange() { return this._onDidChange.event; }
+    get onDidReset() { return this._onDidReset.event; }
+    get onDidEnd() { return this._onDidEnd.event; }
     set orthogonalStartSash(sash) {
         if (this._orthogonalStartSash === sash) {
             return;
@@ -133,8 +137,8 @@ class Sash extends Disposable {
                 if (state !== SashState.Disabled) {
                     this._orthogonalStartDragHandle = append(this.el, $('.orthogonal-drag-handle.start'));
                     this.orthogonalStartDragHandleDisposables.add(toDisposable(() => this._orthogonalStartDragHandle.remove()));
-                    this.orthogonalStartDragHandleDisposables.add(( new DomEmitter(this._orthogonalStartDragHandle, 'mouseenter'))).event(() => Sash.onMouseEnter(sash), undefined, this.orthogonalStartDragHandleDisposables);
-                    this.orthogonalStartDragHandleDisposables.add(( new DomEmitter(this._orthogonalStartDragHandle, 'mouseleave'))).event(() => Sash.onMouseLeave(sash), undefined, this.orthogonalStartDragHandleDisposables);
+                    this.orthogonalStartDragHandleDisposables.add(addDisposableListener(this._orthogonalStartDragHandle, 'mouseenter', () => Sash.onMouseEnter(sash)));
+                    this.orthogonalStartDragHandleDisposables.add(addDisposableListener(this._orthogonalStartDragHandle, 'mouseleave', () => Sash.onMouseLeave(sash)));
                 }
             };
             this.orthogonalStartSashDisposables.add(sash.onDidEnablementChange.event(onChange, this));
@@ -154,8 +158,8 @@ class Sash extends Disposable {
                 if (state !== SashState.Disabled) {
                     this._orthogonalEndDragHandle = append(this.el, $('.orthogonal-drag-handle.end'));
                     this.orthogonalEndDragHandleDisposables.add(toDisposable(() => this._orthogonalEndDragHandle.remove()));
-                    this.orthogonalEndDragHandleDisposables.add(( new DomEmitter(this._orthogonalEndDragHandle, 'mouseenter'))).event(() => Sash.onMouseEnter(sash), undefined, this.orthogonalEndDragHandleDisposables);
-                    this.orthogonalEndDragHandleDisposables.add(( new DomEmitter(this._orthogonalEndDragHandle, 'mouseleave'))).event(() => Sash.onMouseLeave(sash), undefined, this.orthogonalEndDragHandleDisposables);
+                    this.orthogonalEndDragHandleDisposables.add(addDisposableListener(this._orthogonalEndDragHandle, 'mouseenter', () => Sash.onMouseEnter(sash)));
+                    this.orthogonalEndDragHandleDisposables.add(addDisposableListener(this._orthogonalEndDragHandle, 'mouseleave', () => Sash.onMouseLeave(sash)));
                 }
             };
             this.orthogonalEndSashDisposables.add(sash.onDidEnablementChange.event(onChange, this));
@@ -177,10 +181,6 @@ class Sash extends Disposable {
         this.orthogonalStartDragHandleDisposables = this._register(( new DisposableStore()));
         this.orthogonalEndSashDisposables = this._register(( new DisposableStore()));
         this.orthogonalEndDragHandleDisposables = this._register(( new DisposableStore()));
-        this.onDidStart = this._onDidStart.event;
-        this.onDidChange = this._onDidChange.event;
-        this.onDidReset = this._onDidReset.event;
-        this.onDidEnd = this._onDidEnd.event;
         this.linkedSash = undefined;
         this.el = append(container, $('.monaco-sash'));
         if (options.orthogonalEdge) {
@@ -189,20 +189,14 @@ class Sash extends Disposable {
         if (isMacintosh) {
             this.el.classList.add('mac');
         }
-        const onMouseDown = this._register(( new DomEmitter(this.el, 'mousedown'))).event;
-        this._register(onMouseDown(e => this.onPointerStart(e, ( new MouseEventFactory(container))), this));
-        const onMouseDoubleClick = this._register(( new DomEmitter(this.el, 'dblclick'))).event;
-        this._register(onMouseDoubleClick(this.onPointerDoublePress, this));
-        const onMouseEnter = this._register(( new DomEmitter(this.el, 'mouseenter'))).event;
-        this._register(onMouseEnter(() => Sash.onMouseEnter(this)));
-        const onMouseLeave = this._register(( new DomEmitter(this.el, 'mouseleave'))).event;
-        this._register(onMouseLeave(() => Sash.onMouseLeave(this)));
+        this._register(addDisposableListener(this.el, 'mousedown', e => this.onPointerStart(e, ( new MouseEventFactory(container)))));
+        this._register(addDisposableListener(this.el, 'dblclick', e => this.onPointerDoublePress(e)));
+        this._register(addDisposableListener(this.el, 'mouseenter', () => Sash.onMouseEnter(this)));
+        this._register(addDisposableListener(this.el, 'mouseleave', () => Sash.onMouseLeave(this)));
         this._register(Gesture.addTarget(this.el));
-        const onTouchStart = this._register(( new DomEmitter(this.el, EventType.Start))).event;
-        this._register(onTouchStart(e => this.onPointerStart(e, ( new GestureEventFactory(this.el))), this));
-        const onTap = this._register(( new DomEmitter(this.el, EventType.Tap))).event;
+        this._register(addDisposableListener(this.el, EventType.Start, e => this.onPointerStart(e, ( new GestureEventFactory(this.el)))));
         let doubleTapTimeout = undefined;
-        this._register(onTap(event => {
+        this._register(addDisposableListener(this.el, EventType.Tap, event => {
             if (doubleTapTimeout) {
                 clearTimeout(doubleTapTimeout);
                 doubleTapTimeout = undefined;
@@ -211,7 +205,7 @@ class Sash extends Disposable {
             }
             clearTimeout(doubleTapTimeout);
             doubleTapTimeout = setTimeout(() => doubleTapTimeout = undefined, 250);
-        }, this));
+        }));
         if (typeof options.size === 'number') {
             this.size = options.size;
             if (options.orientation === Orientation.VERTICAL) {

package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.d.ts

@@ -44,9 +44,9 @@ export declare abstract class AbstractScrollableElement extends Widget {
     private _inertialTimeout;
     private _inertialSpeed;
     private readonly _onScroll;
-    readonly onScroll: Event<ScrollEvent>;
+    get onScroll(): Event<ScrollEvent>;
     private readonly _onWillScroll;
-    readonly onWillScroll: Event<ScrollEvent>;
+    get onWillScroll(): Event<ScrollEvent>;
     get options(): Readonly<ScrollableElementResolvedOptions>;
     protected constructor(element: HTMLElement, options: ScrollableElementCreationOptions, scrollable: Scrollable);
     dispose(): void;

package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js

@@ -112,6 +112,8 @@ class MouseWheelClassifier {
     }
 }
 class AbstractScrollableElement extends Widget {
+    get onScroll() { return this._onScroll.event; }
+    get onWillScroll() { return this._onWillScroll.event; }
     get options() {
         return this._options;
     }
@@ -120,9 +122,7 @@ class AbstractScrollableElement extends Widget {
         this._inertialTimeout = null;
         this._inertialSpeed = { X: 0, Y: 0 };
         this._onScroll = this._register(( new Emitter()));
-        this.onScroll = this._onScroll.event;
         this._onWillScroll = this._register(( new Emitter()));
-        this.onWillScroll = this._onWillScroll.event;
         element.style.overflow = 'hidden';
         this._options = resolveOptions(options);
         this._scrollable = scrollable;

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

@@ -30,5 +30,6 @@
 
 .mac .monaco-action-bar .action-item .monaco-select-box {
 	font-size: 11px;
-	border-radius: 5px;
+	border-radius: 3px;
+	min-height: 24px;
 }

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

@@ -1,9 +1,9 @@
-import { IContentActionHandler } from "../../formattedTextRenderer.js";
+import { Event } from "../../../common/event.js";
+import { IDisposable } from "../../../common/lifecycle.js";
+import { MarkdownActionHandler } from "../../markdownRenderer.js";
 import { IContextViewProvider } from "../contextview/contextview.js";
 import { IListStyles } from "../list/listWidget.js";
 import { Widget } from "../widget.js";
-import { Event } from "../../../common/event.js";
-import { IDisposable } from "../../../common/lifecycle.js";
 export interface ISelectBoxDelegate extends IDisposable {
     readonly onDidSelect: Event<ISelectData>;
     setOptions(options: ISelectOptionItem[], selected?: number): void;
@@ -28,7 +28,7 @@ export interface ISelectOptionItem {
     decoratorRight?: string;
     description?: string;
     descriptionIsMarkdown?: boolean;
-    descriptionMarkdownActionHandler?: IContentActionHandler;
+    readonly descriptionMarkdownActionHandler?: MarkdownActionHandler;
     isDisabled?: boolean;
 }
 export interface ISelectBoxStyles extends IListStyles {

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

@@ -1,11 +1,11 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
+import { isMacintosh } from '../../../common/platform.js';
 import '../list/listWidget.js';
-import { SelectBoxList } from './selectBoxCustom.js';
-import { SelectBoxNative } from './selectBoxNative.js';
 import { Widget } from '../widget.js';
-import { isMacintosh } from '../../../common/platform.js';
 import * as selectBox from './selectBox.css';
+import { SelectBoxList } from './selectBoxCustom.js';
+import { SelectBoxNative } from './selectBoxNative.js';
 
 registerCss(selectBox);
 class SelectBox extends Widget {

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

@@ -1,8 +1,8 @@
+import { Event } from "../../../common/event.js";
+import { Disposable } from "../../../common/lifecycle.js";
 import { IContextViewProvider } from "../contextview/contextview.js";
 import { IListVirtualDelegate } from "../list/list.js";
 import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData, ISelectOptionItem } from "./selectBox.js";
-import { Event } from "../../../common/event.js";
-import { Disposable } from "../../../common/lifecycle.js";
 export declare class SelectBoxList extends Disposable implements ISelectBoxDelegate, IListVirtualDelegate<ISelectOptionItem> {
     private static readonly DEFAULT_DROPDOWN_MINIMUM_BOTTOM_MARGIN;
     private static readonly DEFAULT_DROPDOWN_MINIMUM_TOP_MARGIN;