make sure to return empty array when calling dispose-util with array

jrieken · jrieken · commit bb55416b411d · 2020-06-17T14:34:22.000+02:00
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
@@ -66,7 +66,7 @@ export function dispose<T extends IDisposable>(arg: T | IterableIterator<T> | un
 				d.dispose();
 			}
 		}
-		return arg;
+		return Array.isArray(arg) ? [] : arg;
 	} else if (arg) {
 		markTracked(arg);
 		arg.dispose();
diff --git a/src/vs/base/test/common/lifecycle.test.ts b/src/vs/base/test/common/lifecycle.test.ts
@@ -48,6 +48,21 @@ suite('Lifecycle', () => {
 		assert(disposable.isDisposed);
 		assert(disposable2.isDisposed);
 	});
+
+	test('Action bar has broken accessibility #100273', function () {
+		let array = [{ dispose() { } }, { dispose() { } }];
+		let array2 = dispose(array);
+
+		assert.equal(array.length, 2);
+		assert.equal(array2.length, 0);
+		assert.ok(array !== array2);
+
+		let set = new Set<IDisposable>([{ dispose() { } }, { dispose() { } }]);
+		let setValues = set.values();
+		let setValues2 = dispose(setValues);
+		assert.ok(setValues === setValues2);
+
+	});
 });
 
 suite('Reference Collection', () => {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ export function dispose<T extends IDisposable>(arg: T \| IterableIterator<T> \| un`
`66`	`66`	`d.dispose();`
`67`	`67`	`}`
`68`	`68`	`}`
`69`		`- return arg;`
	`69`	`+ return Array.isArray(arg) ? [] : arg;`
`70`	`70`	`} else if (arg) {`
`71`	`71`	`markTracked(arg);`
`72`	`72`	`arg.dispose();`