Merge branch 'master' into connectionStatusRefactoring

eclipse-theia · Feb 17, 2021 · 5a51ca1 · 5a51ca1
2 parents 87cee26 + f3a15db
commit 5a51ca1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/packages/core/src/browser/shell/split-panels.ts b/packages/core/src/browser/shell/split-panels.ts
@@ -34,7 +34,7 @@ export interface MoveEntry extends SplitPositionOptions {
     targetSize?: number;
     targetPosition?: number;
     startPosition?: number;
-    startTime?: number
+    startTime?: number;
     resolve?: (position: number) => void;
     reject?: (reason: string) => void;
 }

diff --git a/packages/markers/src/browser/problem/problem-tabbar-decorator.ts b/packages/markers/src/browser/problem/problem-tabbar-decorator.ts
@@ -45,6 +45,9 @@ export class ProblemTabBarDecorator implements TabBarDecorator {
     }
 
     decorate(title: Title<Widget>): WidgetDecoration.Data[] {
+        if (!this.preferences['problems.decorations.tabbar.enabled']) {
+            return [];
+        }
         const widget = title.owner;
         if (Navigatable.is(widget)) {
             const resourceUri = widget.getResourceUri();

diff --git a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx
@@ -128,7 +128,7 @@ export class PluginTree extends TreeImpl {
         try {
             const children = await proxy.$getChildren(this.identifier.id, parent.id);
             const oldEmpty = this._isEmpty;
-            this._isEmpty = !children || children.length === 0;
+            this._isEmpty = !parent.id && (!children || children.length === 0);
             if (oldEmpty !== this._isEmpty) {
                 this.onDidChangeWelcomeStateEmitter.fire();
             }