Use AggregateError for errors while disposing (microsoft#159477)

Author: mjbvz

src/vs/base/common/lifecycle.ts

@@ -108,14 +108,6 @@ export function markAsSingleton<T extends IDisposable>(singleton: T): T {
 	return singleton;
 }
 
-export class MultiDisposeError extends Error {
-	constructor(
-		public readonly errors: any[]
-	) {
-		super(`Encountered errors while disposing of store. Errors: [${errors.join(', ')}]`);
-	}
-}
-
 export interface IDisposable {
 	dispose(): void;
 }
@@ -146,7 +138,7 @@ export function dispose<T extends IDisposable>(arg: T | IterableIterator<T> | un
 		if (errors.length === 1) {
 			throw errors[0];
 		} else if (errors.length > 1) {
-			throw new MultiDisposeError(errors);
+			throw new AggregateError(errors, 'Encountered errors while disposing of store');
 		}
 
 		return Array.isArray(arg) ? [] : arg;

src/vs/base/test/common/lifecycle.test.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { Emitter } from 'vs/base/common/event';
-import { DisposableStore, dispose, IDisposable, markAsSingleton, MultiDisposeError, ReferenceCollection, SafeDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, SafeDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ensureNoDisposablesAreLeakedInTestSuite, throwIfDisposablesAreLeaked } from 'vs/base/test/common/utils';
 
 class Disposable implements IDisposable {
@@ -88,10 +88,10 @@ suite('Lifecycle', () => {
 
 		assert.ok(disposedValues.has(1));
 		assert.ok(disposedValues.has(4));
-		assert.ok(thrownError instanceof MultiDisposeError);
-		assert.strictEqual((thrownError as MultiDisposeError).errors.length, 2);
-		assert.strictEqual((thrownError as MultiDisposeError).errors[0].message, 'I am error 1');
-		assert.strictEqual((thrownError as MultiDisposeError).errors[1].message, 'I am error 2');
+		assert.ok(thrownError instanceof AggregateError);
+		assert.strictEqual((thrownError as AggregateError).errors.length, 2);
+		assert.strictEqual((thrownError as AggregateError).errors[0].message, 'I am error 1');
+		assert.strictEqual((thrownError as AggregateError).errors[1].message, 'I am error 2');
 	});
 
 	test('Action bar has broken accessibility #100273', function () {
@@ -167,10 +167,10 @@ suite('DisposableStore', () => {
 
 		assert.ok(disposedValues.has(1));
 		assert.ok(disposedValues.has(4));
-		assert.ok(thrownError instanceof MultiDisposeError);
-		assert.strictEqual((thrownError as MultiDisposeError).errors.length, 2);
-		assert.strictEqual((thrownError as MultiDisposeError).errors[0].message, 'I am error 1');
-		assert.strictEqual((thrownError as MultiDisposeError).errors[1].message, 'I am error 2');
+		assert.ok(thrownError instanceof AggregateError);
+		assert.strictEqual((thrownError as AggregateError).errors.length, 2);
+		assert.strictEqual((thrownError as AggregateError).errors[0].message, 'I am error 1');
+		assert.strictEqual((thrownError as AggregateError).errors[1].message, 'I am error 2');
 	});
 });