Merge branch 'main' into retired-tortoise

Author: benibenj

src/vs/base/browser/ui/resizable/resizable.ts

@@ -23,10 +23,10 @@ export class ResizableHTMLElement {
 	readonly domNode: HTMLElement;
 
 	private readonly _onDidWillResize = new Emitter<void>();
-	readonly onDidWillResize: Event<void> = this._onDidWillResize.event;
+	get onDidWillResize() { return this._onDidWillResize.event; }
 
 	private readonly _onDidResize = new Emitter<IResizeEvent>();
-	readonly onDidResize: Event<IResizeEvent> = this._onDidResize.event;
+	get onDidResize() { return this._onDidResize.event; }
 
 	private readonly _northSash: Sash;
 	private readonly _eastSash: Sash;

src/vs/base/browser/ui/sash/sash.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, EventHelper, EventLike, getWindow, isHTMLElement } from '../../dom.js';
+import { $, addDisposableListener, append, EventHelper, EventLike, getWindow, isHTMLElement } from '../../dom.js';
 import { createStyleSheet } from '../../domStylesheets.js';
 import { DomEmitter } from '../../event.js';
 import { EventType, Gesture } from '../../touch.js';
@@ -296,23 +296,23 @@ export class Sash extends Disposable {
 	/**
 	 * An event which fires whenever the user starts dragging this sash.
 	 */
-	readonly onDidStart: Event<ISashEvent> = this._onDidStart.event;
+	get onDidStart() { return this._onDidStart.event; }
 
 	/**
 	 * An event which fires whenever the user moves the mouse while
 	 * dragging this sash.
 	 */
-	readonly onDidChange: Event<ISashEvent> = this._onDidChange.event;
+	get onDidChange() { return this._onDidChange.event; }
 
 	/**
 	 * An event which fires whenever the user double clicks this sash.
 	 */
-	readonly onDidReset: Event<void> = this._onDidReset.event;
+	get onDidReset() { return this._onDidReset.event; }
 
 	/**
 	 * An event which fires whenever the user stops dragging this sash.
 	 */
-	readonly onDidEnd: Event<void> = this._onDidEnd.event;
+	get onDidEnd() { return this._onDidEnd.event; }
 
 	/**
 	 * A linked sash will be forwarded the same user interactions and events
@@ -345,10 +345,8 @@ export 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)));
 				}
 			};
 
@@ -383,10 +381,8 @@ export 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)));
 				}
 			};
 
@@ -427,23 +423,17 @@ export class Sash extends Disposable {
 			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: Timeout | undefined = undefined;
-		this._register(onTap(event => {
+		this._register(addDisposableListener(this.el, EventType.Tap, event => {
 			if (doubleTapTimeout) {
 				clearTimeout(doubleTapTimeout);
 				doubleTapTimeout = undefined;
@@ -453,7 +443,7 @@ export class Sash extends Disposable {
 
 			clearTimeout(doubleTapTimeout);
 			doubleTapTimeout = setTimeout(() => doubleTapTimeout = undefined, 250);
-		}, this));
+		}));
 
 		if (typeof options.size === 'number') {
 			this.size = options.size;

src/vs/platform/actions/browser/toolbar.ts

@@ -10,7 +10,7 @@ import { IAction, Separator, SubmenuAction, toAction, WorkbenchActionExecutedCla
 import { coalesceInPlace } from '../../../base/common/arrays.js';
 import { intersection } from '../../../base/common/collections.js';
 import { BugIndicatingError } from '../../../base/common/errors.js';
-import { Emitter, Event } from '../../../base/common/event.js';
+import { Emitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { localize } from '../../../nls.js';
@@ -335,7 +335,7 @@ export interface IMenuWorkbenchToolBarOptions extends IWorkbenchToolBarOptions {
 export class MenuWorkbenchToolBar extends WorkbenchToolBar {
 
 	private readonly _onDidChangeMenuItems = this._store.add(new Emitter<this>());
-	get onDidChangeMenuItems(): Event<this> { return this._onDidChangeMenuItems.event; }
+	get onDidChangeMenuItems() { return this._onDidChangeMenuItems.event; }
 
 	constructor(
 		container: HTMLElement,

src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.ts

@@ -12,10 +12,9 @@ import { ICommandService } from '../../../../platform/commands/common/commands.j
 import { showWindowLogActionId } from '../../../services/log/common/logConstants.js';
 import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
-import { $, append, getDomNodePagePosition, getWindows, onDidRegisterWindow } from '../../../../base/browser/dom.js';
+import { $, addDisposableListener, append, getDomNodePagePosition, getWindows, onDidRegisterWindow } from '../../../../base/browser/dom.js';
 import { createCSSRule, createStyleSheet } from '../../../../base/browser/domStylesheets.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { DomEmitter } from '../../../../base/browser/event.js';
 
 class ToggleKeybindingsLogAction extends Action2 {
 	static disposable: IDisposable | undefined;
@@ -64,7 +63,7 @@ class ToggleKeybindingsLogAction extends Action2 {
 		const onKeyDown = disposables.add(new Emitter<KeyboardEvent>());
 
 		function registerWindowListeners(window: Window, disposables: DisposableStore): void {
-			disposables.add(disposables.add(new DomEmitter(window, 'keydown', true)).event(e => onKeyDown.fire(e)));
+			disposables.add(addDisposableListener(window, 'keydown', e => onKeyDown.fire(e), true));
 		}
 
 		for (const { window, disposables } of getWindows()) {

src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts

@@ -1538,7 +1538,10 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		}
 		const terminalKey = terminal.instanceId.toString();
 		const terminalData = { terminal: terminal, lastTask: taskKey, group };
-		terminal.onDisposed(() => this._deleteTaskAndTerminal(terminal, terminalData));
+		const onDisposedListener = this._register(terminal.onDisposed(() => {
+			this._deleteTaskAndTerminal(terminal, terminalData);
+			onDisposedListener.dispose();
+		}));
 		this._terminals[terminalKey] = terminalData;
 		terminal.shellLaunchConfig.tabActions = this._terminalTabActions;
 		return [terminal, undefined];