Merge pull request microsoft#261091 from microsoft/osortega/fix-cancel-refresh-promises

Fix for setInput canceling all refresh promises

Author: osortega

src/vs/base/browser/ui/tree/asyncDataTree.ts

@@ -791,12 +791,14 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		await this._updateChildren(element, recursive, rerender, undefined, options);
 	}
 
-	cancelAllRefreshPromises(): void {
+	cancelAllRefreshPromises(includeSubTrees: boolean = false): void {
 		this.refreshPromises.forEach(promise => promise.cancel());
 		this.refreshPromises.clear();
 
-		this.subTreeRefreshPromises.forEach(promise => promise.cancel());
-		this.subTreeRefreshPromises.clear();
+		if (includeSubTrees) {
+			this.subTreeRefreshPromises.forEach(promise => promise.cancel());
+			this.subTreeRefreshPromises.clear();
+		}
 	}
 
 	private async _updateChildren(element: TInput | T = this.root.element, recursive = true, rerender = false, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>, options?: IAsyncDataTreeUpdateChildrenOptions<T>): Promise<void> {

src/vs/workbench/contrib/search/browser/searchView.ts

@@ -2648,7 +2648,7 @@ class RefreshTreeController extends Disposable {
 	private queuedIChangeEvents: IChangeEvent[] = [];
 
 	public clearAllPending(): void {
-		this.searchView.getControl().cancelAllRefreshPromises();
+		this.searchView.getControl().cancelAllRefreshPromises(true);
 	}
 
 	public async queue(e?: IChangeEvent): Promise<void> {