fix #6979: ApplicationShell.getAreaFor should treat tab bars specially

since they are not shell widgets Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Jan 29, 2020 · e38eabb · e38eabb
1 parent a6d565e
commit e38eabb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/examples/api-tests/src/views.spec.js b/examples/api-tests/src/views.spec.js
@@ -48,6 +48,7 @@ describe('Views', function () {
             assert.notEqual(view, undefined);
             assert.equal(shell.getAreaFor(view), contribution.defaultViewOptions.area);
             assert.isDefined(shell.getTabBarFor(view));
+            assert.equal(shell.getAreaFor(shell.getTabBarFor(view)), contribution.defaultViewOptions.area);
             assert.isTrue(view.isVisible);
             assert.equal(view, shell.activeWidget);
 

diff --git a/packages/core/src/browser/shell/application-shell.ts b/packages/core/src/browser/shell/application-shell.ts
@@ -1326,41 +1326,40 @@ export class ApplicationShell extends Widget {
      * Determine the name of the shell area where the given widget resides. The result is
      * undefined if the widget does not reside directly in the shell.
      */
-    getAreaFor(input: Widget): ApplicationShell.Area | undefined {
-        const widget = this.toTrackedStack(input.id).pop();
-        if (!widget) {
-            return undefined;
-        }
-        if (widget instanceof TabBar) {
-            if (find(this.mainPanel.tabBars(), tb => tb === widget)) {
-                return 'main';
-            }
-            if (find(this.bottomPanel.tabBars(), tb => tb === widget)) {
-                return 'bottom';
-            }
-            if (this.leftPanelHandler.tabBar === widget) {
-                return 'left';
-            }
-            if (this.rightPanelHandler.tabBar === widget) {
-                return 'right';
-            }
-        } else {
-            const title = widget.title;
-            const mainPanelTabBar = this.mainPanel.findTabBar(title);
-            if (mainPanelTabBar) {
+    getAreaFor(input: TabBar<Widget> | Widget): ApplicationShell.Area | undefined {
+        if (input instanceof TabBar) {
+            if (find(this.mainPanel.tabBars(), tb => tb === input)) {
                 return 'main';
             }
-            const bottomPanelTabBar = this.bottomPanel.findTabBar(title);
-            if (bottomPanelTabBar) {
+            if (find(this.bottomPanel.tabBars(), tb => tb === input)) {
                 return 'bottom';
             }
-            if (ArrayExt.firstIndexOf(this.leftPanelHandler.tabBar.titles, title) > -1) {
+            if (this.leftPanelHandler.tabBar === input) {
                 return 'left';
             }
-            if (ArrayExt.firstIndexOf(this.rightPanelHandler.tabBar.titles, title) > -1) {
+            if (this.rightPanelHandler.tabBar === input) {
                 return 'right';
             }
         }
+        const widget = this.toTrackedStack(input.id).pop();
+        if (!widget) {
+            return undefined;
+        }
+        const title = widget.title;
+        const mainPanelTabBar = this.mainPanel.findTabBar(title);
+        if (mainPanelTabBar) {
+            return 'main';
+        }
+        const bottomPanelTabBar = this.bottomPanel.findTabBar(title);
+        if (bottomPanelTabBar) {
+            return 'bottom';
+        }
+        if (ArrayExt.firstIndexOf(this.leftPanelHandler.tabBar.titles, title) > -1) {
+            return 'left';
+        }
+        if (ArrayExt.firstIndexOf(this.rightPanelHandler.tabBar.titles, title) > -1) {
+            return 'right';
+        }
         return undefined;
     }