[plugin] restore previous tree view state before synching it

Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Jul 22, 2019 · 624192b · 624192b
1 parent 5f65220
commit 624192b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/packages/plugin-ext/src/main/browser/view/tree-views-main.ts b/packages/plugin-ext/src/main/browser/view/tree-views-main.ts
@@ -48,6 +48,8 @@ export class TreeViewsMainImpl implements TreeViewsMain {
             widget.model.viewInfo = viewInfo;
             if (state) {
                 widget.restoreState(state);
+                // ensure that state is completely restored
+                await widget.model.refresh();
             } else {
                 const root: CompositeTreeNode & ExpandableTreeNode = {
                     id: '',

diff --git a/packages/plugin-ext/src/plugin/tree/tree-views.ts b/packages/plugin-ext/src/plugin/tree/tree-views.ts
@@ -164,6 +164,10 @@ class TreeViewExtImpl<T> extends Disposable {
     async getChildren(parentId: string): Promise<TreeViewItem[] | undefined> {
         // get element from a cache
         const parent = this.getTreeItem(parentId);
+        if (parentId && !parent) {
+            console.error(`No tree item with id '${parentId}' found.`);
+            return [];
+        }
 
         // ask data provider for children for cached element
         const result = await this.treeDataProvider.getChildren(parent);