Skip to content

Commit

Permalink
Merge pull request #100365 from microsoft/joh/fix100273
Browse files Browse the repository at this point in the history
make sure to return empty array when calling dispose-util with array
  • Loading branch information
jrieken authored Jun 17, 2020
2 parents af2e1fa + c31ed86 commit c3fe2f0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/vs/base/common/lifecycle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
15 changes: 15 additions & 0 deletions src/vs/base/test/common/lifecycle.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down

0 comments on commit c3fe2f0

Please sign in to comment.