Copilot-aided disposable fixes (microsoft#295502)

roblourens · web-flow · commit f019353b36a9 · 2026-02-16T06:54:19.000Z
* Copilot-aided disposable fixes

* Undo this, leave it for later

* Undo making some classes disposable when those classes weren't properly tracked
diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts
@@ -738,6 +738,7 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 		}
 
 		this._onDidChange.dispose();
+		this._onDidScroll.dispose();
 		this._onDidSashReset.dispose();
 		this._onDidVisibilityChange.dispose();
 
@@ -933,6 +934,7 @@ class LeafNode implements ISplitView<ILayoutContext>, IDisposable {
 	}
 
 	dispose(): void {
+		this._onDidSetLinkedNode.dispose();
 		this.disposables.dispose();
 	}
 }
@@ -1832,6 +1834,7 @@ export class GridView implements IDisposable {
 	}
 
 	dispose(): void {
+		this._onDidChangeViewMaximized.dispose();
 		this.onDidSashResetRelay.dispose();
 		this.root.dispose();
 		this.element.remove();
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
@@ -332,8 +332,8 @@ export class ListView<T> implements IListView<T> {
 
 	private readonly disposables: DisposableStore = new DisposableStore();
 
-	private readonly _onDidChangeContentHeight = new Emitter<number>();
-	private readonly _onDidChangeContentWidth = new Emitter<number>();
+	private readonly _onDidChangeContentHeight = this.disposables.add(new Emitter<number>());
+	private readonly _onDidChangeContentWidth = this.disposables.add(new Emitter<number>());
 	readonly onDidChangeContentHeight: Event<number> = Event.latch(this._onDidChangeContentHeight.event, undefined, this.disposables);
 	readonly onDidChangeContentWidth: Event<number> = Event.latch(this._onDidChangeContentWidth.event, undefined, this.disposables);
 	get contentHeight(): number { return this.rangeMap.size; }
diff --git a/src/vs/base/browser/ui/table/tableWidget.ts b/src/vs/base/browser/ui/table/tableWidget.ts
@@ -126,7 +126,7 @@ class ColumnHeader<TRow, TCell> extends Disposable implements IView {
 	get maximumSize() { return this.column.maximumWidth ?? Number.POSITIVE_INFINITY; }
 	get onDidChange() { return this.column.onDidChangeWidthConstraints ?? Event.None; }
 
-	private _onDidLayout = new Emitter<[number, number]>();
+	private _onDidLayout = this._register(new Emitter<[number, number]>());
 	readonly onDidLayout = this._onDidLayout.event;
 
 	constructor(readonly column: ITableColumn<TRow, TCell>, private index: number) {
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -832,7 +832,7 @@ class FindWidget<T, TFilterData> extends Disposable {
 	private readonly actionbar: ActionBar;
 	private readonly toggles: TreeFindToggle[] = [];
 
-	readonly _onDidDisable = new Emitter<void>();
+	readonly _onDidDisable = this._register(new Emitter<void>());
 	readonly onDidDisable = this._onDidDisable.event;
 	readonly onDidChangeValue: Event<string>;
 	readonly onDidToggleChange: Event<ITreeFindToggleChangeEvent>;
@@ -1901,10 +1901,10 @@ class StickyScrollFocus<T, TFilterData, TRef> extends Disposable {
 	private elements: HTMLElement[] = [];
 	private state: StickyScrollState<T, TFilterData, TRef> | undefined;
 
-	private _onDidChangeHasFocus = new Emitter<boolean>();
+	private _onDidChangeHasFocus = this._register(new Emitter<boolean>());
 	readonly onDidChangeHasFocus = this._onDidChangeHasFocus.event;
 
-	private _onContextMenu = new Emitter<ITreeContextMenuEvent<T>>();
+	private _onContextMenu = this._register(new Emitter<ITreeContextMenuEvent<T>>());
 	readonly onContextMenu: Event<ITreeContextMenuEvent<T>> = this._onContextMenu.event;
 
 	private _domHasFocus: boolean = false;
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -1387,6 +1387,8 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 	}
 
 	dispose(): void {
+		this._onDidRender.dispose();
+		this._onDidChangeNodeSlowState.dispose();
 		this.disposables.dispose();
 		this.tree.dispose();
 	}
diff --git a/src/vs/base/parts/ipc/common/ipc.net.ts b/src/vs/base/parts/ipc/common/ipc.net.ts
@@ -544,10 +544,10 @@ export class Protocol extends Disposable implements IMessagePassingProtocol {
 	private _socketWriter: ProtocolWriter;
 	private _socketReader: ProtocolReader;
 
-	private readonly _onMessage = new Emitter<VSBuffer>();
+	private readonly _onMessage = this._register(new Emitter<VSBuffer>());
 	readonly onMessage: Event<VSBuffer> = this._onMessage.event;
 
-	private readonly _onDidDispose = new Emitter<void>();
+	private readonly _onDidDispose = this._register(new Emitter<void>());
 	readonly onDidDispose: Event<void> = this._onDidDispose.event;
 
 	constructor(socket: ISocket) {
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
@@ -780,6 +780,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 		}
 		dispose(this.activeRequests.values());
 		this.activeRequests.clear();
+		this._onDidInitialize.dispose();
 	}
 }
 
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts
@@ -5,9 +5,10 @@
 
 import { Color } from '../../../../base/common/color.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IColorPresentation } from '../../../common/languages.js';
 
-export class ColorPickerModel {
+export class ColorPickerModel extends Disposable {
 
 	readonly originalColor: Color;
 	private _color: Color;
@@ -41,16 +42,17 @@ export class ColorPickerModel {
 		this._onDidChangePresentation.fire(this.presentation);
 	}
 
-	private readonly _onColorFlushed = new Emitter<Color>();
+	private readonly _onColorFlushed = this._register(new Emitter<Color>());
 	readonly onColorFlushed: Event<Color> = this._onColorFlushed.event;
 
-	private readonly _onDidChangeColor = new Emitter<Color>();
+	private readonly _onDidChangeColor = this._register(new Emitter<Color>());
 	readonly onDidChangeColor: Event<Color> = this._onDidChangeColor.event;
 
-	private readonly _onDidChangePresentation = new Emitter<IColorPresentation>();
+	private readonly _onDidChangePresentation = this._register(new Emitter<IColorPresentation>());
 	readonly onDidChangePresentation: Event<IColorPresentation> = this._onDidChangePresentation.event;
 
 	constructor(color: Color, availableColorPresentations: IColorPresentation[], private presentationIndex: number) {
+		super();
 		this.originalColor = color;
 		this._color = color;
 		this._colorPresentations = availableColorPresentations;
diff --git a/src/vs/platform/debug/common/extensionHostDebugIpc.ts b/src/vs/platform/debug/common/extensionHostDebugIpc.ts
@@ -8,14 +8,14 @@ import { Disposable } from '../../../base/common/lifecycle.js';
 import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
 import { IAttachSessionEvent, ICloseSessionEvent, IExtensionHostDebugService, IOpenExtensionWindowResult, IReloadSessionEvent, ITerminateSessionEvent } from './extensionHostDebug.js';
 
-export class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChannel<TContext> {
+export class ExtensionHostDebugBroadcastChannel<TContext> extends Disposable implements IServerChannel<TContext> {
 
 	static readonly ChannelName = 'extensionhostdebugservice';
 
-	private readonly _onCloseEmitter = new Emitter<ICloseSessionEvent>();
-	private readonly _onReloadEmitter = new Emitter<IReloadSessionEvent>();
-	private readonly _onTerminateEmitter = new Emitter<ITerminateSessionEvent>();
-	private readonly _onAttachEmitter = new Emitter<IAttachSessionEvent>();
+	private readonly _onCloseEmitter = this._register(new Emitter<ICloseSessionEvent>());
+	private readonly _onReloadEmitter = this._register(new Emitter<IReloadSessionEvent>());
+	private readonly _onTerminateEmitter = this._register(new Emitter<ITerminateSessionEvent>());
+	private readonly _onAttachEmitter = this._register(new Emitter<IAttachSessionEvent>());
 
 	call(ctx: TContext, command: string, arg?: any): Promise<any> {
 		switch (command) {
diff --git a/src/vs/platform/tunnel/common/tunnel.ts b/src/vs/platform/tunnel/common/tunnel.ts
@@ -216,6 +216,7 @@ export class DisposableTunnel {
 
 	dispose(): Promise<void> {
 		this._onDispose.fire();
+		this._onDispose.dispose();
 		return this._dispose();
 	}
 }
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
@@ -41,7 +41,7 @@ export class UpdateChannelClient implements IUpdateService {
 	declare readonly _serviceBrand: undefined;
 	private readonly disposables = new DisposableStore();
 
-	private readonly _onStateChange = new Emitter<State>();
+	private readonly _onStateChange = this.disposables.add(new Emitter<State>());
 	readonly onStateChange: Event<State> = this._onStateChange.event;
 
 	private _state: State = State.Uninitialized;
diff --git a/src/vs/server/node/extensionHostConnection.ts b/src/vs/server/node/extensionHostConnection.ts
@@ -109,7 +109,7 @@ class ConnectionData {
 
 export class ExtensionHostConnection extends Disposable {
 
-	private _onClose = new Emitter<void>();
+	private _onClose = this._register(new Emitter<void>());
 	readonly onClose: Event<void> = this._onClose.event;
 
 	private readonly _canSendSocket: boolean;
diff --git a/src/vs/server/node/remoteExtensionManagement.ts b/src/vs/server/node/remoteExtensionManagement.ts
@@ -111,6 +111,7 @@ export class ManagementConnection {
 		this.protocol.dispose();
 		socket.end();
 		this._onClose.fire(undefined);
+		this._onClose.dispose();
 	}
 
 	public acceptReconnection(remoteAddress: string, socket: ISocket, initialDataChunk: VSBuffer): void {
diff --git a/src/vs/workbench/api/browser/mainThreadComments.ts b/src/vs/workbench/api/browser/mainThreadComments.ts
@@ -216,10 +216,13 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 	dispose() {
 		this._isDisposed = true;
 		this._onDidChangeCollapsibleState.dispose();
+		this._onDidChangeInitialCollapsibleState.dispose();
 		this._onDidChangeComments.dispose();
 		this._onDidChangeInput.dispose();
 		this._onDidChangeLabel.dispose();
+		this._onDidChangeCanReply.dispose();
 		this._onDidChangeState.dispose();
+		this._onDidChangeApplicability.dispose();
 	}
 
 	toJSON(): MarshalledCommentThread {
diff --git a/src/vs/workbench/api/browser/mainThreadEditor.ts b/src/vs/workbench/api/browser/mainThreadEditor.ts
@@ -205,6 +205,7 @@ export class MainThreadTextEditor {
 
 	public dispose(): void {
 		this._modelListeners.dispose();
+		this._onPropertiesChanged.dispose();
 		this._codeEditor = null;
 		this._codeEditorListeners.dispose();
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -1290,10 +1290,10 @@ export class MainThreadDocumentRangeSemanticTokensProvider implements languages.
 
 class ExtensionBackedInlineCompletionsProvider extends Disposable implements languages.InlineCompletionsProvider<IdentifiableInlineCompletions> {
 	public readonly setModelId: ((modelId: string) => Promise<void>) | undefined;
-	public readonly _onDidChangeEmitter = new Emitter<languages.IInlineCompletionChangeHint | void>();
+	public readonly _onDidChangeEmitter = this._register(new Emitter<languages.IInlineCompletionChangeHint | void>());
 	public readonly onDidChangeInlineCompletions: Event<languages.IInlineCompletionChangeHint | void> | undefined;
 
-	public readonly _onDidChangeModelInfoEmitter = new Emitter<void>();
+	public readonly _onDidChangeModelInfoEmitter = this._register(new Emitter<void>());
 	public readonly onDidChangeModelInfo: Event<void> | undefined;
 
 	constructor(
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageModels.ts b/src/vs/workbench/api/browser/mainThreadLanguageModels.ts
@@ -194,9 +194,11 @@ export class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
 
 		const accountLabel = auth.accountLabel ?? localize('languageModelsAccountId', 'Language Models');
 		const disposables = new DisposableStore();
-		this._authenticationService.registerAuthenticationProvider(authProviderId, new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel));
+		const provider = new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel);
+		this._authenticationService.registerAuthenticationProvider(authProviderId, provider);
 		disposables.add(toDisposable(() => {
 			this._authenticationService.unregisterAuthenticationProvider(authProviderId);
+			provider.dispose();
 		}));
 		disposables.add(this._authenticationAccessService.onDidChangeExtensionSessionAccess(async (e) => {
 			const allowedExtensions = this._authenticationAccessService.readAllowedExtensions(authProviderId, accountLabel);
@@ -282,4 +284,8 @@ class LanguageModelAccessAuthProvider implements IAuthenticationProvider {
 			scopes,
 		};
 	}
+
+	dispose(): void {
+		this._onDidChangeSessions.dispose();
+	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts
@@ -596,6 +596,8 @@ class MainThreadSCMProvider implements ISCMProvider {
 	}
 
 	dispose(): void {
+		this._onDidChangeResourceGroups.dispose();
+		this._onDidChangeResources.dispose();
 		this._artifactProvider.get()?.dispose();
 		this._stagedQuickDiff?.dispose();
 		this._quickDiff?.dispose();
diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -407,6 +407,7 @@ export class DynamicAuthProvider implements vscode.AuthenticationProvider {
 		this._logger = loggerService.createLogger(this.id, { name: `Auth: ${this.label}` });
 		this._disposable = new DisposableStore();
 		this._disposable.add(this._onDidChangeSessions);
+		this._disposable.add(this._onDidChangeClientId);
 		const scopedEvent = Event.chain(onDidDynamicAuthProviderTokensChange.event, $ => $
 			.filter(e => e.authProviderId === this.id && e.clientId === _clientId)
 			.map(e => e.tokens)
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -1244,6 +1244,8 @@ class ExtHostChatAgent {
 				disposed = true;
 				that._followupProvider = undefined;
 				that._onDidReceiveFeedback.dispose();
+				that._onDidPerformAction.dispose();
+				that._pauseStateEmitter.dispose();
 				that._proxy.$unregisterAgent(that._handle);
 			},
 		} satisfies vscode.ChatParticipant;
diff --git a/src/vs/workbench/api/common/extHostComments.ts b/src/vs/workbench/api/common/extHostComments.ts
@@ -585,6 +585,7 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 		dispose() {
 			this._isDiposed = true;
 			this._acceptInputDisposables.dispose();
+			this._onDidUpdateCommentThread.dispose();
 			this._localDisposables.forEach(disposable => disposable.dispose());
 		}
 	}
diff --git a/src/vs/workbench/api/common/extHostDocuments.ts b/src/vs/workbench/api/common/extHostDocuments.ts
@@ -18,19 +18,19 @@ import { ISerializedModelContentChangedEvent } from '../../../editor/common/text
 
 export class ExtHostDocuments implements ExtHostDocumentsShape {
 
-	private readonly _onDidAddDocument = new Emitter<vscode.TextDocument>();
-	private readonly _onDidRemoveDocument = new Emitter<vscode.TextDocument>();
-	private readonly _onDidChangeDocument = new Emitter<Omit<vscode.TextDocumentChangeEvent, 'detailedReason'>>();
-	private readonly _onDidChangeDocumentWithReason = new Emitter<vscode.TextDocumentChangeEvent>();
-	private readonly _onDidSaveDocument = new Emitter<vscode.TextDocument>();
+	private readonly _toDispose = new DisposableStore();
+
+	private readonly _onDidAddDocument = this._toDispose.add(new Emitter<vscode.TextDocument>());
+	private readonly _onDidRemoveDocument = this._toDispose.add(new Emitter<vscode.TextDocument>());
+	private readonly _onDidChangeDocument = this._toDispose.add(new Emitter<Omit<vscode.TextDocumentChangeEvent, 'detailedReason'>>());
+	private readonly _onDidChangeDocumentWithReason = this._toDispose.add(new Emitter<vscode.TextDocumentChangeEvent>());
+	private readonly _onDidSaveDocument = this._toDispose.add(new Emitter<vscode.TextDocument>());
 
 	readonly onDidAddDocument: Event<vscode.TextDocument> = this._onDidAddDocument.event;
 	readonly onDidRemoveDocument: Event<vscode.TextDocument> = this._onDidRemoveDocument.event;
 	readonly onDidChangeDocument: Event<vscode.TextDocumentChangeEvent> = this._onDidChangeDocument.event as Event<vscode.TextDocumentChangeEvent>;
 	readonly onDidChangeDocumentWithReason: Event<vscode.TextDocumentChangeEvent> = this._onDidChangeDocumentWithReason.event;
 	readonly onDidSaveDocument: Event<vscode.TextDocument> = this._onDidSaveDocument.event;
-
-	private readonly _toDispose = new DisposableStore();
 	private _proxy: MainThreadDocumentsShape;
 	private _documentsAndEditors: ExtHostDocumentsAndEditors;
 	private _documentLoader = new Map<string, Promise<ExtHostDocumentData>>();
diff --git a/src/vs/workbench/api/common/extHostNotebookKernels.ts b/src/vs/workbench/api/common/extHostNotebookKernels.ts
@@ -576,7 +576,7 @@ class NotebookCellExecutionTask extends Disposable {
 	private static HANDLE = 0;
 	private _handle = NotebookCellExecutionTask.HANDLE++;
 
-	private _onDidChangeState = new Emitter<void>();
+	private _onDidChangeState = this._register(new Emitter<void>());
 	readonly onDidChangeState = this._onDidChangeState.event;
 
 	private _state = NotebookCellExecutionTaskState.Init;
@@ -786,7 +786,7 @@ class NotebookExecutionTask extends Disposable {
 	private static HANDLE = 0;
 	private _handle = NotebookExecutionTask.HANDLE++;
 
-	private _onDidChangeState = new Emitter<void>();
+	private _onDidChangeState = this._register(new Emitter<void>());
 	readonly onDidChangeState = this._onDidChangeState.event;
 
 	private _state = NotebookExecutionTaskState.Init;
diff --git a/src/vs/workbench/api/common/extHostSCM.ts b/src/vs/workbench/api/common/extHostSCM.ts
@@ -539,6 +539,8 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
 	dispose(): void {
 		this._disposed = true;
 		this._onDidDispose.fire();
+		this._onDidUpdateResourceStates.dispose();
+		this._onDidDispose.dispose();
 	}
 }
 
@@ -939,6 +941,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		this._groups.forEach(group => group.dispose());
 		this.#proxy.$unregisterSourceControl(this.handle);
 
+		this._onDidChangeSelection.dispose();
 		this._onDidDispose.fire();
 		this._onDidDispose.dispose();
 	}
diff --git a/src/vs/workbench/api/common/extHostTelemetry.ts b/src/vs/workbench/api/common/extHostTelemetry.ts
@@ -325,6 +325,7 @@ export class ExtHostTelemetryLogger {
 		} else {
 			this._sender = undefined;
 		}
+		this._onDidChangeEnableStates.dispose();
 	}
 }
 
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -1040,7 +1040,7 @@ class UnifiedEnvironmentVariableCollection extends Disposable {
 		this._onDidChangeCollection.fire();
 	}
 
-	protected readonly _onDidChangeCollection: Emitter<void> = new Emitter<void>();
+	protected readonly _onDidChangeCollection: Emitter<void> = this._register(new Emitter<void>());
 	get onDidChangeCollection(): Event<void> { return this._onDidChangeCollection && this._onDidChangeCollection.event; }
 
 	constructor(
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -31,11 +31,11 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 
 	private _activeShellIntegrations: Map</*instanceId*/number, InternalTerminalShellIntegration> = new Map();
 
-	protected readonly _onDidChangeTerminalShellIntegration = new Emitter<vscode.TerminalShellIntegrationChangeEvent>();
+	protected readonly _onDidChangeTerminalShellIntegration = this._register(new Emitter<vscode.TerminalShellIntegrationChangeEvent>());
 	readonly onDidChangeTerminalShellIntegration = this._onDidChangeTerminalShellIntegration.event;
-	protected readonly _onDidStartTerminalShellExecution = new Emitter<vscode.TerminalShellExecutionStartEvent>();
+	protected readonly _onDidStartTerminalShellExecution = this._register(new Emitter<vscode.TerminalShellExecutionStartEvent>());
 	readonly onDidStartTerminalShellExecution = this._onDidStartTerminalShellExecution.event;
-	protected readonly _onDidEndTerminalShellExecution = new Emitter<vscode.TerminalShellExecutionEndEvent>();
+	protected readonly _onDidEndTerminalShellExecution = this._register(new Emitter<vscode.TerminalShellExecutionEndEvent>());
 	readonly onDidEndTerminalShellExecution = this._onDidEndTerminalShellExecution.event;
 
 	constructor(
diff --git a/src/vs/workbench/api/common/extHostTextEditors.ts b/src/vs/workbench/api/common/extHostTextEditors.ts
@@ -17,13 +17,13 @@ import * as vscode from 'vscode';
 
 export class ExtHostEditors extends Disposable implements ExtHostEditorsShape {
 
-	private readonly _onDidChangeTextEditorSelection = new Emitter<vscode.TextEditorSelectionChangeEvent>();
-	private readonly _onDidChangeTextEditorOptions = new Emitter<vscode.TextEditorOptionsChangeEvent>();
-	private readonly _onDidChangeTextEditorVisibleRanges = new Emitter<vscode.TextEditorVisibleRangesChangeEvent>();
-	private readonly _onDidChangeTextEditorViewColumn = new Emitter<vscode.TextEditorViewColumnChangeEvent>();
-	private readonly _onDidChangeTextEditorDiffInformation = new Emitter<vscode.TextEditorDiffInformationChangeEvent>();
-	private readonly _onDidChangeActiveTextEditor = new Emitter<vscode.TextEditor | undefined>();
-	private readonly _onDidChangeVisibleTextEditors = new Emitter<readonly vscode.TextEditor[]>();
+	private readonly _onDidChangeTextEditorSelection = this._register(new Emitter<vscode.TextEditorSelectionChangeEvent>());
+	private readonly _onDidChangeTextEditorOptions = this._register(new Emitter<vscode.TextEditorOptionsChangeEvent>());
+	private readonly _onDidChangeTextEditorVisibleRanges = this._register(new Emitter<vscode.TextEditorVisibleRangesChangeEvent>());
+	private readonly _onDidChangeTextEditorViewColumn = this._register(new Emitter<vscode.TextEditorViewColumnChangeEvent>());
+	private readonly _onDidChangeTextEditorDiffInformation = this._register(new Emitter<vscode.TextEditorDiffInformationChangeEvent>());
+	private readonly _onDidChangeActiveTextEditor = this._register(new Emitter<vscode.TextEditor | undefined>());
+	private readonly _onDidChangeVisibleTextEditors = this._register(new Emitter<readonly vscode.TextEditor[]>());
 
 	readonly onDidChangeTextEditorSelection: Event<vscode.TextEditorSelectionChangeEvent> = this._onDidChangeTextEditorSelection.event;
 	readonly onDidChangeTextEditorOptions: Event<vscode.TextEditorOptionsChangeEvent> = this._onDidChangeTextEditorOptions.event;
diff --git a/src/vs/workbench/api/common/extHostTunnelService.ts b/src/vs/workbench/api/common/extHostTunnelService.ts
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart.ts
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts
diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
diff --git a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts

Original file line number	Diff line number	Diff line change
`@@ -738,6 +738,7 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {`
`738`	`738`	`}`
`739`	`739`
`740`	`740`	`this._onDidChange.dispose();`
	`741`	`+ this._onDidScroll.dispose();`
`741`	`742`	`this._onDidSashReset.dispose();`
`742`	`743`	`this._onDidVisibilityChange.dispose();`
`743`	`744`
`@@ -933,6 +934,7 @@ class LeafNode implements ISplitView<ILayoutContext>, IDisposable {`
`933`	`934`	`}`
`934`	`935`
`935`	`936`	`dispose(): void {`
	`937`	`+ this._onDidSetLinkedNode.dispose();`
`936`	`938`	`this.disposables.dispose();`
`937`	`939`	`}`
`938`	`940`	`}`
`@@ -1832,6 +1834,7 @@ export class GridView implements IDisposable {`
`1832`	`1834`	`}`
`1833`	`1835`
`1834`	`1836`	`dispose(): void {`
	`1837`	`+ this._onDidChangeViewMaximized.dispose();`
`1835`	`1838`	`this.onDidSashResetRelay.dispose();`
`1836`	`1839`	`this.root.dispose();`
`1837`	`1840`	`this.element.remove();`
Original file line number	Diff line number	Diff line change
`@@ -1387,6 +1387,8 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable`
`1387`	`1387`	`}`
`1388`	`1388`
`1389`	`1389`	`dispose(): void {`
	`1390`	`+ this._onDidRender.dispose();`
	`1391`	`+ this._onDidChangeNodeSlowState.dispose();`
`1390`	`1392`	`this.disposables.dispose();`
`1391`	`1393`	`this.tree.dispose();`
`1392`	`1394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -780,6 +780,7 @@ export class ChannelClient implements IChannelClient, IDisposable {`
`780`	`780`	`}`
`781`	`781`	`dispose(this.activeRequests.values());`
`782`	`782`	`this.activeRequests.clear();`
	`783`	`+ this._onDidInitialize.dispose();`
`783`	`784`	`}`
`784`	`785`	`}`
`785`	`786`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@ export class DisposableTunnel {`
`216`	`216`
`217`	`217`	`dispose(): Promise<void> {`
`218`	`218`	`this._onDispose.fire();`
	`219`	`+ this._onDispose.dispose();`
`219`	`220`	`return this._dispose();`
`220`	`221`	`}`
`221`	`222`	`}`