Re-create disposed EventEmitter in clear (#1491)

Author: dbaeumer

client/src/common/diagnostic.ts

@@ -956,7 +956,7 @@ class DiagnosticFeatureProviderImpl implements DiagnosticProviderShape {
 		};
 
 		this.activeTextDocument = Window.activeTextEditor?.document;
-		Window.onDidChangeActiveTextEditor((editor) => {
+		disposables.push(Window.onDidChangeActiveTextEditor((editor) => {
 			const oldActive = this.activeTextDocument;
 			this.activeTextDocument = editor?.document;
 			if (oldActive !== undefined) {
@@ -968,7 +968,7 @@ class DiagnosticFeatureProviderImpl implements DiagnosticProviderShape {
 					this.diagnosticRequestor.pull(this.activeTextDocument);
 				}
 			}
-		});
+		}));
 
 		// For pull model diagnostics we pull for documents visible in the UI.
 		// From an eventing point of view we still rely on open document events

client/src/common/features.ts

@@ -339,7 +339,7 @@ export abstract class TextDocumentEventFeature<P extends { textDocument: TextDoc
 
 	private _listener: Disposable | undefined;
 	protected readonly _selectors: Map<string, VDocumentSelector>;
-	private readonly _onNotificationSent: EventEmitter<NotificationSendEvent<P>>;
+	private _onNotificationSent: EventEmitter<NotificationSendEvent<P>>;
 
 	public static textDocumentFilter(selectors: IterableIterator<VDocumentSelector>, textDocument: TextDocument): boolean {
 		for (const selector of selectors) {
@@ -429,6 +429,7 @@ export abstract class TextDocumentEventFeature<P extends { textDocument: TextDoc
 	public clear(): void {
 		this._selectors.clear();
 		this._onNotificationSent.dispose();
+		this._onNotificationSent = new EventEmitter<NotificationSendEvent<P>>();
 		if (this._listener) {
 			this._listener.dispose();
 			this._listener = undefined;

client/src/common/notebook.ts

@@ -1009,10 +1009,10 @@ export class NotebookDocumentSyncFeature implements DynamicFeature<proto.Noteboo
 	private readonly client: FeatureClient<NotebookDocumentMiddleware, $NotebookDocumentOptions>;
 	private readonly registrations: Map<string, NotebookDocumentSyncFeatureProvider>;
 	private dedicatedChannel: vscode.DocumentSelector | undefined;
-	private readonly _onChangeNotificationSent: vscode.EventEmitter<VNotebookDocumentChangeEvent>;
-	private readonly _onOpenNotificationSent: vscode.EventEmitter<vscode.NotebookDocument>;
-	private readonly _onCloseNotificationSent: vscode.EventEmitter<vscode.NotebookDocument>;
-	private readonly _onSaveNotificationSent: vscode.EventEmitter<vscode.NotebookDocument>;
+	private _onChangeNotificationSent: vscode.EventEmitter<VNotebookDocumentChangeEvent>;
+	private _onOpenNotificationSent: vscode.EventEmitter<vscode.NotebookDocument>;
+	private _onCloseNotificationSent: vscode.EventEmitter<vscode.NotebookDocument>;
+	private _onSaveNotificationSent: vscode.EventEmitter<vscode.NotebookDocument>;
 
 	constructor(client: FeatureClient<NotebookDocumentMiddleware, $NotebookDocumentOptions>) {
 		this.client = client;
@@ -1156,6 +1156,14 @@ export class NotebookDocumentSyncFeature implements DynamicFeature<proto.Noteboo
 			provider.dispose();
 		}
 		this.registrations.clear();
+		this._onChangeNotificationSent.dispose();
+		this._onChangeNotificationSent = new vscode.EventEmitter<VNotebookDocumentChangeEvent>();
+		this._onOpenNotificationSent.dispose();
+		this._onOpenNotificationSent = new vscode.EventEmitter<vscode.NotebookDocument>();
+		this._onCloseNotificationSent.dispose();
+		this._onCloseNotificationSent = new vscode.EventEmitter<vscode.NotebookDocument>();
+		this._onSaveNotificationSent.dispose();
+		this._onSaveNotificationSent = new vscode.EventEmitter<vscode.NotebookDocument>();
 	}
 
 	public handles(textDocument: vscode.TextDocument): boolean {