async data source can be sync

joaomoreno · joaomoreno · commit 3ccc7a9a1f9f · 2018-12-17T09:59:55.000+01:00
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -468,7 +468,7 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
 				this._onDidChangeNodeState.fire(node);
 			}, _ => null);
 
-			return this.dataSource.getChildren(node.element)
+			return Promise.resolve(this.dataSource.getChildren(node.element))
 				.then(children => {
 					slowTimeout.cancel();
 					node.state = AsyncDataTreeNodeState.Loaded;
diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts
@@ -147,7 +147,7 @@ export interface ITreeNavigator<T> {
 
 export interface IAsyncDataSource<T extends NonNullable<any>> {
 	hasChildren(element: T | null): boolean;
-	getChildren(element: T | null): Promise<T[]>;
+	getChildren(element: T | null): T[] | Promise<T[]>;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ export interface ITreeNavigator<T> {`
`147`	`147`
`148`	`148`	`export interface IAsyncDataSource<T extends NonNullable<any>> {`
`149`	`149`	`hasChildren(element: T \| null): boolean;`
`150`		`- getChildren(element: T \| null): Promise<T[]>;`
	`150`	`+ getChildren(element: T \| null): T[] \| Promise<T[]>;`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`/**`