From 3ccc7a9a1f9fa54dfc696b489461b9c376a3064b Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Mon, 17 Dec 2018 09:59:55 +0100
Subject: [PATCH] async data source can be sync

---
 src/vs/base/browser/ui/tree/asyncDataTree.ts | 2 +-
 src/vs/base/browser/ui/tree/tree.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index e25ee221eb3..a34f34b88bb 100644
--- 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
index 5ef79f41aed..ce23ee060ba 100644
--- 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[]>;
 }
 
 /**
-- 
GitLab