fixup! error in dispose listener after emitter disposed

microsoft · Jun 22, 2023 · b1756f9 · b1756f9
1 parent 30e2bd1
commit b1756f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
@@ -959,6 +959,7 @@ export class Emitter<T> {
 				}
 
 				this._listeners = undefined;
+				this._size = 0;
 			}
 			this._options?.onDidRemoveLastListener?.();
 			this._leakageMon?.dispose();

diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
@@ -167,14 +167,15 @@ suite('Event', function () {
 	test('Emitter, dispose emitter during emission', () => {
 		const emitter = new Emitter<void>();
 		const calls: number[] = [];
-		Array.from({ length: 25 }, (_, n) => emitter.event(() => {
+		const disposables = Array.from({ length: 25 }, (_, n) => emitter.event(() => {
 			if (n === 10) {
 				emitter.dispose();
 			}
 			calls.push(n);
 		}));
 
 		emitter.fire();
+		disposables.forEach(d => d.dispose());
 		assert.deepStrictEqual(calls, Array.from({ length: 11 }, (_, n) => n));
 	});