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

Merge branch 'master' into isidorn/debugTrees

Browse Source
This commit is contained in:
Joao Moreno
2018-11-29 16:45:49 +01:00
parent 5f914ae2a7 b2cdc62028
commit 8602d6d74d
3 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ enum AsyncDataTreeNodeState {
}
interface IAsyncDataTreeNode<T extends NonNullable<any>> {
readonly element: T | null;
element: T | null;
readonly parent: IAsyncDataTreeNode<T> | null;
readonly id?: string | null;
readonly children?: IAsyncDataTreeNode<T>[];
@@ -263,7 +263,7 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
// Data Tree
refresh(element: T | null, recursive = false): Thenable<void> {
refresh(element: T | null, recursive = true): Thenable<void> {
return this.refreshNode(this.getDataNode(element), recursive, ChildrenResolutionReason.Refresh);
}
@@ -409,7 +409,15 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
return node;
}
private refreshNode(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Thenable<void> {
private async refreshNode(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Promise<void> {
await this._refreshNode(node, recursive, reason);
if (recursive && node.children) {
await Promise.all(node.children.map(child => this.refreshNode(child, recursive, reason)));
}
}
private _refreshNode(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Thenable<void> {
let result = this.refreshPromises.get(node);
if (result) {
@@ -427,6 +435,8 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
if (!hasChildren) {
this.setChildren(node, [], recursive);
return Promise.resolve();
} else if (node !== this.root && this.tree.isCollapsed(node)) {
return Promise.resolve();
} else {
node.state = AsyncDataTreeNodeState.Loading;
this._onDidChangeNodeState.fire(node);
@@ -503,19 +513,20 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
};
}
// TODO
// if (recursive) {
// asyncDataTreeNode.state = AsyncDataTreeNodeState.Uninitialized;
asyncDataTreeNode.element = element;
// if (this.tree.isCollapsed(asyncDataTreeNode)) {
// asyncDataTreeNode.children!.length = 0;
if (recursive) {
asyncDataTreeNode.state = AsyncDataTreeNodeState.Uninitialized;
// return {
// element: asyncDataTreeNode,
// collapsible: this.dataSource.hasChildren(element),
// };
// }
// }
if (this.tree.isCollapsed(asyncDataTreeNode)) {
asyncDataTreeNode.children!.length = 0;
return {
element: asyncDataTreeNode,
collapsible: this.dataSource.hasChildren(element),
};
}
}
return {
element: asyncDataTreeNode,