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

async data tree should update twisties accordingly

Browse Source 
fixes #64394
fixes #64074
This commit is contained in:
Joao Moreno
2018-12-05 15:48:00 +01:00
parent ec0c9f22e9
commit 1e3e06ae9d
6 changed files with 149 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,6 +311,10 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
this.tree.collapseAll();
}
isCollapsible(element: T): boolean {
return this.tree.isCollapsible(this.getDataNode(element));
}
isCollapsed(element: T): boolean {
return this.tree.isCollapsed(this.getDataNode(element));
}
@@ -438,12 +442,12 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
}
private doRefresh(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Thenable<void> {
const hasChildren = this.dataSource.hasChildren(node.element);
const hasChildren = !!this.dataSource.hasChildren(node.element);
if (!hasChildren) {
this.setChildren(node, [], recursive);
return Promise.resolve();
} else if (node !== this.root && this.tree.isCollapsed(node)) {
} else if (node !== this.root && (!this.tree.isCollapsible(node) || this.tree.isCollapsed(node))) {
return Promise.resolve();
} else {
node.state = AsyncDataTreeNodeState.Loading;
@@ -493,7 +497,7 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
parent: node,
state: AsyncDataTreeNodeState.Uninitialized
},
collapsible: this.dataSource.hasChildren(element),
collapsible: !!this.dataSource.hasChildren(element),
collapsed: true
};
}
@@ -516,13 +520,16 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
children: [],
state: AsyncDataTreeNodeState.Uninitialized
},
collapsible: this.dataSource.hasChildren(element),
collapsible: !!this.dataSource.hasChildren(element),
collapsed: true
};
}
asyncDataTreeNode.element = element;
const collapsible = !!this.dataSource.hasChildren(element);
const collapsed = !collapsible || this.tree.isCollapsed(asyncDataTreeNode);
if (recursive) {
asyncDataTreeNode.state = AsyncDataTreeNodeState.Uninitialized;
@@ -531,14 +538,23 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
return {
element: asyncDataTreeNode,
collapsible: this.dataSource.hasChildren(element),
collapsible,
collapsed
};
}
}
let children: Iterator<ITreeElement<IAsyncDataTreeNode<T>>> | undefined = undefined;
if (collapsible) {
children = Iterator.map(Iterator.fromArray(asyncDataTreeNode.children!), asTreeElement);
}
return {
element: asyncDataTreeNode,
children: Iterator.map(Iterator.fromArray(asyncDataTreeNode.children!), asTreeElement)
children,
collapsible,
collapsed
};
});