Skip to content

Commit 4e143e7

Browse files
committed
Review comments
1 parent a478a8e commit 4e143e7

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
769769
}
770770

771771
async setInput(input: TInput, viewState?: IAsyncDataTreeViewState): Promise<void> {
772-
this.refreshPromises.forEach(promise => promise.cancel());
773-
this.refreshPromises.clear();
772+
this.cancelAllRefreshPromises()
774773

775774
this.root.element = input!;
776775

@@ -792,12 +791,14 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
792791
await this._updateChildren(element, recursive, rerender, undefined, options);
793792
}
794793

795-
cancelAllRefreshPromises(): void {
794+
cancelAllRefreshPromises(includeSubTrees: boolean = false): void {
796795
this.refreshPromises.forEach(promise => promise.cancel());
797796
this.refreshPromises.clear();
798797

799-
this.subTreeRefreshPromises.forEach(promise => promise.cancel());
800-
this.subTreeRefreshPromises.clear();
798+
if (includeSubTrees) {
799+
this.subTreeRefreshPromises.forEach(promise => promise.cancel());
800+
this.subTreeRefreshPromises.clear();
801+
}
801802
}
802803

803804
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2648,7 +2648,7 @@ class RefreshTreeController extends Disposable {
26482648
private queuedIChangeEvents: IChangeEvent[] = [];
26492649

26502650
public clearAllPending(): void {
2651-
this.searchView.getControl().cancelAllRefreshPromises();
2651+
this.searchView.getControl().cancelAllRefreshPromises(true);
26522652
}
26532653

26542654
public async queue(e?: IChangeEvent): Promise<void> {

0 commit comments

Comments
 (0)