From 73a8a66e96d53d896654254dce7891cd3f80787a Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 6 Oct 2022 18:24:30 -0700
Subject: [PATCH 1/2] Skip dispose if there's nothing to dispose of

---
 src/vs/base/common/lifecycle.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index da910eb4e77ec..f6f89be9d78e8 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -177,7 +177,7 @@ export class DisposableStore implements IDisposable {
 
 	static DISABLE_DISPOSED_WARNING = false;
 
-	private _toDispose = new Set<IDisposable>();
+	private readonly _toDispose = new Set<IDisposable>();
 	private _isDisposed = false;
 
 	constructor() {
@@ -210,6 +210,10 @@ export class DisposableStore implements IDisposable {
 	 * Dispose of all registered disposables but do not mark this object as disposed.
 	 */
 	public clear(): void {
+		if (this._toDispose.size === 0) {
+			return;
+		}
+
 		try {
 			dispose(this._toDispose.values());
 		} finally {

From db8bbbc19beee4777ca3cba86ea9094790811236 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 6 Oct 2022 18:31:00 -0700
Subject: [PATCH 2/2] Dispose should take an Iterable, not an IterableIterator

We can use `for of` on any iterable, not just on iterable iterators
---
 src/vs/base/common/iterator.ts  | 2 +-
 src/vs/base/common/lifecycle.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
index 2771802f1de77..7d6e1da0c0d23 100644
--- a/src/vs/base/common/iterator.ts
+++ b/src/vs/base/common/iterator.ts
@@ -5,7 +5,7 @@
 
 export namespace Iterable {
 
-	export function is<T = any>(thing: any): thing is IterableIterator<T> {
+	export function is<T = any>(thing: any): thing is Iterable<T> {
 		return thing && typeof thing === 'object' && typeof thing[Symbol.iterator] === 'function';
 	}
 
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index f6f89be9d78e8..e36513cfbfc93 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -118,10 +118,10 @@ export function isDisposable<E extends object>(thing: E): thing is E & IDisposab
 
 export function dispose<T extends IDisposable>(disposable: T): T;
 export function dispose<T extends IDisposable>(disposable: T | undefined): T | undefined;
-export function dispose<T extends IDisposable, A extends IterableIterator<T> = IterableIterator<T>>(disposables: IterableIterator<T>): A;
+export function dispose<T extends IDisposable, A extends Iterable<T> = Iterable<T>>(disposables: A): A;
 export function dispose<T extends IDisposable>(disposables: Array<T>): Array<T>;
 export function dispose<T extends IDisposable>(disposables: ReadonlyArray<T>): ReadonlyArray<T>;
-export function dispose<T extends IDisposable>(arg: T | IterableIterator<T> | undefined): any {
+export function dispose<T extends IDisposable>(arg: T | Iterable<T> | undefined): any {
 	if (Iterable.is(arg)) {
 		const errors: any[] = [];
 
@@ -215,7 +215,7 @@ export class DisposableStore implements IDisposable {
 		}
 
 		try {
-			dispose(this._toDispose.values());
+			dispose(this._toDispose);
 		} finally {
 			this._toDispose.clear();
 		}