Skip to content

Commit c3fe2f0

Browse files
authored
Merge pull request #100365 from microsoft/joh/fix100273
make sure to return empty array when calling dispose-util with array
2 parents af2e1fa + c31ed86 commit c3fe2f0

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/vs/base/common/lifecycle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export function dispose<T extends IDisposable>(arg: T | IterableIterator<T> | un
6666
d.dispose();
6767
}
6868
}
69-
return arg;
69+
return Array.isArray(arg) ? [] : arg;
7070
} else if (arg) {
7171
markTracked(arg);
7272
arg.dispose();

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@ suite('Lifecycle', () => {
4848
assert(disposable.isDisposed);
4949
assert(disposable2.isDisposed);
5050
});
51+
52+
test('Action bar has broken accessibility #100273', function () {
53+
let array = [{ dispose() { } }, { dispose() { } }];
54+
let array2 = dispose(array);
55+
56+
assert.equal(array.length, 2);
57+
assert.equal(array2.length, 0);
58+
assert.ok(array !== array2);
59+
60+
let set = new Set<IDisposable>([{ dispose() { } }, { dispose() { } }]);
61+
let setValues = set.values();
62+
let setValues2 = dispose(setValues);
63+
assert.ok(setValues === setValues2);
64+
65+
});
5166
});
5267

5368
suite('Reference Collection', () => {

0 commit comments

Comments
 (0)