Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 04:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

async data tree: always check for root

Browse Source 
fixes #66408
This commit is contained in:
Joao Moreno
2019-01-14 11:12:44 +01:00
parent 2f18659fdc
commit 7090af71a0
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/base/browser/ui/tree/asyncDataTree.ts
View File

@@ -350,17 +350,18 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
}
collapse(element: T, recursive: boolean = false): boolean {
return this.tree.collapse(this.getDataNode(element), recursive);
const node = this.getDataNode(element);
return this.tree.collapse(node === this.root ? null : node, recursive);
}
async expand(element: T, recursive: boolean = false): Promise<boolean> {
const node = this.getDataNode(element);
if (!this.tree.isCollapsed(node)) {
if (!this.tree.isCollapsed(node === this.root ? null : node)) {
return false;
}
this.tree.expand(node, recursive);
this.tree.expand(node === this.root ? null : node, recursive);
if (node.state !== AsyncDataTreeNodeState.Loaded) {
await this.refreshNode(node, false);
@@ -558,7 +559,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
this._onDidChangeNodeState.fire(node);
if (node !== this.root) {
this.tree.collapse(node);
this.tree.collapse(node === this.root ? null : node);
}
return Promise.reject(err);
@@ -632,12 +633,12 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
asyncDataTreeNode.element = element;
const collapsible = !!this.dataSource.hasChildren(element);
const collapsed = !collapsible || this.tree.isCollapsed(asyncDataTreeNode);
const collapsed = !collapsible || this.tree.isCollapsed(asyncDataTreeNode === this.root ? null : asyncDataTreeNode);
if (recursive) {
asyncDataTreeNode.state = AsyncDataTreeNodeState.Uninitialized;
if (this.tree.isCollapsed(asyncDataTreeNode)) {
if (this.tree.isCollapsed(asyncDataTreeNode === this.root ? null : asyncDataTreeNode)) {
asyncDataTreeNode.children!.length = 0;
return {