@theia/core 1.47.1 → 1.48.1

package/src/browser/shell/application-shell.ts

@@ -1,2254 +1,2261 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject, optional, postConstruct } from 'inversify';
-import { ArrayExt, find, toArray, each } from '@phosphor/algorithm';
-import {
-    BoxLayout, BoxPanel, DockLayout, DockPanel, FocusTracker, Layout, Panel, SplitLayout,
-    SplitPanel, TabBar, Widget, Title
-} from '@phosphor/widgets';
-import { Message } from '@phosphor/messaging';
-import { IDragEvent } from '@phosphor/dragdrop';
-import { RecursivePartial, Event as CommonEvent, DisposableCollection, Disposable, environment, isObject } from '../../common';
-import { animationFrame } from '../browser';
-import { Saveable, SaveableWidget, SaveOptions, SaveableSource } from '../saveable';
-import { StatusBarImpl, StatusBarEntry, StatusBarAlignment } from '../status-bar/status-bar';
-import { TheiaDockPanel, BOTTOM_AREA_ID, MAIN_AREA_ID } from './theia-dock-panel';
-import { SidePanelHandler, SidePanel, SidePanelHandlerFactory } from './side-panel-handler';
-import { TabBarRendererFactory, SHELL_TABBAR_CONTEXT_MENU, ScrollableTabBar, ToolbarAwareTabBar } from './tab-bars';
-import { SplitPositionHandler, SplitPositionOptions } from './split-panels';
-import { FrontendApplicationStateService } from '../frontend-application-state';
-import { TabBarToolbarRegistry, TabBarToolbarFactory } from './tab-bar-toolbar';
-import { ContextKeyService } from '../context-key-service';
-import { Emitter } from '../../common/event';
-import { waitForRevealed, waitForClosed, PINNED_CLASS } from '../widgets';
-import { CorePreferences } from '../core-preferences';
-import { BreadcrumbsRendererFactory } from '../breadcrumbs/breadcrumbs-renderer';
-import { Deferred } from '../../common/promise-util';
-import { SaveResourceService } from '../save-resource-service';
-import { nls } from '../../common/nls';
-import { SecondaryWindowHandler } from '../secondary-window-handler';
-import URI from '../../common/uri';
-import { OpenerService } from '../opener-service';
-import { PreviewableWidget } from '../widgets/previewable-widget';
-
-/** The class name added to ApplicationShell instances. */
-const APPLICATION_SHELL_CLASS = 'theia-ApplicationShell';
-/** The class name added to the main and bottom area panels. */
-const MAIN_BOTTOM_AREA_CLASS = 'theia-app-centers';
-/** Status bar entry identifier for the bottom panel toggle button. */
-const BOTTOM_PANEL_TOGGLE_ID = 'bottom-panel-toggle';
-/** The class name added to the main area panel. */
-const MAIN_AREA_CLASS = 'theia-app-main';
-/** The class name added to the bottom area panel. */
-const BOTTOM_AREA_CLASS = 'theia-app-bottom';
-
-export type ApplicationShellLayoutVersion =
-    /** layout versioning is introduced, unversioned layout are not compatible */
-    2.0 |
-    /** view containers are introduced, backward compatible to 2.0 */
-    3.0 |
-    /** git history view is replaced by a more generic scm history view, backward compatible to 3.0 */
-    4.0 |
-    /** Replace custom/font-awesome icons with codicons */
-    5.0 |
-    /** added the ability to drag and drop view parts between view containers */
-    6.0;
-
-/**
- * When a version is increased, make sure to introduce a migration (ApplicationShellLayoutMigration) to this version.
- */
-export const applicationShellLayoutVersion: ApplicationShellLayoutVersion = 5.0;
-
-export const ApplicationShellOptions = Symbol('ApplicationShellOptions');
-export const DockPanelRendererFactory = Symbol('DockPanelRendererFactory');
-export interface DockPanelRendererFactory {
-    (): DockPanelRenderer
-}
-
-/**
- * A renderer for dock panels that supports context menus on tabs.
- */
-@injectable()
-export class DockPanelRenderer implements DockLayout.IRenderer {
-
-    @inject(TheiaDockPanel.Factory)
-    protected readonly dockPanelFactory: TheiaDockPanel.Factory;
-
-    readonly tabBarClasses: string[] = [];
-
-    private readonly onDidCreateTabBarEmitter = new Emitter<TabBar<Widget>>();
-
-    constructor(
-        @inject(TabBarRendererFactory) protected readonly tabBarRendererFactory: TabBarRendererFactory,
-        @inject(TabBarToolbarRegistry) protected readonly tabBarToolbarRegistry: TabBarToolbarRegistry,
-        @inject(TabBarToolbarFactory) protected readonly tabBarToolbarFactory: TabBarToolbarFactory,
-        @inject(BreadcrumbsRendererFactory) protected readonly breadcrumbsRendererFactory: BreadcrumbsRendererFactory,
-        @inject(CorePreferences) protected readonly corePreferences: CorePreferences
-    ) { }
-
-    get onDidCreateTabBar(): CommonEvent<TabBar<Widget>> {
-        return this.onDidCreateTabBarEmitter.event;
-    }
-
-    createTabBar(): TabBar<Widget> {
-        const getDynamicTabOptions: () => ScrollableTabBar.Options | undefined = () => {
-            if (this.corePreferences.get('workbench.tab.shrinkToFit.enabled')) {
-                return {
-                    minimumTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.minimumSize'),
-                    defaultTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.defaultSize')
-                };
-            } else {
-                return undefined;
-            }
-        };
-
-        const renderer = this.tabBarRendererFactory();
-        const tabBar = new ToolbarAwareTabBar(
-            this.tabBarToolbarRegistry,
-            this.tabBarToolbarFactory,
-            this.breadcrumbsRendererFactory,
-            {
-                renderer,
-                // Scroll bar options
-                handlers: ['drag-thumb', 'keyboard', 'wheel', 'touch'],
-                useBothWheelAxes: true,
-                scrollXMarginOffset: 4,
-                suppressScrollY: true
-            },
-            getDynamicTabOptions());
-        this.tabBarClasses.forEach(c => tabBar.addClass(c));
-        renderer.tabBar = tabBar;
-        renderer.contextMenuPath = SHELL_TABBAR_CONTEXT_MENU;
-        tabBar.currentChanged.connect(this.onCurrentTabChanged, this);
-        const prefChangeDisposable = this.corePreferences.onPreferenceChanged(change => {
-            if (change.preferenceName === 'workbench.tab.shrinkToFit.enabled' ||
-                change.preferenceName === 'workbench.tab.shrinkToFit.minimumSize' ||
-                change.preferenceName === 'workbench.tab.shrinkToFit.defaultSize') {
-                tabBar.dynamicTabOptions = getDynamicTabOptions();
-            }
-        });
-        tabBar.disposed.connect(() => {
-            prefChangeDisposable.dispose();
-            renderer.dispose();
-        });
-        this.onDidCreateTabBarEmitter.fire(tabBar);
-        return tabBar;
-    }
-
-    createHandle(): HTMLDivElement {
-        return DockPanel.defaultRenderer.createHandle();
-    }
-
-    protected onCurrentTabChanged(sender: ToolbarAwareTabBar, { currentIndex }: TabBar.ICurrentChangedArgs<Widget>): void {
-        if (currentIndex >= 0) {
-            sender.revealTab(currentIndex);
-        }
-    }
-}
-
-/**
- * Data stored while dragging widgets in the shell.
- */
-interface WidgetDragState {
-    startTime: number;
-    leftExpanded: boolean;
-    rightExpanded: boolean;
-    bottomExpanded: boolean;
-    lastDragOver?: IDragEvent;
-    leaveTimeout?: number;
-}
-
-/**
- * The application shell manages the top-level widgets of the application. Use this class to
- * add, remove, or activate a widget.
- */
-@injectable()
-export class ApplicationShell extends Widget {
-
-    /**
-     * The dock panel in the main shell area. This is where editors usually go to.
-     */
-    mainPanel: TheiaDockPanel;
-
-    /**
-     * The dock panel in the bottom shell area. In contrast to the main panel, the bottom panel
-     * can be collapsed and expanded.
-     */
-    bottomPanel: TheiaDockPanel;
-
-    /**
-     * Handler for the left side panel. The primary application views go here, such as the
-     * file explorer and the git view.
-     */
-    leftPanelHandler: SidePanelHandler;
-
-    /**
-     * Handler for the right side panel. The secondary application views go here, such as the
-     * outline view.
-     */
-    rightPanelHandler: SidePanelHandler;
-
-    /**
-     * General options for the application shell.
-     */
-    protected options: ApplicationShell.Options;
-
-    /**
-     * The fixed-size panel shown on top. This one usually holds the main menu.
-     */
-    topPanel: Panel;
-
-    /**
-     * The current state of the bottom panel.
-     */
-    protected readonly bottomPanelState: SidePanel.State = {
-        empty: true,
-        expansion: SidePanel.ExpansionState.collapsed,
-        pendingUpdate: Promise.resolve()
-    };
-
-    private readonly tracker = new FocusTracker<Widget>();
-    private dragState?: WidgetDragState;
-    additionalDraggedUris: URI[] | undefined;
-
-    @inject(ContextKeyService)
-    protected readonly contextKeyService: ContextKeyService;
-
-    @inject(OpenerService)
-    protected readonly openerService: OpenerService;
-
-    protected readonly onDidAddWidgetEmitter = new Emitter<Widget>();
-    readonly onDidAddWidget = this.onDidAddWidgetEmitter.event;
-    protected fireDidAddWidget(widget: Widget): void {
-        this.onDidAddWidgetEmitter.fire(widget);
-    }
-
-    protected readonly onDidRemoveWidgetEmitter = new Emitter<Widget>();
-    readonly onDidRemoveWidget = this.onDidRemoveWidgetEmitter.event;
-    protected fireDidRemoveWidget(widget: Widget): void {
-        this.onDidRemoveWidgetEmitter.fire(widget);
-    }
-
-    protected readonly onDidChangeActiveWidgetEmitter = new Emitter<FocusTracker.IChangedArgs<Widget>>();
-    readonly onDidChangeActiveWidget = this.onDidChangeActiveWidgetEmitter.event;
-
-    protected readonly onDidChangeCurrentWidgetEmitter = new Emitter<FocusTracker.IChangedArgs<Widget>>();
-    readonly onDidChangeCurrentWidget = this.onDidChangeCurrentWidgetEmitter.event;
-
-    protected readonly onDidDoubleClickMainAreaEmitter = new Emitter<void>();
-    readonly onDidDoubleClickMainArea = this.onDidDoubleClickMainAreaEmitter.event;
-
-    @inject(TheiaDockPanel.Factory)
-    protected readonly dockPanelFactory: TheiaDockPanel.Factory;
-
-    private _mainPanelRenderer: DockPanelRenderer;
-    get mainPanelRenderer(): DockPanelRenderer {
-        return this._mainPanelRenderer;
-    }
-
-    /**
-     * Construct a new application shell.
-     */
-    constructor(
-        @inject(DockPanelRendererFactory) protected dockPanelRendererFactory: () => DockPanelRenderer,
-        @inject(StatusBarImpl) protected readonly statusBar: StatusBarImpl,
-        @inject(SidePanelHandlerFactory) protected readonly sidePanelHandlerFactory: () => SidePanelHandler,
-        @inject(SplitPositionHandler) protected splitPositionHandler: SplitPositionHandler,
-        @inject(FrontendApplicationStateService) protected readonly applicationStateService: FrontendApplicationStateService,
-        @inject(ApplicationShellOptions) @optional() options: RecursivePartial<ApplicationShell.Options> = {},
-        @inject(CorePreferences) protected readonly corePreferences: CorePreferences,
-        @inject(SaveResourceService) protected readonly saveResourceService: SaveResourceService,
-        @inject(SecondaryWindowHandler) protected readonly secondaryWindowHandler: SecondaryWindowHandler,
-    ) {
-        super(options as Widget.IOptions);
-
-        // Merge the user-defined application options with the default options
-        this.options = {
-            bottomPanel: {
-                ...ApplicationShell.DEFAULT_OPTIONS.bottomPanel,
-                ...options?.bottomPanel || {}
-            },
-            leftPanel: {
-                ...ApplicationShell.DEFAULT_OPTIONS.leftPanel,
-                ...options?.leftPanel || {}
-            },
-            rightPanel: {
-                ...ApplicationShell.DEFAULT_OPTIONS.rightPanel,
-                ...options?.rightPanel || {}
-            }
-        };
-    }
-
-    @postConstruct()
-    protected init(): void {
-        this.initializeShell();
-        this.initSidebarVisibleKeyContext();
-        this.initFocusKeyContexts();
-
-        if (!environment.electron.is()) {
-            this.corePreferences.ready.then(() => {
-                this.setTopPanelVisibility(this.corePreferences['window.menuBarVisibility']);
-            });
-            this.corePreferences.onPreferenceChanged(preference => {
-                if (preference.preferenceName === 'window.menuBarVisibility') {
-                    this.setTopPanelVisibility(preference.newValue);
-                }
-            });
-        }
-
-        this.corePreferences.onPreferenceChanged(preference => {
-            if (preference.preferenceName === 'window.tabbar.enhancedPreview') {
-                this.allTabBars.forEach(tabBar => {
-                    tabBar.update();
-                });
-            }
-        });
-    }
-
-    protected initializeShell(): void {
-        this.addClass(APPLICATION_SHELL_CLASS);
-        this.id = 'theia-app-shell';
-
-        this.mainPanel = this.createMainPanel();
-        this.topPanel = this.createTopPanel();
-        this.bottomPanel = this.createBottomPanel();
-
-        this.leftPanelHandler = this.sidePanelHandlerFactory();
-        this.leftPanelHandler.create('left', this.options.leftPanel);
-        this.leftPanelHandler.dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
-        this.leftPanelHandler.dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
-
-        this.rightPanelHandler = this.sidePanelHandlerFactory();
-        this.rightPanelHandler.create('right', this.options.rightPanel);
-        this.rightPanelHandler.dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
-        this.rightPanelHandler.dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
-
-        this.secondaryWindowHandler.init(this);
-        this.secondaryWindowHandler.onDidAddWidget(widget => this.fireDidAddWidget(widget));
-        this.secondaryWindowHandler.onDidRemoveWidget(widget => this.fireDidRemoveWidget(widget));
-
-        this.layout = this.createLayout();
-
-        this.tracker.currentChanged.connect(this.onCurrentChanged, this);
-        this.tracker.activeChanged.connect(this.onActiveChanged, this);
-    }
-
-    protected initSidebarVisibleKeyContext(): void {
-        const leftSideBarPanel = this.leftPanelHandler.dockPanel;
-        const sidebarVisibleKey = this.contextKeyService.createKey('sidebarVisible', leftSideBarPanel.isVisible);
-        const onAfterShow = leftSideBarPanel['onAfterShow'].bind(leftSideBarPanel);
-        leftSideBarPanel['onAfterShow'] = (msg: Message) => {
-            onAfterShow(msg);
-            sidebarVisibleKey.set(true);
-        };
-        const onAfterHide = leftSideBarPanel['onAfterHide'].bind(leftSideBarPanel);
-        leftSideBarPanel['onAfterHide'] = (msg: Message) => {
-            onAfterHide(msg);
-            sidebarVisibleKey.set(false);
-        };
-    }
-
-    protected initFocusKeyContexts(): void {
-        const sideBarFocus = this.contextKeyService.createKey<boolean>('sideBarFocus', false);
-        const panelFocus = this.contextKeyService.createKey<boolean>('panelFocus', false);
-        const updateFocusContextKeys = () => {
-            const area = this.activeWidget && this.getAreaFor(this.activeWidget);
-            sideBarFocus.set(area === 'left');
-            panelFocus.set(area === 'main');
-        };
-        updateFocusContextKeys();
-        this.onDidChangeActiveWidget(updateFocusContextKeys);
-    }
-
-    protected setTopPanelVisibility(preference: string): void {
-        const hiddenPreferences = ['compact', 'hidden'];
-        this.topPanel.setHidden(hiddenPreferences.includes(preference));
-    }
-
-    protected override onBeforeAttach(msg: Message): void {
-        document.addEventListener('p-dragenter', this, true);
-        document.addEventListener('p-dragover', this, true);
-        document.addEventListener('p-dragleave', this, true);
-        document.addEventListener('p-drop', this, true);
-    }
-
-    protected override onAfterDetach(msg: Message): void {
-        document.removeEventListener('p-dragenter', this, true);
-        document.removeEventListener('p-dragover', this, true);
-        document.removeEventListener('p-dragleave', this, true);
-        document.removeEventListener('p-drop', this, true);
-    }
-
-    handleEvent(event: Event): void {
-        switch (event.type) {
-            case 'p-dragenter':
-                this.onDragEnter(event as IDragEvent);
-                break;
-            case 'p-dragover':
-                this.onDragOver(event as IDragEvent);
-                break;
-            case 'p-drop':
-                this.onDrop(event as IDragEvent);
-                break;
-            case 'p-dragleave':
-                this.onDragLeave(event as IDragEvent);
-                break;
-        }
-    }
-
-    protected onDragEnter({ mimeData }: IDragEvent): void {
-        if (!this.dragState) {
-            if (mimeData && mimeData.hasData('application/vnd.phosphor.widget-factory')) {
-                // The drag contains a widget, so we'll track it and expand side panels as needed
-                this.dragState = {
-                    startTime: performance.now(),
-                    leftExpanded: false,
-                    rightExpanded: false,
-                    bottomExpanded: false
-                };
-            }
-        }
-    }
-
-    protected onDragOver(event: IDragEvent): void {
-        const state = this.dragState;
-        if (state) {
-            state.lastDragOver = event;
-            if (state.leaveTimeout) {
-                window.clearTimeout(state.leaveTimeout);
-                state.leaveTimeout = undefined;
-            }
-            const { clientX, clientY } = event;
-            const { offsetLeft, offsetTop, clientWidth, clientHeight } = this.node;
-
-            // Don't expand any side panels right after the drag has started
-            const allowExpansion = performance.now() - state.startTime >= 500;
-            const expLeft = allowExpansion && clientX >= offsetLeft
-                && clientX <= offsetLeft + this.options.leftPanel.expandThreshold;
-            const expRight = allowExpansion && clientX <= offsetLeft + clientWidth
-                && clientX >= offsetLeft + clientWidth - this.options.rightPanel.expandThreshold;
-            const expBottom = allowExpansion && !expLeft && !expRight && clientY <= offsetTop + clientHeight
-                && clientY >= offsetTop + clientHeight - this.options.bottomPanel.expandThreshold;
-            // eslint-disable-next-line no-null/no-null
-            if (expLeft && !state.leftExpanded && this.leftPanelHandler.tabBar.currentTitle === null) {
-                // The mouse cursor is moved close to the left border
-                this.leftPanelHandler.expand();
-                this.leftPanelHandler.state.pendingUpdate.then(() => this.dispatchMouseMove());
-                state.leftExpanded = true;
-            } else if (!expLeft && state.leftExpanded) {
-                // The mouse cursor is moved away from the left border
-                this.leftPanelHandler.collapse();
-                state.leftExpanded = false;
-            }
-            // eslint-disable-next-line no-null/no-null
-            if (expRight && !state.rightExpanded && this.rightPanelHandler.tabBar.currentTitle === null) {
-                // The mouse cursor is moved close to the right border
-                this.rightPanelHandler.expand();
-                this.rightPanelHandler.state.pendingUpdate.then(() => this.dispatchMouseMove());
-                state.rightExpanded = true;
-            } else if (!expRight && state.rightExpanded) {
-                // The mouse cursor is moved away from the right border
-                this.rightPanelHandler.collapse();
-                state.rightExpanded = false;
-            }
-            if (expBottom && !state.bottomExpanded && this.bottomPanel.isHidden) {
-                // The mouse cursor is moved close to the bottom border
-                this.expandBottomPanel();
-                this.bottomPanelState.pendingUpdate.then(() => this.dispatchMouseMove());
-                state.bottomExpanded = true;
-            } else if (!expBottom && state.bottomExpanded) {
-                // The mouse cursor is moved away from the bottom border
-                this.collapseBottomPanel();
-                state.bottomExpanded = false;
-            }
-        }
-    }
-
-    /**
-     * This method is called after a side panel has been expanded while dragging a widget. It fires
-     * a `mousemove` event so that the drag overlay markers are updated correctly in all dock panels.
-     */
-    private dispatchMouseMove(): void {
-        if (this.dragState && this.dragState.lastDragOver) {
-            const { clientX, clientY } = this.dragState.lastDragOver;
-            const event = document.createEvent('MouseEvent');
-            event.initMouseEvent('mousemove', true, true, window, 0, 0, 0,
-                // eslint-disable-next-line no-null/no-null
-                clientX, clientY, false, false, false, false, 0, null);
-            document.dispatchEvent(event);
-        }
-    }
-
-    protected onDrop(event: IDragEvent): void {
-        const state = this.dragState;
-        if (state) {
-            if (state.leaveTimeout) {
-                window.clearTimeout(state.leaveTimeout);
-            }
-            this.dragState = undefined;
-            window.requestAnimationFrame(() => {
-                // Clean up the side panel state in the next frame
-                if (this.leftPanelHandler.dockPanel.isEmpty) {
-                    this.leftPanelHandler.collapse();
-                }
-                if (this.rightPanelHandler.dockPanel.isEmpty) {
-                    this.rightPanelHandler.collapse();
-                }
-                if (this.bottomPanel.isEmpty) {
-                    this.collapseBottomPanel();
-                }
-            });
-        }
-    }
-
-    protected onDragLeave(event: IDragEvent): void {
-        const state = this.dragState;
-        if (state) {
-            state.lastDragOver = undefined;
-            if (state.leaveTimeout) {
-                window.clearTimeout(state.leaveTimeout);
-            }
-            state.leaveTimeout = window.setTimeout(() => {
-                this.dragState = undefined;
-                if (state.leftExpanded || this.leftPanelHandler.dockPanel.isEmpty) {
-                    this.leftPanelHandler.collapse();
-                }
-                if (state.rightExpanded || this.rightPanelHandler.dockPanel.isEmpty) {
-                    this.rightPanelHandler.collapse();
-                }
-                if (state.bottomExpanded || this.bottomPanel.isEmpty) {
-                    this.collapseBottomPanel();
-                }
-            }, 100);
-        }
-    }
-
-    /**
-     * Create the dock panel in the main shell area.
-     */
-    protected createMainPanel(): TheiaDockPanel {
-        const renderer = this.dockPanelRendererFactory();
-        renderer.tabBarClasses.push(MAIN_BOTTOM_AREA_CLASS);
-        renderer.tabBarClasses.push(MAIN_AREA_CLASS);
-        this._mainPanelRenderer = renderer;
-        const dockPanel = this.dockPanelFactory({
-            mode: 'multiple-document',
-            renderer,
-            spacing: 0
-        });
-        dockPanel.id = MAIN_AREA_ID;
-        dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
-        dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
-
-        const openUri = async (fileUri: URI) => {
-            try {
-                const opener = await this.openerService.getOpener(fileUri);
-                opener.open(fileUri);
-            } catch (e) {
-                console.info(`no opener found for '${fileUri}'`);
-            }
-        };
-
-        dockPanel.node.addEventListener('drop', event => {
-            if (event.dataTransfer) {
-                const uris = this.additionalDraggedUris || ApplicationShell.getDraggedEditorUris(event.dataTransfer);
-                if (uris.length > 0) {
-                    uris.forEach(openUri);
-                } else if (event.dataTransfer.files?.length > 0) {
-                    // the files were dragged from the outside the workspace
-                    Array.from(event.dataTransfer.files).forEach(file => {
-                        if (file.path) {
-                            const fileUri = URI.fromComponents({
-                                scheme: 'file',
-                                path: file.path,
-                                authority: '',
-                                query: '',
-                                fragment: ''
-                            });
-                            openUri(fileUri);
-                        }
-                    });
-                }
-            }
-        });
-
-        dockPanel.node.addEventListener('dblclick', event => {
-            const el = event.target as Element;
-            if (el.id === MAIN_AREA_ID || el.classList.contains('p-TabBar-content')) {
-                this.onDidDoubleClickMainAreaEmitter.fire();
-            }
-        });
-
-        const handler = (e: DragEvent) => {
-            if (e.dataTransfer) {
-                e.dataTransfer.dropEffect = 'link';
-                e.preventDefault();
-                e.stopPropagation();
-            }
-        };
-        dockPanel.node.addEventListener('dragover', handler);
-        dockPanel.node.addEventListener('dragenter', handler);
-
-        return dockPanel;
-    }
-
-    addAdditionalDraggedEditorUris(uris: URI[]): void {
-        this.additionalDraggedUris = uris;
-    }
-
-    clearAdditionalDraggedEditorUris(): void {
-        this.additionalDraggedUris = undefined;
-    }
-
-    protected static getDraggedEditorUris(dataTransfer: DataTransfer): URI[] {
-        const data = dataTransfer.getData('theia-editor-dnd');
-        return data ? data.split('\n').map(entry => new URI(entry)) : [];
-    }
-
-    static setDraggedEditorUris(dataTransfer: DataTransfer, uris: URI[]): void {
-        dataTransfer.setData('theia-editor-dnd', uris.map(uri => uri.toString()).join('\n'));
-    }
-
-    /**
-     * Create the dock panel in the bottom shell area.
-     */
-    protected createBottomPanel(): TheiaDockPanel {
-        const renderer = this.dockPanelRendererFactory();
-        renderer.tabBarClasses.push(MAIN_BOTTOM_AREA_CLASS);
-        renderer.tabBarClasses.push(BOTTOM_AREA_CLASS);
-        const dockPanel = this.dockPanelFactory({
-            mode: 'multiple-document',
-            renderer,
-            spacing: 0
-        });
-        dockPanel.id = BOTTOM_AREA_ID;
-        dockPanel.widgetAdded.connect((sender, widget) => {
-            this.refreshBottomPanelToggleButton();
-        });
-        dockPanel.widgetRemoved.connect((sender, widget) => {
-            if (sender.isEmpty) {
-                this.collapseBottomPanel();
-            }
-            this.refreshBottomPanelToggleButton();
-        }, this);
-        dockPanel.node.addEventListener('p-dragenter', event => {
-            // Make sure that the main panel hides its overlay when the bottom panel is expanded
-            this.mainPanel.overlay.hide(0);
-        });
-        dockPanel.hide();
-        dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
-        dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
-        return dockPanel;
-    }
-
-    /**
-     * Create the top panel, which is used to hold the main menu.
-     */
-    protected createTopPanel(): Panel {
-        const topPanel = new Panel();
-        topPanel.id = 'theia-top-panel';
-        topPanel.hide();
-        return topPanel;
-    }
-
-    /**
-     * Create a box layout to assemble the application shell layout.
-     */
-    protected createBoxLayout(widgets: Widget[], stretch?: number[], options?: BoxPanel.IOptions): BoxLayout {
-        const boxLayout = new BoxLayout(options);
-        for (let i = 0; i < widgets.length; i++) {
-            if (stretch !== undefined && i < stretch.length) {
-                BoxPanel.setStretch(widgets[i], stretch[i]);
-            }
-            boxLayout.addWidget(widgets[i]);
-        }
-        return boxLayout;
-    }
-
-    /**
-     * Create a split layout to assemble the application shell layout.
-     */
-    protected createSplitLayout(widgets: Widget[], stretch?: number[], options?: Partial<SplitLayout.IOptions>): SplitLayout {
-        let optParam: SplitLayout.IOptions = { renderer: SplitPanel.defaultRenderer, };
-        if (options) {
-            optParam = { ...optParam, ...options };
-        }
-        const splitLayout = new SplitLayout(optParam);
-        for (let i = 0; i < widgets.length; i++) {
-            if (stretch !== undefined && i < stretch.length) {
-                SplitPanel.setStretch(widgets[i], stretch[i]);
-            }
-            splitLayout.addWidget(widgets[i]);
-        }
-        return splitLayout;
-    }
-
-    /**
-     * Assemble the application shell layout. Override this method in order to change the arrangement
-     * of the main area and the side panels.
-     */
-    protected createLayout(): Layout {
-        const bottomSplitLayout = this.createSplitLayout(
-            [this.mainPanel, this.bottomPanel],
-            [1, 0],
-            { orientation: 'vertical', spacing: 0 }
-        );
-        const panelForBottomArea = new SplitPanel({ layout: bottomSplitLayout });
-        panelForBottomArea.id = 'theia-bottom-split-panel';
-
-        const leftRightSplitLayout = this.createSplitLayout(
-            [this.leftPanelHandler.container, panelForBottomArea, this.rightPanelHandler.container],
-            [0, 1, 0],
-            { orientation: 'horizontal', spacing: 0 }
-        );
-        const panelForSideAreas = new SplitPanel({ layout: leftRightSplitLayout });
-        panelForSideAreas.id = 'theia-left-right-split-panel';
-
-        return this.createBoxLayout(
-            [this.topPanel, panelForSideAreas, this.statusBar],
-            [0, 1, 0],
-            { direction: 'top-to-bottom', spacing: 0 }
-        );
-    }
-
-    /**
-     * Create an object that describes the current shell layout. This object may contain references
-     * to widgets; these need to be transformed before the layout can be serialized.
-     */
-    getLayoutData(): ApplicationShell.LayoutData {
-        return {
-            version: applicationShellLayoutVersion,
-            mainPanel: this.mainPanel.saveLayout(),
-            mainPanelPinned: this.getPinnedMainWidgets(),
-            bottomPanel: {
-                config: this.bottomPanel.saveLayout(),
-                pinned: this.getPinnedBottomWidgets(),
-                size: this.bottomPanel.isVisible ? this.getBottomPanelSize() : this.bottomPanelState.lastPanelSize,
-                expanded: this.isExpanded('bottom')
-            },
-            leftPanel: this.leftPanelHandler.getLayoutData(),
-            rightPanel: this.rightPanelHandler.getLayoutData(),
-            activeWidgetId: this.activeWidget ? this.activeWidget.id : undefined
-        };
-    }
-
-    // Get an array corresponding to main panel widgets' pinned state.
-    getPinnedMainWidgets(): boolean[] {
-        const pinned: boolean[] = [];
-
-        toArray(this.mainPanel.widgets()).forEach((a, i) => {
-            pinned[i] = a.title.className.includes(PINNED_CLASS);
-        });
-
-        return pinned;
-    }
-
-    // Get an array corresponding to bottom panel widgets' pinned state.
-    getPinnedBottomWidgets(): boolean[] {
-        const pinned: boolean[] = [];
-
-        toArray(this.bottomPanel.widgets()).forEach((a, i) => {
-            pinned[i] = a.title.className.includes(PINNED_CLASS);
-        });
-
-        return pinned;
-    }
-
-    /**
-     * Compute the current height of the bottom panel. This implementation assumes that the container
-     * of the bottom panel is a `SplitPanel`.
-     */
-    protected getBottomPanelSize(): number | undefined {
-        const parent = this.bottomPanel.parent;
-        if (parent instanceof SplitPanel && parent.isVisible) {
-            const index = parent.widgets.indexOf(this.bottomPanel) - 1;
-            if (index >= 0) {
-                const handle = parent.handles[index];
-                if (!handle.classList.contains('p-mod-hidden')) {
-                    const parentHeight = parent.node.clientHeight;
-                    return parentHeight - handle.offsetTop;
-                }
-            }
-        }
-    }
-
-    /**
-     * Determine the default size to apply when the bottom panel is expanded for the first time.
-     */
-    protected getDefaultBottomPanelSize(): number | undefined {
-        const parent = this.bottomPanel.parent;
-        if (parent && parent.isVisible) {
-            return parent.node.clientHeight * this.options.bottomPanel.initialSizeRatio;
-        }
-    }
-
-    /**
-     * Apply a shell layout that has been previously created with `getLayoutData`.
-     */
-    async setLayoutData(layoutData: ApplicationShell.LayoutData): Promise<void> {
-        const { mainPanel, mainPanelPinned, bottomPanel, leftPanel, rightPanel, activeWidgetId } = layoutData;
-        if (leftPanel) {
-            this.leftPanelHandler.setLayoutData(leftPanel);
-            this.registerWithFocusTracker(leftPanel);
-        }
-        if (rightPanel) {
-            this.rightPanelHandler.setLayoutData(rightPanel);
-            this.registerWithFocusTracker(rightPanel);
-        }
-        // Proceed with the bottom panel once the side panels are set up
-        await Promise.all([this.leftPanelHandler.state.pendingUpdate, this.rightPanelHandler.state.pendingUpdate]);
-        if (bottomPanel) {
-            if (bottomPanel.config) {
-                this.bottomPanel.restoreLayout(bottomPanel.config);
-                this.registerWithFocusTracker(bottomPanel.config.main);
-            }
-            if (bottomPanel.size) {
-                this.bottomPanelState.lastPanelSize = bottomPanel.size;
-            }
-            if (bottomPanel.expanded) {
-                this.expandBottomPanel();
-            } else {
-                this.collapseBottomPanel();
-            }
-            const widgets = toArray(this.bottomPanel.widgets());
-            this.bottomPanel.markActiveTabBar(widgets[0]?.title);
-            if (bottomPanel.pinned && bottomPanel.pinned.length === widgets.length) {
-                widgets.forEach((a, i) => {
-                    if (bottomPanel.pinned![i]) {
-                        a.title.className += ` ${PINNED_CLASS}`;
-                        a.title.closable = false;
-                    }
-                });
-            }
-            this.refreshBottomPanelToggleButton();
-        }
-        // Proceed with the main panel once all others are set up
-        await this.bottomPanelState.pendingUpdate;
-        if (mainPanel) {
-            this.mainPanel.restoreLayout(mainPanel);
-            this.registerWithFocusTracker(mainPanel.main);
-            const widgets = toArray(this.mainPanel.widgets());
-            // We don't store information about the last active tabbar
-            // So we simply mark the first as being active
-            this.mainPanel.markActiveTabBar(widgets[0]?.title);
-            if (mainPanelPinned && mainPanelPinned.length === widgets.length) {
-                widgets.forEach((a, i) => {
-                    if (mainPanelPinned[i]) {
-                        a.title.className += ` ${PINNED_CLASS}`;
-                        a.title.closable = false;
-                    }
-                });
-            }
-        }
-        if (activeWidgetId) {
-            this.activateWidget(activeWidgetId);
-        }
-    }
-
-    /**
-     * Modify the height of the bottom panel. This implementation assumes that the container of the
-     * bottom panel is a `SplitPanel`.
-     */
-    protected setBottomPanelSize(size: number): Promise<void> {
-        const enableAnimation = this.applicationStateService.state === 'ready';
-        const options: SplitPositionOptions = {
-            side: 'bottom',
-            duration: enableAnimation ? this.options.bottomPanel.expandDuration : 0,
-            referenceWidget: this.bottomPanel
-        };
-        const promise = this.splitPositionHandler.setSidePanelSize(this.bottomPanel, size, options);
-        const result = new Promise<void>(resolve => {
-            // Resolve the resulting promise in any case, regardless of whether resizing was successful
-            promise.then(() => resolve(), () => resolve());
-        });
-        this.bottomPanelState.pendingUpdate = this.bottomPanelState.pendingUpdate.then(() => result);
-        return result;
-    }
-
-    /**
-     * A promise that is resolved when all currently pending updates are done.
-     */
-    get pendingUpdates(): Promise<void> {
-        return Promise.all([
-            this.bottomPanelState.pendingUpdate,
-            this.leftPanelHandler.state.pendingUpdate,
-            this.rightPanelHandler.state.pendingUpdate
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ]) as Promise<any>;
-    }
-
-    /**
-     * Track all widgets that are referenced by the given layout data.
-     */
-    protected registerWithFocusTracker(data: DockLayout.ITabAreaConfig | DockLayout.ISplitAreaConfig | SidePanel.LayoutData | null): void {
-        if (data) {
-            if (data.type === 'tab-area') {
-                for (const widget of data.widgets) {
-                    if (widget) {
-                        this.track(widget);
-                    }
-                }
-            } else if (data.type === 'split-area') {
-                for (const child of data.children) {
-                    this.registerWithFocusTracker(child);
-                }
-            } else if (data.type === 'sidepanel' && data.items) {
-                for (const item of data.items) {
-                    if (item.widget) {
-                        this.track(item.widget);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Add a widget to the application shell. The given widget must have a unique `id` property,
-     * which will be used as the DOM id.
-     *
-     * Widgets are removed from the shell by calling their `close` or `dispose` methods.
-     *
-     * Widgets added to the top area are not tracked regarding the _current_ and _active_ states.
-     */
-    async addWidget(widget: Widget, options?: Readonly<ApplicationShell.WidgetOptions>): Promise<void> {
-        if (!widget.id) {
-            console.error('Widgets added to the application shell must have a unique id property.');
-            return;
-        }
-        const { area, addOptions } = this.getInsertionOptions(options);
-        const sidePanelOptions: SidePanel.WidgetOptions = { rank: options?.rank };
-        switch (area) {
-            case 'main':
-                this.mainPanel.addWidget(widget, addOptions);
-                break;
-            case 'top':
-                this.topPanel.addWidget(widget);
-                break;
-            case 'bottom':
-                this.bottomPanel.addWidget(widget, addOptions);
-                break;
-            case 'left':
-                this.leftPanelHandler.addWidget(widget, sidePanelOptions);
-                break;
-            case 'right':
-                this.rightPanelHandler.addWidget(widget, sidePanelOptions);
-                break;
-            case 'secondaryWindow':
-                /** At the moment, widgets are only moved to this area (i.e. a secondary window) by moving them from one of the other areas. */
-                throw new Error('Widgets cannot be added directly to a secondary window');
-            default:
-                throw new Error('Unexpected area: ' + options?.area);
-        }
-        if (area !== 'top') {
-            this.track(widget);
-        }
-    }
-
-    getInsertionOptions(options?: Readonly<ApplicationShell.WidgetOptions>): { area: string; addOptions: DockLayout.IAddOptions; } {
-        let ref: Widget | undefined = options?.ref;
-        let area: ApplicationShell.Area = options?.area || 'main';
-        if (!ref && (area === 'main' || area === 'bottom')) {
-            const tabBar = this.getTabBarFor(area);
-            ref = tabBar && tabBar.currentTitle && tabBar.currentTitle.owner || undefined;
-        }
-        // make sure that ref belongs to area
-        area = ref && this.getAreaFor(ref) || area;
-        const addOptions: DockPanel.IAddOptions = {};
-        if (ApplicationShell.isOpenToSideMode(options?.mode)) {
-            const areaPanel = area === 'main' ? this.mainPanel : area === 'bottom' ? this.bottomPanel : undefined;
-            const sideRef = areaPanel && ref && (options?.mode === 'open-to-left' ?
-                areaPanel.previousTabBarWidget(ref) :
-                areaPanel.nextTabBarWidget(ref));
-            if (sideRef) {
-                addOptions.ref = sideRef;
-            } else {
-                addOptions.ref = ref;
-                addOptions.mode = options?.mode === 'open-to-left' ? 'split-left' : 'split-right';
-            }
-        } else {
-            addOptions.ref = ref;
-            addOptions.mode = options?.mode;
-        }
-        return { area, addOptions };
-    }
-
-    /**
-     * The widgets contained in the given shell area.
-     */
-    getWidgets(area: ApplicationShell.Area): Widget[] {
-        switch (area) {
-            case 'main':
-                return toArray(this.mainPanel.widgets());
-            case 'top':
-                return toArray(this.topPanel.widgets);
-            case 'bottom':
-                return toArray(this.bottomPanel.widgets());
-            case 'left':
-                return toArray(this.leftPanelHandler.dockPanel.widgets());
-            case 'right':
-                return toArray(this.rightPanelHandler.dockPanel.widgets());
-            case 'secondaryWindow':
-                return toArray(this.secondaryWindowHandler.widgets);
-            default:
-                throw new Error('Illegal argument: ' + area);
-        }
-    }
-
-    /**
-     * Find the widget that contains the given HTML element. The returned widget may be one
-     * that is managed by the application shell, or one that is embedded in another widget and
-     * not directly managed by the shell, or a tab bar.
-     */
-    findWidgetForElement(element: HTMLElement): Widget | undefined {
-        let widgetNode: HTMLElement | null = element;
-        while (widgetNode && !widgetNode.classList.contains('p-Widget')) {
-            widgetNode = widgetNode.parentElement;
-        }
-        if (widgetNode) {
-            return this.findWidgetForNode(widgetNode, this);
-        }
-        return undefined;
-    }
-
-    private findWidgetForNode(widgetNode: HTMLElement, widget: Widget): Widget | undefined {
-        if (widget.node === widgetNode) {
-            return widget;
-        }
-        let result: Widget | undefined;
-        each(widget.children(), child => {
-            result = this.findWidgetForNode(widgetNode, child);
-            return !result;
-        });
-        return result;
-    }
-
-    /**
-     * Finds the title widget from the tab-bar.
-     * @param tabBar used for providing an array of titles.
-     * @returns the selected title widget, else returns the currentTitle or undefined.
-     */
-    findTitle(tabBar: TabBar<Widget>, event?: Event): Title<Widget> | undefined {
-        if (event?.target instanceof HTMLElement) {
-            const tabNode = event.target;
-
-            const titleIndex = Array.from(tabBar.contentNode.getElementsByClassName('p-TabBar-tab'))
-                .findIndex(node => node.contains(tabNode));
-
-            if (titleIndex !== -1) {
-                return tabBar.titles[titleIndex];
-            }
-
-        }
-        return tabBar.currentTitle || undefined;
-    }
-
-    /**
-     * Finds the tab-bar widget.
-     * @returns the selected tab-bar, else returns the currentTabBar.
-     */
-    findTabBar(event?: Event): TabBar<Widget> | undefined {
-        if (event?.target instanceof HTMLElement) {
-            const tabBar = this.findWidgetForElement(event.target);
-            if (tabBar instanceof TabBar) {
-                return tabBar;
-            }
-        }
-        return this.currentTabBar;
-    }
-
-    /**
-     *  @returns the widget whose title has been targeted by a DOM event on a tabbar, or undefined if none can be found.
-     */
-    findTargetedWidget(event?: Event): Widget | undefined {
-        if (event) {
-            const tab = this.findTabBar(event);
-            const title = tab && this.findTitle(tab, event);
-            return title && title.owner;
-        }
-    }
-
-    /**
-     * The current widget in the application shell. The current widget is the last widget that
-     * was active and not yet closed. See the remarks to `activeWidget` on what _active_ means.
-     */
-    get currentWidget(): Widget | undefined {
-        return this.tracker.currentWidget || undefined;
-    }
-
-    /**
-     * The active widget in the application shell. The active widget is the one that has focus
-     * (either the widget itself or any of its contents).
-     *
-     * _Note:_ Focus is taken by a widget through the `onActivateRequest` method. It is up to the
-     * widget implementation which DOM element will get the focus. The default implementation
-     * does not take any focus; in that case the widget is never returned by this property.
-     */
-    get activeWidget(): Widget | undefined {
-        return this.tracker.activeWidget || undefined;
-    }
-
-    /**
-     * Returns the last active widget in the given shell area.
-     */
-    getCurrentWidget(area: ApplicationShell.Area): Widget | undefined {
-        let title: Title<Widget> | null | undefined;
-        switch (area) {
-            case 'main':
-                title = this.mainPanel.currentTitle;
-                break;
-            case 'bottom':
-                title = this.bottomPanel.currentTitle;
-                break;
-            case 'left':
-                title = this.leftPanelHandler.tabBar.currentTitle;
-                break;
-            case 'right':
-                title = this.rightPanelHandler.tabBar.currentTitle;
-                break;
-            case 'secondaryWindow':
-                // The current widget in a secondary window is not tracked.
-                return undefined;
-            default:
-                throw new Error('Illegal argument: ' + area);
-        }
-        return title ? title.owner : undefined;
-    }
-
-    /**
-     * Handle a change to the current widget.
-     */
-    private onCurrentChanged(sender: FocusTracker<Widget>, args: FocusTracker.IChangedArgs<Widget>): void {
-        this.onDidChangeCurrentWidgetEmitter.fire(args);
-    }
-
-    protected readonly toDisposeOnActiveChanged = new DisposableCollection();
-
-    /**
-     * Handle a change to the active widget.
-     */
-    private onActiveChanged(sender: FocusTracker<Widget>, args: FocusTracker.IChangedArgs<Widget>): void {
-        this.toDisposeOnActiveChanged.dispose();
-        const { newValue, oldValue } = args;
-        if (oldValue) {
-            let w: Widget | null = oldValue;
-            while (w) {
-                // Remove the mark of the previously active widget
-                w.title.className = w.title.className.replace(' theia-mod-active', '');
-                w = w.parent;
-            }
-            // Reset the z-index to the default
-            // eslint-disable-next-line no-null/no-null
-            this.setZIndex(oldValue.node, null);
-        }
-        if (newValue) {
-            let w: Widget | null = newValue;
-            while (w) {
-                // Mark the tab of the active widget
-                w.title.className += ' theia-mod-active';
-                w = w.parent;
-            }
-            // Reveal the title of the active widget in its tab bar
-            const tabBar = this.getTabBarFor(newValue);
-            if (tabBar instanceof ScrollableTabBar) {
-                const index = tabBar.titles.indexOf(newValue.title);
-                if (index >= 0) {
-                    tabBar.revealTab(index);
-                }
-            }
-            const widget = this.toTrackedStack(newValue.id).pop();
-            const panel = this.findPanel(widget);
-            if (panel) {
-                // if widget was undefined, we wouldn't have gotten a panel back before
-                panel.markAsCurrent(widget!.title);
-            }
-            // Add checks to ensure that the 'sash' for left panel is displayed correctly
-            if (newValue.node.className === 'p-Widget theia-view-container p-DockPanel-widget') {
-                // Set the z-index so elements with `position: fixed` contained in the active widget are displayed correctly
-                this.setZIndex(newValue.node, '1');
-            }
-
-            // activate another widget if an active widget will be closed
-            const onCloseRequest = newValue['onCloseRequest'];
-            newValue['onCloseRequest'] = msg => {
-                const currentTabBar = this.currentTabBar;
-                if (currentTabBar) {
-                    const recentlyUsedInTabBar = currentTabBar['_previousTitle'] as TabBar<Widget>['currentTitle'];
-                    if (recentlyUsedInTabBar && recentlyUsedInTabBar.owner !== newValue) {
-                        currentTabBar.currentIndex = ArrayExt.firstIndexOf(currentTabBar.titles, recentlyUsedInTabBar);
-                        if (currentTabBar.currentTitle) {
-                            this.activateWidget(currentTabBar.currentTitle.owner.id);
-                        }
-                    } else if (!this.activateNextTabInTabBar(currentTabBar)) {
-                        if (!this.activatePreviousTabBar(currentTabBar)) {
-                            this.activateNextTabBar(currentTabBar);
-                        }
-                    }
-                }
-                newValue['onCloseRequest'] = onCloseRequest;
-                newValue['onCloseRequest'](msg);
-            };
-            this.toDisposeOnActiveChanged.push(Disposable.create(() => newValue['onCloseRequest'] = onCloseRequest));
-            if (PreviewableWidget.is(newValue)) {
-                newValue.loaded = true;
-            }
-        }
-        this.onDidChangeActiveWidgetEmitter.fire(args);
-    }
-
-    /**
-     * Set the z-index of the given element and its ancestors to the value `z`.
-     */
-    private setZIndex(element: HTMLElement, z: string | null): void {
-        element.style.zIndex = z || '';
-        const parent = element.parentElement;
-        if (parent && parent !== this.node) {
-            this.setZIndex(parent, z);
-        }
-    }
-
-    /**
-     * Track the given widget so it is considered in the `current` and `active` state of the shell.
-     */
-    protected track(widget: Widget): void {
-        if (this.tracker.widgets.indexOf(widget) !== -1) {
-            return;
-        }
-        this.tracker.add(widget);
-        this.checkActivation(widget);
-        Saveable.apply(
-            widget,
-            () => this.widgets.filter((maybeSaveable): maybeSaveable is Widget & SaveableSource => !!Saveable.get(maybeSaveable)),
-            async (toSave, options) => {
-                await this.saveResourceService.save(toSave, options);
-            },
-        );
-        if (ApplicationShell.TrackableWidgetProvider.is(widget)) {
-            for (const toTrack of widget.getTrackableWidgets()) {
-                this.track(toTrack);
-            }
-            if (widget.onDidChangeTrackableWidgets) {
-                widget.onDidChangeTrackableWidgets(widgets => widgets.forEach(w => this.track(w)));
-            }
-        }
-    }
-
-    /**
-     * @returns an array of Widgets, all of which are tracked by the focus tracker
-     * The first member of the array is the widget whose id is passed in, and the other widgets
-     * are its tracked parents in ascending order
-     */
-    protected toTrackedStack(id: string): Widget[] {
-        const tracked = new Map<string, Widget>(this.tracker.widgets.map(w => [w.id, w] as [string, Widget]));
-        let current = tracked.get(id);
-        const stack: Widget[] = [];
-        while (current) {
-            if (tracked.has(current.id)) {
-                stack.push(current);
-            }
-            current = current.parent || undefined;
-        }
-        return stack;
-    }
-
-    /**
-     * Activate a widget in the application shell. This makes the widget visible and usually
-     * also assigns focus to it.
-     *
-     * _Note:_ Focus is taken by a widget through the `onActivateRequest` method. It is up to the
-     * widget implementation which DOM element will get the focus. The default implementation
-     * does not take any focus.
-     *
-     * @returns the activated widget if it was found
-     */
-    async activateWidget(id: string): Promise<Widget | undefined> {
-        const stack = this.toTrackedStack(id);
-        let current = stack.pop();
-        if (current && !this.doActivateWidget(current.id)) {
-            return undefined;
-        }
-        while (current && stack.length) {
-            const child = stack.pop()!;
-            if (ApplicationShell.TrackableWidgetProvider.is(current) && current.activateWidget) {
-                current = current.activateWidget(child.id);
-            } else {
-                child.activate();
-                current = child;
-            }
-        }
-        if (!current) {
-            return undefined;
-        }
-        return Promise.all([
-            this.waitForActivation(current.id),
-            waitForRevealed(current),
-            this.pendingUpdates
-        ]).then(() => current, () => undefined);
-    }
-
-    waitForActivation(id: string): Promise<void> {
-        if (this.activeWidget && this.activeWidget.id === id) {
-            return Promise.resolve();
-        }
-        const activation = new Deferred();
-        const success = this.onDidChangeActiveWidget(() => {
-            if (this.activeWidget && this.activeWidget.id === id) {
-                activation.resolve();
-            }
-        });
-        const failure = setTimeout(() => activation.reject(new Error(`Widget with id '${id}' failed to activate.`)), this.activationTimeout + 250);
-        return activation.promise.finally(() => {
-            success.dispose();
-            clearTimeout(failure);
-        });
-    }
-
-    /**
-     * Activate top-level area widget.
-     */
-    protected doActivateWidget(id: string): Widget | undefined {
-        let widget = find(this.mainPanel.widgets(), w => w.id === id);
-        if (widget) {
-            this.mainPanel.activateWidget(widget);
-            return widget;
-        }
-        widget = find(this.bottomPanel.widgets(), w => w.id === id);
-        if (widget) {
-            this.expandBottomPanel();
-            this.bottomPanel.activateWidget(widget);
-            return widget;
-        }
-        widget = this.leftPanelHandler.activate(id);
-        if (widget) {
-            return widget;
-        }
-        widget = this.rightPanelHandler.activate(id);
-        if (widget) {
-            return widget;
-        }
-        return this.secondaryWindowHandler.activateWidget(id);
-    }
-
-    /**
-     * Focus is taken by a widget through the `onActivateRequest` method. It is up to the
-     * widget implementation which DOM element will get the focus. The default implementation
-     * of Widget does not take any focus. This method can help finding such problems by logging
-     * a warning in case a widget was explicitly activated, but did not trigger a change of the
-     * `activeWidget` property.
-     */
-    private checkActivation(widget: Widget): Widget {
-        const onActivateRequest = widget['onActivateRequest'].bind(widget);
-        widget['onActivateRequest'] = (msg: Message) => {
-            onActivateRequest(msg);
-            this.assertActivated(widget);
-        };
-        return widget;
-    }
-
-    private readonly activationTimeout = 2000;
-    private readonly toDisposeOnActivationCheck = new DisposableCollection();
-    private assertActivated(widget: Widget): void {
-        this.toDisposeOnActivationCheck.dispose();
-
-        const onDispose = () => this.toDisposeOnActivationCheck.dispose();
-        widget.disposed.connect(onDispose);
-        this.toDisposeOnActivationCheck.push(Disposable.create(() => widget.disposed.disconnect(onDispose)));
-
-        let start = 0;
-        const step: FrameRequestCallback = timestamp => {
-            const activeElement = widget.node.ownerDocument.activeElement;
-            if (activeElement && widget.node.contains(activeElement)) {
-                return;
-            }
-            if (!start) {
-                start = timestamp;
-            }
-            const delta = timestamp - start;
-            if (delta < this.activationTimeout) {
-                request = window.requestAnimationFrame(step);
-            } else {
-                console.warn(`Widget was activated, but did not accept focus after ${this.activationTimeout}ms: ${widget.id}`);
-            }
-        };
-        let request = window.requestAnimationFrame(step);
-        this.toDisposeOnActivationCheck.push(Disposable.create(() => window.cancelAnimationFrame(request)));
-    }
-
-    /**
-     * Reveal a widget in the application shell. This makes the widget visible,
-     * but does not activate it.
-     *
-     * @returns the revealed widget if it was found
-     */
-    async revealWidget(id: string): Promise<Widget | undefined> {
-        const stack = this.toTrackedStack(id);
-        let current = stack.pop();
-        if (current && !this.doRevealWidget(current.id)) {
-            return undefined;
-        }
-        while (current && stack.length) {
-            const child = stack.pop()!;
-            if (ApplicationShell.TrackableWidgetProvider.is(current) && current.revealWidget) {
-                current = current.revealWidget(child.id);
-            } else {
-                current = child;
-            }
-        }
-        if (!current) {
-            return undefined;
-        }
-        await Promise.all([
-            waitForRevealed(current),
-            this.pendingUpdates
-        ]);
-        return current;
-    }
-
-    /**
-     * Reveal top-level area widget.
-     */
-    protected doRevealWidget(id: string): Widget | undefined {
-        let widget = find(this.mainPanel.widgets(), w => w.id === id);
-        if (!widget) {
-            widget = find(this.bottomPanel.widgets(), w => w.id === id);
-            if (widget) {
-                this.expandBottomPanel();
-            }
-        }
-        if (widget) {
-            const tabBar = this.getTabBarFor(widget);
-            if (tabBar) {
-                tabBar.currentTitle = widget.title;
-            }
-            return widget;
-        }
-        widget = this.leftPanelHandler.expand(id);
-        if (widget) {
-            return widget;
-        }
-        widget = this.rightPanelHandler.expand(id);
-        if (widget) {
-            return widget;
-        }
-        return this.secondaryWindowHandler.revealWidget(id);
-    }
-
-    /**
-     * Expand the named side panel area. This makes sure that the panel is visible, even if there
-     * are no widgets in it. If the panel is already visible, nothing happens. If the panel is currently
-     * collapsed (see `collapsePanel`) and it contains widgets, the widgets are revealed that were
-     * visible before it was collapsed.
-     */
-    expandPanel(area: ApplicationShell.Area): void {
-        switch (area) {
-            case 'bottom':
-                this.expandBottomPanel();
-                break;
-            case 'left':
-                this.leftPanelHandler.expand();
-                break;
-            case 'right':
-                this.rightPanelHandler.expand();
-                break;
-            default:
-                throw new Error('Area cannot be expanded: ' + area);
-        }
-    }
-
-    /**
-     * Adjusts the size of the given area in the application shell.
-     *
-     * @param size the desired size of the panel in pixels.
-     * @param area the area to resize.
-     */
-    resize(size: number, area: ApplicationShell.Area): void {
-        switch (area) {
-            case 'bottom':
-                if (this.bottomPanel.isHidden) {
-                    this.bottomPanelState.lastPanelSize = size;
-                } else {
-                    this.setBottomPanelSize(size);
-                }
-                break;
-            case 'left':
-                this.leftPanelHandler.resize(size);
-                break;
-            case 'right':
-                this.rightPanelHandler.resize(size);
-                break;
-            default:
-                throw new Error('Area cannot be resized: ' + area);
-        }
-    }
-
-    /**
-     * Expand the bottom panel. See `expandPanel` regarding the exact behavior.
-     */
-    protected expandBottomPanel(): void {
-        const bottomPanel = this.bottomPanel;
-        if (bottomPanel.isHidden) {
-            let relativeSizes: number[] | undefined;
-            const parent = bottomPanel.parent;
-            if (parent instanceof SplitPanel) {
-                relativeSizes = parent.relativeSizes();
-            }
-            bottomPanel.show();
-            if (relativeSizes && parent instanceof SplitPanel) {
-                // Make sure that the expansion animation starts at the smallest possible size
-                parent.setRelativeSizes(relativeSizes);
-            }
-
-            let size: number | undefined;
-            if (bottomPanel.isEmpty) {
-                bottomPanel.node.style.minHeight = '0';
-                size = this.options.bottomPanel.emptySize;
-            } else if (this.bottomPanelState.lastPanelSize) {
-                size = this.bottomPanelState.lastPanelSize;
-            } else {
-                size = this.getDefaultBottomPanelSize();
-            }
-            if (size) {
-                this.bottomPanelState.expansion = SidePanel.ExpansionState.expanding;
-                this.setBottomPanelSize(size).then(() => {
-                    if (this.bottomPanelState.expansion === SidePanel.ExpansionState.expanding) {
-                        this.bottomPanelState.expansion = SidePanel.ExpansionState.expanded;
-                    }
-                });
-            } else {
-                this.bottomPanelState.expansion = SidePanel.ExpansionState.expanded;
-            }
-        }
-    }
-
-    /**
-     * Collapse the named side panel area. This makes sure that the panel is hidden,
-     * increasing the space that is available for other shell areas.
-     */
-    collapsePanel(area: ApplicationShell.Area): Promise<void> {
-        switch (area) {
-            case 'bottom':
-                return this.collapseBottomPanel();
-            case 'left':
-                return this.leftPanelHandler.collapse();
-            case 'right':
-                return this.rightPanelHandler.collapse();
-            default:
-                throw new Error('Area cannot be collapsed: ' + area);
-        }
-    }
-
-    /**
-     * Collapse the bottom panel. All contained widgets are hidden, but not closed.
-     * They can be restored by calling `expandBottomPanel`.
-     */
-    protected collapseBottomPanel(): Promise<void> {
-        const bottomPanel = this.bottomPanel;
-        if (bottomPanel.isHidden) {
-            return Promise.resolve();
-        }
-        if (this.bottomPanelState.expansion === SidePanel.ExpansionState.expanded) {
-            const size = this.getBottomPanelSize();
-            if (size) {
-                this.bottomPanelState.lastPanelSize = size;
-            }
-        }
-        this.bottomPanelState.expansion = SidePanel.ExpansionState.collapsed;
-        bottomPanel.hide();
-        return animationFrame();
-    }
-
-    /**
-     * Refresh the toggle button for the bottom panel. This implementation creates a status bar entry
-     * and refers to the command `core.toggle.bottom.panel`.
-     */
-    protected refreshBottomPanelToggleButton(): void {
-        if (this.bottomPanel.isEmpty) {
-            this.statusBar.removeElement(BOTTOM_PANEL_TOGGLE_ID);
-        } else {
-            const label = nls.localize('theia/core/common/collapseBottomPanel', 'Toggle Bottom Panel');
-            const element: StatusBarEntry = {
-                name: label,
-                text: '$(codicon-window)',
-                alignment: StatusBarAlignment.RIGHT,
-                tooltip: label,
-                command: 'core.toggle.bottom.panel',
-                accessibilityInformation: {
-                    label: label,
-                    role: 'button'
-                },
-                priority: -1000
-            };
-            this.statusBar.setElement(BOTTOM_PANEL_TOGGLE_ID, element);
-        }
-    }
-
-    /**
-     * Check whether the named side panel area is expanded (returns `true`) or collapsed (returns `false`).
-     */
-    isExpanded(area: ApplicationShell.Area): boolean {
-        switch (area) {
-            case 'bottom':
-                return this.bottomPanelState.expansion === SidePanel.ExpansionState.expanded;
-            case 'left':
-                return this.leftPanelHandler.state.expansion === SidePanel.ExpansionState.expanded;
-            case 'right':
-                return this.rightPanelHandler.state.expansion === SidePanel.ExpansionState.expanded;
-            default:
-                return true;
-        }
-    }
-
-    /**
-     * Close all tabs or a selection of tabs in a specific part of the application shell.
-     *
-     * @param tabBarOrArea
-     *      Either the name of a shell area or a `TabBar` that is contained in such an area.
-     * @param filter
-     *      If undefined, all tabs are closed; otherwise only those tabs that match the filter are closed.
-     */
-    async closeTabs(tabBarOrArea: TabBar<Widget> | ApplicationShell.Area,
-        filter?: (title: Title<Widget>, index: number) => boolean): Promise<void> {
-        const titles: Array<Title<Widget>> = this.getWidgetTitles(tabBarOrArea, filter);
-        if (titles.length) {
-            await this.closeMany(titles.map(title => title.owner));
-        }
-    }
-
-    saveTabs(tabBarOrArea: TabBar<Widget> | ApplicationShell.Area,
-        filter?: (title: Title<Widget>, index: number) => boolean): void {
-
-        const titles = this.getWidgetTitles(tabBarOrArea, filter);
-        for (let i = 0; i < titles.length; i++) {
-            const widget = titles[i].owner;
-            const saveable = Saveable.get(widget);
-            saveable?.save();
-        }
-    }
-
-    /**
-     * Collects all widget titles for the given tab bar or area and optionally filters them.
-     *
-     * @param tabBarOrArea The tab bar or area to retrieve the widget titles for
-     * @param filter The filter to apply to the result
-     * @returns The filtered array of widget titles or an empty array
-     */
-    protected getWidgetTitles(tabBarOrArea: TabBar<Widget> | ApplicationShell.Area,
-        filter?: (title: Title<Widget>, index: number) => boolean): Title<Widget>[] {
-
-        const titles: Title<Widget>[] = [];
-        if (tabBarOrArea === 'main') {
-            this.mainAreaTabBars.forEach(tabbar => titles.push(...toArray(tabbar.titles)));
-        } else if (tabBarOrArea === 'bottom') {
-            this.bottomAreaTabBars.forEach(tabbar => titles.push(...toArray(tabbar.titles)));
-        } else if (tabBarOrArea === 'secondaryWindow') {
-            titles.push(...this.secondaryWindowHandler.widgets.map(w => w.title));
-        } else if (typeof tabBarOrArea === 'string') {
-            const tabbar = this.getTabBarFor(tabBarOrArea);
-            if (tabbar) {
-                titles.push(...toArray(tabbar.titles));
-            }
-        } else if (tabBarOrArea) {
-            titles.push(...toArray(tabBarOrArea.titles));
-        }
-
-        return filter ? titles.filter(filter) : titles;
-    }
-
-    /**
-     * @param targets the widgets to be closed
-     * @return an array of all the widgets that were actually closed.
-     */
-    async closeMany(targets: Widget[], options?: ApplicationShell.CloseOptions): Promise<Widget[]> {
-        if (options?.save === false || await Saveable.confirmSaveBeforeClose(targets, this.widgets.filter(widget => !targets.includes(widget)))) {
-            return (await Promise.all(targets.map(target => this.closeWidget(target.id, options)))).filter((widget): widget is Widget => widget !== undefined);
-        }
-        return [];
-    }
-
-    /**
-     * @returns the widget that was closed, if any, `undefined` otherwise.
-     *
-     * If your use case requires closing multiple widgets, use {@link ApplicationShell#closeMany} instead. That method handles closing saveable widgets more reliably.
-     */
-    async closeWidget(id: string, options?: ApplicationShell.CloseOptions): Promise<Widget | undefined> {
-        // TODO handle save for composite widgets, i.e. the preference widget has 2 editors
-        const stack = this.toTrackedStack(id);
-        const current = stack.pop();
-        if (!current) {
-            return undefined;
-        }
-        const saveableOptions = options && { shouldSave: () => options.save };
-        const pendingClose = SaveableWidget.is(current)
-            ? current.closeWithSaving(saveableOptions)
-            : (current.close(), waitForClosed(current));
-        await Promise.all([
-            pendingClose,
-            this.pendingUpdates
-        ]);
-        return stack[0] || current;
-    }
-
-    /**
-     * The shell area name of the currently active tab, or undefined.
-     */
-    get currentTabArea(): ApplicationShell.Area | undefined {
-        const currentWidget = this.currentWidget;
-        if (currentWidget) {
-            return this.getAreaFor(currentWidget);
-        }
-    }
-
-    /**
-     * 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: TabBar<Widget> | Widget): ApplicationShell.Area | undefined {
-        if (input instanceof TabBar) {
-            if (find(this.mainPanel.tabBars(), tb => tb === input)) {
-                return 'main';
-            }
-            if (find(this.bottomPanel.tabBars(), tb => tb === input)) {
-                return 'bottom';
-            }
-            if (this.leftPanelHandler.tabBar === input) {
-                return 'left';
-            }
-            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';
-        }
-        if (this.secondaryWindowHandler.widgets.includes(widget)) {
-            return 'secondaryWindow';
-        }
-        return undefined;
-    }
-
-    protected getAreaPanelFor(input: Widget): DockPanel | undefined {
-        const widget = this.toTrackedStack(input.id).pop();
-        if (!widget) {
-            return undefined;
-        }
-        return this.findPanel(widget);
-    }
-
-    /**
-     * Find the shell panel this top-level widget is part of
-     */
-    protected findPanel(widget: Widget | undefined): TheiaDockPanel | undefined {
-        if (!widget) {
-            return undefined;
-        }
-        const title = widget.title;
-        const mainPanelTabBar = this.mainPanel.findTabBar(title);
-        if (mainPanelTabBar) {
-            return this.mainPanel;
-        }
-        const bottomPanelTabBar = this.bottomPanel.findTabBar(title);
-        if (bottomPanelTabBar) {
-            return this.bottomPanel;
-        }
-        if (ArrayExt.firstIndexOf(this.leftPanelHandler.tabBar.titles, title) > -1) {
-            return this.leftPanelHandler.dockPanel;
-        }
-        if (ArrayExt.firstIndexOf(this.rightPanelHandler.tabBar.titles, title) > -1) {
-            return this.rightPanelHandler.dockPanel;
-        }
-        return undefined;
-    }
-
-    /**
-     * Return the tab bar that has the currently active widget, or undefined.
-     */
-    get currentTabBar(): TabBar<Widget> | undefined {
-        const currentWidget = this.currentWidget;
-        if (currentWidget) {
-            return this.getTabBarFor(currentWidget);
-        }
-    }
-
-    /**
-     * Return the tab bar in the given shell area, or the tab bar that has the given widget, or undefined.
-     */
-    getTabBarFor(widgetOrArea: Widget | ApplicationShell.Area): TabBar<Widget> | undefined {
-        if (typeof widgetOrArea === 'string') {
-            switch (widgetOrArea) {
-                case 'main':
-                    return this.mainPanel.currentTabBar;
-                case 'bottom':
-                    return this.bottomPanel.currentTabBar;
-                case 'left':
-                    return this.leftPanelHandler.tabBar;
-                case 'right':
-                    return this.rightPanelHandler.tabBar;
-                case 'secondaryWindow':
-                    // Secondary windows don't have a tab bar
-                    return undefined;
-                default:
-                    throw new Error('Illegal argument: ' + widgetOrArea);
-            }
-        }
-        const widget = this.toTrackedStack(widgetOrArea.id).pop();
-        if (!widget) {
-            return undefined;
-        }
-        const widgetTitle = widget.title;
-        const mainPanelTabBar = this.mainPanel.findTabBar(widgetTitle);
-        if (mainPanelTabBar) {
-            return mainPanelTabBar;
-        }
-        const bottomPanelTabBar = this.bottomPanel.findTabBar(widgetTitle);
-        if (bottomPanelTabBar) {
-            return bottomPanelTabBar;
-        }
-        const leftPanelTabBar = this.leftPanelHandler.tabBar;
-        if (ArrayExt.firstIndexOf(leftPanelTabBar.titles, widgetTitle) > -1) {
-            return leftPanelTabBar;
-        }
-        const rightPanelTabBar = this.rightPanelHandler.tabBar;
-        if (ArrayExt.firstIndexOf(rightPanelTabBar.titles, widgetTitle) > -1) {
-            return rightPanelTabBar;
-        }
-        return undefined;
-    }
-
-    /**
-     * The tab bars contained in the main shell area. If there is no widget in the main area, the
-     * returned array is empty.
-     */
-    get mainAreaTabBars(): TabBar<Widget>[] {
-        return toArray(this.mainPanel.tabBars());
-    }
-
-    /**
-     * The tab bars contained in the bottom shell area. If there is no widget in the bottom area,
-     * the returned array is empty.
-     */
-    get bottomAreaTabBars(): TabBar<Widget>[] {
-        return toArray(this.bottomPanel.tabBars());
-    }
-
-    /**
-     * The tab bars contained in all shell areas.
-     */
-    get allTabBars(): TabBar<Widget>[] {
-        return [...this.mainAreaTabBars, ...this.bottomAreaTabBars, this.leftPanelHandler.tabBar, this.rightPanelHandler.tabBar];
-    }
-
-    /*
-     * Activate the next tab in the current tab bar.
-     */
-    activateNextTabInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
-        const index = this.nextTabIndexInTabBar(current);
-        if (!current || index === -1) {
-            return false;
-        }
-        current.currentIndex = index;
-        if (current.currentTitle) {
-            this.activateWidget(current.currentTitle.owner.id);
-        }
-        return true;
-    }
-
-    nextTabIndexInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): number {
-        if (!current || current.titles.length <= 1) {
-            return -1;
-        }
-        const index = current.currentIndex;
-        if (index === -1) {
-            return -1;
-        }
-        if (index < current.titles.length - 1) {
-            return index + 1;
-        }
-        return 0;
-    }
-
-    activateNextTab(): boolean {
-        const current = this.currentTabBar;
-        if (current) {
-            const ci = current.currentIndex;
-            if (ci !== -1) {
-                if (ci < current.titles.length - 1) {
-                    current.currentIndex += 1;
-                    if (current.currentTitle) {
-                        this.activateWidget(current.currentTitle.owner.id);
-                    }
-                    return true;
-                } else if (ci === current.titles.length - 1) {
-                    return this.activateNextTabBar(current);
-                }
-            }
-        }
-        return false;
-    }
-
-    activateNextTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
-        const nextBar = this.nextTabBar(current);
-        if (nextBar) {
-            nextBar.currentIndex = 0;
-            if (nextBar.currentTitle) {
-                this.activateWidget(nextBar.currentTitle.owner.id);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Return the tab bar next to the given tab bar; return the given tab bar if there is no adjacent one.
-     */
-    nextTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): TabBar<Widget> | undefined {
-        let bars = toArray(this.bottomPanel.tabBars());
-        let len = bars.length;
-        let ci = ArrayExt.firstIndexOf(bars, current);
-        if (ci < 0) {
-            bars = toArray(this.mainPanel.tabBars());
-            len = bars.length;
-            ci = ArrayExt.firstIndexOf(bars, current);
-        }
-        if (ci >= 0 && ci < len - 1) {
-            return bars[ci + 1];
-        } else if (ci >= 0 && ci === len - 1) {
-            return bars[0];
-        } else {
-            return current;
-        }
-    }
-
-    /*
-     * Activate the previous tab in the current tab bar.
-     */
-    activatePreviousTabInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
-        const index = this.previousTabIndexInTabBar(current);
-        if (!current || index === -1) {
-            return false;
-        }
-        current.currentIndex = index;
-        if (current.currentTitle) {
-            this.activateWidget(current.currentTitle.owner.id);
-        }
-        return true;
-    }
-
-    previousTabIndexInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): number {
-        if (!current || current.titles.length <= 1) {
-            return -1;
-        }
-        const index = current.currentIndex;
-        if (index === -1) {
-            return -1;
-        }
-        if (index > 0) {
-            return index - 1;
-        }
-        return current.titles.length - 1;
-    }
-
-    activatePreviousTab(): boolean {
-        const current = this.currentTabBar;
-        if (current) {
-            const ci = current.currentIndex;
-            if (ci !== -1) {
-                if (ci > 0) {
-                    current.currentIndex -= 1;
-                    if (current.currentTitle) {
-                        this.activateWidget(current.currentTitle.owner.id);
-                    }
-                    return true;
-                } else if (ci === 0) {
-                    if (current && current.titles.length > 0) {
-                        current.currentIndex = current.titles.length - 1;
-                        if (current.currentTitle) {
-                            this.activateWidget(current.currentTitle.owner.id);
-                        }
-                        return true;
-                    }
-                    return this.activatePreviousTabBar(current);
-                }
-            }
-        }
-        return false;
-    }
-
-    activatePreviousTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
-        const prevBar = this.previousTabBar(current);
-        if (!prevBar) {
-            return false;
-        }
-        if (!prevBar.currentTitle) {
-            prevBar.currentIndex = prevBar.titles.length - 1;
-        }
-        if (prevBar.currentTitle) {
-            this.activateWidget(prevBar.currentTitle.owner.id);
-        }
-        return true;
-    }
-
-    /**
-     * Return the tab bar previous to the given tab bar; return the given tab bar if there is no adjacent one.
-     */
-    previousTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): TabBar<Widget> | undefined {
-        const bars = toArray(this.mainPanel.tabBars());
-        const len = bars.length;
-        const ci = ArrayExt.firstIndexOf(bars, current);
-        if (ci > 0) {
-            return bars[ci - 1];
-        } else if (ci === 0) {
-            return bars[len - 1];
-        } else {
-            return current;
-        }
-    }
-
-    /**
-     * Test whether the current widget is dirty.
-     */
-    canSave(): boolean {
-        return this.saveResourceService.canSave(this.currentWidget);
-    }
-
-    /**
-     * Save the current widget if it is dirty.
-     */
-    async save(options?: SaveOptions): Promise<void> {
-        await this.saveResourceService.save(this.currentWidget, options);
-    }
-
-    /**
-     * Test whether there is a dirty widget.
-     */
-    canSaveAll(): boolean {
-        return this.tracker.widgets.some(widget => this.saveResourceService.canSave(widget));
-    }
-
-    /**
-     * Save all dirty widgets.
-     */
-    async saveAll(options?: SaveOptions): Promise<void> {
-        for (const widget of this.widgets) {
-            if (this.saveResourceService.canSaveNotSaveAs(widget)) {
-                await this.saveResourceService.save(widget, options);
-            }
-        }
-    }
-
-    /**
-     * Returns a snapshot of all tracked widgets to allow async modifications.
-     */
-    get widgets(): ReadonlyArray<Widget> {
-        return [...this.tracker.widgets];
-    }
-
-    getWidgetById(id: string): Widget | undefined {
-        for (const widget of this.tracker.widgets) {
-            if (widget.id === id) {
-                return widget;
-            }
-        }
-        return undefined;
-    }
-
-    canToggleMaximized(widget: Widget | undefined = this.currentWidget): boolean {
-        const area = widget && this.getAreaFor(widget);
-        return area === 'main' || area === 'bottom';
-    }
-
-    toggleMaximized(widget: Widget | undefined = this.currentWidget): void {
-        const area = widget && this.getAreaPanelFor(widget);
-        if (area instanceof TheiaDockPanel && (area === this.mainPanel || area === this.bottomPanel)) {
-            area.toggleMaximized();
-            this.revealWidget(widget!.id);
-        }
-    }
-
-}
-
-/**
- * The namespace for `ApplicationShell` class statics.
- */
-export namespace ApplicationShell {
-    /**
-     * The areas of the application shell where widgets can reside.
-     */
-    export type Area = 'main' | 'top' | 'left' | 'right' | 'bottom' | 'secondaryWindow';
-
-    export const areaLabels: Record<Area, string> = {
-        main: nls.localizeByDefault('Main'),
-        top: nls.localizeByDefault('Top'),
-        left: nls.localizeByDefault('Left'),
-        right: nls.localizeByDefault('Right'),
-        bottom: nls.localizeByDefault('Bottom'),
-        secondaryWindow: nls.localize('theia/shell-area/secondary', 'Secondary Window'),
-    };
-
-    /**
-     * The _side areas_ are those shell areas that can be collapsed and expanded,
-     * i.e. `left`, `right`, and `bottom`.
-     */
-    export function isSideArea(area?: string): area is 'left' | 'right' | 'bottom' {
-        return area === 'left' || area === 'right' || area === 'bottom';
-    }
-
-    export function isValidArea(area?: unknown): area is ApplicationShell.Area {
-        const areas = ['main', 'top', 'left', 'right', 'bottom', 'secondaryWindow'];
-        return typeof area === 'string' && areas.includes(area);
-    }
-
-    /**
-     * General options for the application shell. These are passed on construction and can be modified
-     * through dependency injection (`ApplicationShellOptions` symbol).
-     */
-    export interface Options extends Widget.IOptions {
-        bottomPanel: BottomPanelOptions;
-        leftPanel: SidePanel.Options;
-        rightPanel: SidePanel.Options;
-    }
-
-    export interface BottomPanelOptions extends SidePanel.Options {
-    }
-
-    /**
-     * The default values for application shell options.
-     */
-    export const DEFAULT_OPTIONS = Object.freeze(<Options>{
-        bottomPanel: Object.freeze(<BottomPanelOptions>{
-            emptySize: 140,
-            expandThreshold: 160,
-            expandDuration: 0,
-            initialSizeRatio: 0.382
-        }),
-        leftPanel: Object.freeze(<SidePanel.Options>{
-            emptySize: 140,
-            expandThreshold: 140,
-            expandDuration: 0,
-            initialSizeRatio: 0.191
-        }),
-        rightPanel: Object.freeze(<SidePanel.Options>{
-            emptySize: 140,
-            expandThreshold: 140,
-            expandDuration: 0,
-            initialSizeRatio: 0.191
-        })
-    });
-
-    /**
-     * Whether a widget should be opened to the side tab bar relatively to the reference widget.
-     */
-    export type OpenToSideMode = 'open-to-left' | 'open-to-right';
-
-    export function isOpenToSideMode(mode: unknown): mode is OpenToSideMode {
-        return mode === 'open-to-left' || mode === 'open-to-right';
-    }
-
-    /**
-     * Options for adding a widget to the application shell.
-     */
-    export interface WidgetOptions extends SidePanel.WidgetOptions {
-        /**
-         * The area of the application shell where the widget will reside.
-         */
-        area?: Area;
-        /**
-         * The insertion mode for adding the widget.
-         *
-         * The default is `'tab-after'`.
-         */
-        mode?: DockLayout.InsertMode | OpenToSideMode
-        /**
-         * The reference widget for the insert location.
-         *
-         * The default is `undefined`.
-         */
-        ref?: Widget;
-    }
-
-    export interface CloseOptions {
-        /**
-         * if optional then a user will be prompted
-         * if undefined then close will be canceled
-         * if true then will be saved on close
-         * if false then won't be saved on close
-         */
-        save?: boolean | undefined
-    }
-
-    /**
-     * Data to save and load the application shell layout.
-     */
-    export interface LayoutData {
-        version?: string | ApplicationShellLayoutVersion,
-        mainPanel?: DockPanel.ILayoutConfig;
-        mainPanelPinned?: boolean[];
-        bottomPanel?: BottomPanelLayoutData;
-        leftPanel?: SidePanel.LayoutData;
-        rightPanel?: SidePanel.LayoutData;
-        activeWidgetId?: string;
-    }
-
-    /**
-     * Data to save and load the bottom panel layout.
-     */
-    export interface BottomPanelLayoutData {
-        config?: DockPanel.ILayoutConfig;
-        size?: number;
-        expanded?: boolean;
-        pinned?: boolean[];
-    }
-
-    /**
-     * Exposes widgets which activation state should be tracked by shell.
-     */
-    export interface TrackableWidgetProvider {
-        getTrackableWidgets(): Widget[]
-        readonly onDidChangeTrackableWidgets?: CommonEvent<Widget[]>
-        /**
-         * Make visible and focus a trackable widget for the given id.
-         * If not implemented then `activate` request will be sent to a child widget directly.
-         */
-        activateWidget?(id: string): Widget | undefined;
-        /**
-         * Make visible a trackable widget for the given id.
-         * If not implemented then a widget should be always visible when an owner is visible.
-         */
-        revealWidget?(id: string): Widget | undefined;
-    }
-
-    export namespace TrackableWidgetProvider {
-        export function is(widget: unknown): widget is TrackableWidgetProvider {
-            return isObject(widget) && 'getTrackableWidgets' in widget;
-        }
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject, optional, postConstruct } from 'inversify';
+import { ArrayExt, find, toArray, each } from '@phosphor/algorithm';
+import {
+    BoxLayout, BoxPanel, DockLayout, DockPanel, FocusTracker, Layout, Panel, SplitLayout,
+    SplitPanel, TabBar, Widget, Title
+} from '@phosphor/widgets';
+import { Message } from '@phosphor/messaging';
+import { IDragEvent } from '@phosphor/dragdrop';
+import { RecursivePartial, Event as CommonEvent, DisposableCollection, Disposable, environment, isObject } from '../../common';
+import { animationFrame } from '../browser';
+import { Saveable, SaveableWidget, SaveOptions, SaveableSource } from '../saveable';
+import { StatusBarImpl, StatusBarEntry, StatusBarAlignment } from '../status-bar/status-bar';
+import { TheiaDockPanel, BOTTOM_AREA_ID, MAIN_AREA_ID } from './theia-dock-panel';
+import { SidePanelHandler, SidePanel, SidePanelHandlerFactory } from './side-panel-handler';
+import { TabBarRendererFactory, SHELL_TABBAR_CONTEXT_MENU, ScrollableTabBar, ToolbarAwareTabBar } from './tab-bars';
+import { SplitPositionHandler, SplitPositionOptions } from './split-panels';
+import { FrontendApplicationStateService } from '../frontend-application-state';
+import { TabBarToolbarRegistry, TabBarToolbarFactory } from './tab-bar-toolbar';
+import { ContextKeyService } from '../context-key-service';
+import { Emitter } from '../../common/event';
+import { waitForRevealed, waitForClosed, PINNED_CLASS } from '../widgets';
+import { CorePreferences } from '../core-preferences';
+import { BreadcrumbsRendererFactory } from '../breadcrumbs/breadcrumbs-renderer';
+import { Deferred } from '../../common/promise-util';
+import { SaveResourceService } from '../save-resource-service';
+import { nls } from '../../common/nls';
+import { SecondaryWindowHandler } from '../secondary-window-handler';
+import URI from '../../common/uri';
+import { OpenerService } from '../opener-service';
+import { PreviewableWidget } from '../widgets/previewable-widget';
+import { WindowService } from '../window/window-service';
+
+/** The class name added to ApplicationShell instances. */
+const APPLICATION_SHELL_CLASS = 'theia-ApplicationShell';
+/** The class name added to the main and bottom area panels. */
+const MAIN_BOTTOM_AREA_CLASS = 'theia-app-centers';
+/** Status bar entry identifier for the bottom panel toggle button. */
+const BOTTOM_PANEL_TOGGLE_ID = 'bottom-panel-toggle';
+/** The class name added to the main area panel. */
+const MAIN_AREA_CLASS = 'theia-app-main';
+/** The class name added to the bottom area panel. */
+const BOTTOM_AREA_CLASS = 'theia-app-bottom';
+
+export type ApplicationShellLayoutVersion =
+    /** layout versioning is introduced, unversioned layout are not compatible */
+    2.0 |
+    /** view containers are introduced, backward compatible to 2.0 */
+    3.0 |
+    /** git history view is replaced by a more generic scm history view, backward compatible to 3.0 */
+    4.0 |
+    /** Replace custom/font-awesome icons with codicons */
+    5.0 |
+    /** added the ability to drag and drop view parts between view containers */
+    6.0;
+
+/**
+ * When a version is increased, make sure to introduce a migration (ApplicationShellLayoutMigration) to this version.
+ */
+export const applicationShellLayoutVersion: ApplicationShellLayoutVersion = 5.0;
+
+export const ApplicationShellOptions = Symbol('ApplicationShellOptions');
+export const DockPanelRendererFactory = Symbol('DockPanelRendererFactory');
+export interface DockPanelRendererFactory {
+    (): DockPanelRenderer
+}
+
+/**
+ * A renderer for dock panels that supports context menus on tabs.
+ */
+@injectable()
+export class DockPanelRenderer implements DockLayout.IRenderer {
+
+    @inject(TheiaDockPanel.Factory)
+    protected readonly dockPanelFactory: TheiaDockPanel.Factory;
+
+    readonly tabBarClasses: string[] = [];
+
+    private readonly onDidCreateTabBarEmitter = new Emitter<TabBar<Widget>>();
+
+    constructor(
+        @inject(TabBarRendererFactory) protected readonly tabBarRendererFactory: TabBarRendererFactory,
+        @inject(TabBarToolbarRegistry) protected readonly tabBarToolbarRegistry: TabBarToolbarRegistry,
+        @inject(TabBarToolbarFactory) protected readonly tabBarToolbarFactory: TabBarToolbarFactory,
+        @inject(BreadcrumbsRendererFactory) protected readonly breadcrumbsRendererFactory: BreadcrumbsRendererFactory,
+        @inject(CorePreferences) protected readonly corePreferences: CorePreferences
+    ) { }
+
+    get onDidCreateTabBar(): CommonEvent<TabBar<Widget>> {
+        return this.onDidCreateTabBarEmitter.event;
+    }
+
+    createTabBar(): TabBar<Widget> {
+        const getDynamicTabOptions: () => ScrollableTabBar.Options | undefined = () => {
+            if (this.corePreferences.get('workbench.tab.shrinkToFit.enabled')) {
+                return {
+                    minimumTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.minimumSize'),
+                    defaultTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.defaultSize')
+                };
+            } else {
+                return undefined;
+            }
+        };
+
+        const renderer = this.tabBarRendererFactory();
+        const tabBar = new ToolbarAwareTabBar(
+            this.tabBarToolbarRegistry,
+            this.tabBarToolbarFactory,
+            this.breadcrumbsRendererFactory,
+            {
+                renderer,
+                // Scroll bar options
+                handlers: ['drag-thumb', 'keyboard', 'wheel', 'touch'],
+                useBothWheelAxes: true,
+                scrollXMarginOffset: 4,
+                suppressScrollY: true
+            },
+            getDynamicTabOptions());
+        this.tabBarClasses.forEach(c => tabBar.addClass(c));
+        renderer.tabBar = tabBar;
+        renderer.contextMenuPath = SHELL_TABBAR_CONTEXT_MENU;
+        tabBar.currentChanged.connect(this.onCurrentTabChanged, this);
+        const prefChangeDisposable = this.corePreferences.onPreferenceChanged(change => {
+            if (change.preferenceName === 'workbench.tab.shrinkToFit.enabled' ||
+                change.preferenceName === 'workbench.tab.shrinkToFit.minimumSize' ||
+                change.preferenceName === 'workbench.tab.shrinkToFit.defaultSize') {
+                tabBar.dynamicTabOptions = getDynamicTabOptions();
+            }
+        });
+        tabBar.disposed.connect(() => {
+            prefChangeDisposable.dispose();
+            renderer.dispose();
+        });
+        this.onDidCreateTabBarEmitter.fire(tabBar);
+        return tabBar;
+    }
+
+    createHandle(): HTMLDivElement {
+        return DockPanel.defaultRenderer.createHandle();
+    }
+
+    protected onCurrentTabChanged(sender: ToolbarAwareTabBar, { currentIndex }: TabBar.ICurrentChangedArgs<Widget>): void {
+        if (currentIndex >= 0) {
+            sender.revealTab(currentIndex);
+        }
+    }
+}
+
+/**
+ * Data stored while dragging widgets in the shell.
+ */
+interface WidgetDragState {
+    startTime: number;
+    leftExpanded: boolean;
+    rightExpanded: boolean;
+    bottomExpanded: boolean;
+    lastDragOver?: IDragEvent;
+    leaveTimeout?: number;
+}
+
+/**
+ * The application shell manages the top-level widgets of the application. Use this class to
+ * add, remove, or activate a widget.
+ */
+@injectable()
+export class ApplicationShell extends Widget {
+
+    /**
+     * The dock panel in the main shell area. This is where editors usually go to.
+     */
+    mainPanel: TheiaDockPanel;
+
+    /**
+     * The dock panel in the bottom shell area. In contrast to the main panel, the bottom panel
+     * can be collapsed and expanded.
+     */
+    bottomPanel: TheiaDockPanel;
+
+    /**
+     * Handler for the left side panel. The primary application views go here, such as the
+     * file explorer and the git view.
+     */
+    leftPanelHandler: SidePanelHandler;
+
+    /**
+     * Handler for the right side panel. The secondary application views go here, such as the
+     * outline view.
+     */
+    rightPanelHandler: SidePanelHandler;
+
+    /**
+     * General options for the application shell.
+     */
+    protected options: ApplicationShell.Options;
+
+    /**
+     * The fixed-size panel shown on top. This one usually holds the main menu.
+     */
+    topPanel: Panel;
+
+    /**
+     * The current state of the bottom panel.
+     */
+    protected readonly bottomPanelState: SidePanel.State = {
+        empty: true,
+        expansion: SidePanel.ExpansionState.collapsed,
+        pendingUpdate: Promise.resolve()
+    };
+
+    private readonly tracker = new FocusTracker<Widget>();
+    private dragState?: WidgetDragState;
+    additionalDraggedUris: URI[] | undefined;
+
+    @inject(ContextKeyService)
+    protected readonly contextKeyService: ContextKeyService;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    protected readonly onDidAddWidgetEmitter = new Emitter<Widget>();
+    readonly onDidAddWidget = this.onDidAddWidgetEmitter.event;
+    protected fireDidAddWidget(widget: Widget): void {
+        this.onDidAddWidgetEmitter.fire(widget);
+    }
+
+    protected readonly onDidRemoveWidgetEmitter = new Emitter<Widget>();
+    readonly onDidRemoveWidget = this.onDidRemoveWidgetEmitter.event;
+    protected fireDidRemoveWidget(widget: Widget): void {
+        this.onDidRemoveWidgetEmitter.fire(widget);
+    }
+
+    protected readonly onDidChangeActiveWidgetEmitter = new Emitter<FocusTracker.IChangedArgs<Widget>>();
+    readonly onDidChangeActiveWidget = this.onDidChangeActiveWidgetEmitter.event;
+
+    protected readonly onDidChangeCurrentWidgetEmitter = new Emitter<FocusTracker.IChangedArgs<Widget>>();
+    readonly onDidChangeCurrentWidget = this.onDidChangeCurrentWidgetEmitter.event;
+
+    protected readonly onDidDoubleClickMainAreaEmitter = new Emitter<void>();
+    readonly onDidDoubleClickMainArea = this.onDidDoubleClickMainAreaEmitter.event;
+
+    @inject(TheiaDockPanel.Factory)
+    protected readonly dockPanelFactory: TheiaDockPanel.Factory;
+
+    private _mainPanelRenderer: DockPanelRenderer;
+    get mainPanelRenderer(): DockPanelRenderer {
+        return this._mainPanelRenderer;
+    }
+
+    /**
+     * Construct a new application shell.
+     */
+    constructor(
+        @inject(DockPanelRendererFactory) protected dockPanelRendererFactory: () => DockPanelRenderer,
+        @inject(StatusBarImpl) protected readonly statusBar: StatusBarImpl,
+        @inject(SidePanelHandlerFactory) protected readonly sidePanelHandlerFactory: () => SidePanelHandler,
+        @inject(SplitPositionHandler) protected splitPositionHandler: SplitPositionHandler,
+        @inject(FrontendApplicationStateService) protected readonly applicationStateService: FrontendApplicationStateService,
+        @inject(ApplicationShellOptions) @optional() options: RecursivePartial<ApplicationShell.Options> = {},
+        @inject(CorePreferences) protected readonly corePreferences: CorePreferences,
+        @inject(SaveResourceService) protected readonly saveResourceService: SaveResourceService,
+        @inject(SecondaryWindowHandler) protected readonly secondaryWindowHandler: SecondaryWindowHandler,
+        @inject(WindowService) protected readonly windowService: WindowService
+    ) {
+        super(options as Widget.IOptions);
+
+        // Merge the user-defined application options with the default options
+        this.options = {
+            bottomPanel: {
+                ...ApplicationShell.DEFAULT_OPTIONS.bottomPanel,
+                ...options?.bottomPanel || {}
+            },
+            leftPanel: {
+                ...ApplicationShell.DEFAULT_OPTIONS.leftPanel,
+                ...options?.leftPanel || {}
+            },
+            rightPanel: {
+                ...ApplicationShell.DEFAULT_OPTIONS.rightPanel,
+                ...options?.rightPanel || {}
+            }
+        };
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.initializeShell();
+        this.initSidebarVisibleKeyContext();
+        this.initFocusKeyContexts();
+
+        if (!environment.electron.is()) {
+            this.corePreferences.ready.then(() => {
+                this.setTopPanelVisibility(this.corePreferences['window.menuBarVisibility']);
+            });
+            this.corePreferences.onPreferenceChanged(preference => {
+                if (preference.preferenceName === 'window.menuBarVisibility') {
+                    this.setTopPanelVisibility(preference.newValue);
+                }
+            });
+        }
+
+        this.corePreferences.onPreferenceChanged(preference => {
+            if (preference.preferenceName === 'window.tabbar.enhancedPreview') {
+                this.allTabBars.forEach(tabBar => {
+                    tabBar.update();
+                });
+            }
+        });
+    }
+
+    protected initializeShell(): void {
+        this.addClass(APPLICATION_SHELL_CLASS);
+        this.id = 'theia-app-shell';
+
+        this.mainPanel = this.createMainPanel();
+        this.topPanel = this.createTopPanel();
+        this.bottomPanel = this.createBottomPanel();
+
+        this.leftPanelHandler = this.sidePanelHandlerFactory();
+        this.leftPanelHandler.create('left', this.options.leftPanel);
+        this.leftPanelHandler.dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
+        this.leftPanelHandler.dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
+
+        this.rightPanelHandler = this.sidePanelHandlerFactory();
+        this.rightPanelHandler.create('right', this.options.rightPanel);
+        this.rightPanelHandler.dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
+        this.rightPanelHandler.dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
+
+        this.secondaryWindowHandler.init(this);
+        this.secondaryWindowHandler.onDidAddWidget(([widget, window]) => this.fireDidAddWidget(widget));
+        this.secondaryWindowHandler.onDidRemoveWidget(([widget, window]) => this.fireDidRemoveWidget(widget));
+
+        this.layout = this.createLayout();
+
+        this.tracker.currentChanged.connect(this.onCurrentChanged, this);
+        this.tracker.activeChanged.connect(this.onActiveChanged, this);
+    }
+
+    protected initSidebarVisibleKeyContext(): void {
+        const leftSideBarPanel = this.leftPanelHandler.dockPanel;
+        const sidebarVisibleKey = this.contextKeyService.createKey('sidebarVisible', leftSideBarPanel.isVisible);
+        const onAfterShow = leftSideBarPanel['onAfterShow'].bind(leftSideBarPanel);
+        leftSideBarPanel['onAfterShow'] = (msg: Message) => {
+            onAfterShow(msg);
+            sidebarVisibleKey.set(true);
+        };
+        const onAfterHide = leftSideBarPanel['onAfterHide'].bind(leftSideBarPanel);
+        leftSideBarPanel['onAfterHide'] = (msg: Message) => {
+            onAfterHide(msg);
+            sidebarVisibleKey.set(false);
+        };
+    }
+
+    protected initFocusKeyContexts(): void {
+        const sideBarFocus = this.contextKeyService.createKey<boolean>('sideBarFocus', false);
+        const panelFocus = this.contextKeyService.createKey<boolean>('panelFocus', false);
+        const updateFocusContextKeys = () => {
+            const area = this.activeWidget && this.getAreaFor(this.activeWidget);
+            sideBarFocus.set(area === 'left');
+            panelFocus.set(area === 'main');
+        };
+        updateFocusContextKeys();
+        this.onDidChangeActiveWidget(updateFocusContextKeys);
+    }
+
+    protected setTopPanelVisibility(preference: string): void {
+        const hiddenPreferences = ['compact', 'hidden'];
+        this.topPanel.setHidden(hiddenPreferences.includes(preference));
+    }
+
+    protected override onBeforeAttach(msg: Message): void {
+        document.addEventListener('p-dragenter', this, true);
+        document.addEventListener('p-dragover', this, true);
+        document.addEventListener('p-dragleave', this, true);
+        document.addEventListener('p-drop', this, true);
+    }
+
+    protected override onAfterDetach(msg: Message): void {
+        document.removeEventListener('p-dragenter', this, true);
+        document.removeEventListener('p-dragover', this, true);
+        document.removeEventListener('p-dragleave', this, true);
+        document.removeEventListener('p-drop', this, true);
+    }
+
+    handleEvent(event: Event): void {
+        switch (event.type) {
+            case 'p-dragenter':
+                this.onDragEnter(event as IDragEvent);
+                break;
+            case 'p-dragover':
+                this.onDragOver(event as IDragEvent);
+                break;
+            case 'p-drop':
+                this.onDrop(event as IDragEvent);
+                break;
+            case 'p-dragleave':
+                this.onDragLeave(event as IDragEvent);
+                break;
+        }
+    }
+
+    protected onDragEnter({ mimeData }: IDragEvent): void {
+        if (!this.dragState) {
+            if (mimeData && mimeData.hasData('application/vnd.phosphor.widget-factory')) {
+                // The drag contains a widget, so we'll track it and expand side panels as needed
+                this.dragState = {
+                    startTime: performance.now(),
+                    leftExpanded: false,
+                    rightExpanded: false,
+                    bottomExpanded: false
+                };
+            }
+        }
+    }
+
+    protected onDragOver(event: IDragEvent): void {
+        const state = this.dragState;
+        if (state) {
+            state.lastDragOver = event;
+            if (state.leaveTimeout) {
+                window.clearTimeout(state.leaveTimeout);
+                state.leaveTimeout = undefined;
+            }
+            const { clientX, clientY } = event;
+            const { offsetLeft, offsetTop, clientWidth, clientHeight } = this.node;
+
+            // Don't expand any side panels right after the drag has started
+            const allowExpansion = performance.now() - state.startTime >= 500;
+            const expLeft = allowExpansion && clientX >= offsetLeft
+                && clientX <= offsetLeft + this.options.leftPanel.expandThreshold;
+            const expRight = allowExpansion && clientX <= offsetLeft + clientWidth
+                && clientX >= offsetLeft + clientWidth - this.options.rightPanel.expandThreshold;
+            const expBottom = allowExpansion && !expLeft && !expRight && clientY <= offsetTop + clientHeight
+                && clientY >= offsetTop + clientHeight - this.options.bottomPanel.expandThreshold;
+            // eslint-disable-next-line no-null/no-null
+            if (expLeft && !state.leftExpanded && this.leftPanelHandler.tabBar.currentTitle === null) {
+                // The mouse cursor is moved close to the left border
+                this.leftPanelHandler.expand();
+                this.leftPanelHandler.state.pendingUpdate.then(() => this.dispatchMouseMove());
+                state.leftExpanded = true;
+            } else if (!expLeft && state.leftExpanded) {
+                // The mouse cursor is moved away from the left border
+                this.leftPanelHandler.collapse();
+                state.leftExpanded = false;
+            }
+            // eslint-disable-next-line no-null/no-null
+            if (expRight && !state.rightExpanded && this.rightPanelHandler.tabBar.currentTitle === null) {
+                // The mouse cursor is moved close to the right border
+                this.rightPanelHandler.expand();
+                this.rightPanelHandler.state.pendingUpdate.then(() => this.dispatchMouseMove());
+                state.rightExpanded = true;
+            } else if (!expRight && state.rightExpanded) {
+                // The mouse cursor is moved away from the right border
+                this.rightPanelHandler.collapse();
+                state.rightExpanded = false;
+            }
+            if (expBottom && !state.bottomExpanded && this.bottomPanel.isHidden) {
+                // The mouse cursor is moved close to the bottom border
+                this.expandBottomPanel();
+                this.bottomPanelState.pendingUpdate.then(() => this.dispatchMouseMove());
+                state.bottomExpanded = true;
+            } else if (!expBottom && state.bottomExpanded) {
+                // The mouse cursor is moved away from the bottom border
+                this.collapseBottomPanel();
+                state.bottomExpanded = false;
+            }
+        }
+    }
+
+    /**
+     * This method is called after a side panel has been expanded while dragging a widget. It fires
+     * a `mousemove` event so that the drag overlay markers are updated correctly in all dock panels.
+     */
+    private dispatchMouseMove(): void {
+        if (this.dragState && this.dragState.lastDragOver) {
+            const { clientX, clientY } = this.dragState.lastDragOver;
+            const event = document.createEvent('MouseEvent');
+            event.initMouseEvent('mousemove', true, true, window, 0, 0, 0,
+                // eslint-disable-next-line no-null/no-null
+                clientX, clientY, false, false, false, false, 0, null);
+            document.dispatchEvent(event);
+        }
+    }
+
+    protected onDrop(event: IDragEvent): void {
+        const state = this.dragState;
+        if (state) {
+            if (state.leaveTimeout) {
+                window.clearTimeout(state.leaveTimeout);
+            }
+            this.dragState = undefined;
+            window.requestAnimationFrame(() => {
+                // Clean up the side panel state in the next frame
+                if (this.leftPanelHandler.dockPanel.isEmpty) {
+                    this.leftPanelHandler.collapse();
+                }
+                if (this.rightPanelHandler.dockPanel.isEmpty) {
+                    this.rightPanelHandler.collapse();
+                }
+                if (this.bottomPanel.isEmpty) {
+                    this.collapseBottomPanel();
+                }
+            });
+        }
+    }
+
+    protected onDragLeave(event: IDragEvent): void {
+        const state = this.dragState;
+        if (state) {
+            state.lastDragOver = undefined;
+            if (state.leaveTimeout) {
+                window.clearTimeout(state.leaveTimeout);
+            }
+            state.leaveTimeout = window.setTimeout(() => {
+                this.dragState = undefined;
+                if (state.leftExpanded || this.leftPanelHandler.dockPanel.isEmpty) {
+                    this.leftPanelHandler.collapse();
+                }
+                if (state.rightExpanded || this.rightPanelHandler.dockPanel.isEmpty) {
+                    this.rightPanelHandler.collapse();
+                }
+                if (state.bottomExpanded || this.bottomPanel.isEmpty) {
+                    this.collapseBottomPanel();
+                }
+            }, 100);
+        }
+    }
+
+    /**
+     * Create the dock panel in the main shell area.
+     */
+    protected createMainPanel(): TheiaDockPanel {
+        const renderer = this.dockPanelRendererFactory();
+        renderer.tabBarClasses.push(MAIN_BOTTOM_AREA_CLASS);
+        renderer.tabBarClasses.push(MAIN_AREA_CLASS);
+        this._mainPanelRenderer = renderer;
+        const dockPanel = this.dockPanelFactory({
+            mode: 'multiple-document',
+            renderer,
+            spacing: 0
+        });
+        dockPanel.id = MAIN_AREA_ID;
+        dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
+        dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
+
+        const openUri = async (fileUri: URI) => {
+            try {
+                const opener = await this.openerService.getOpener(fileUri);
+                opener.open(fileUri);
+            } catch (e) {
+                console.info(`no opener found for '${fileUri}'`);
+            }
+        };
+
+        dockPanel.node.addEventListener('drop', event => {
+            if (event.dataTransfer) {
+                const uris = this.additionalDraggedUris || ApplicationShell.getDraggedEditorUris(event.dataTransfer);
+                if (uris.length > 0) {
+                    uris.forEach(openUri);
+                } else if (event.dataTransfer.files?.length > 0) {
+                    // the files were dragged from the outside the workspace
+                    Array.from(event.dataTransfer.files).forEach(file => {
+                        if (file.path) {
+                            const fileUri = URI.fromComponents({
+                                scheme: 'file',
+                                path: file.path,
+                                authority: '',
+                                query: '',
+                                fragment: ''
+                            });
+                            openUri(fileUri);
+                        }
+                    });
+                }
+            }
+        });
+
+        dockPanel.node.addEventListener('dblclick', event => {
+            const el = event.target as Element;
+            if (el.id === MAIN_AREA_ID || el.classList.contains('p-TabBar-content')) {
+                this.onDidDoubleClickMainAreaEmitter.fire();
+            }
+        });
+
+        const handler = (e: DragEvent) => {
+            if (e.dataTransfer) {
+                e.dataTransfer.dropEffect = 'link';
+                e.preventDefault();
+                e.stopPropagation();
+            }
+        };
+        dockPanel.node.addEventListener('dragover', handler);
+        dockPanel.node.addEventListener('dragenter', handler);
+
+        return dockPanel;
+    }
+
+    addAdditionalDraggedEditorUris(uris: URI[]): void {
+        this.additionalDraggedUris = uris;
+    }
+
+    clearAdditionalDraggedEditorUris(): void {
+        this.additionalDraggedUris = undefined;
+    }
+
+    protected static getDraggedEditorUris(dataTransfer: DataTransfer): URI[] {
+        const data = dataTransfer.getData('theia-editor-dnd');
+        return data ? data.split('\n').map(entry => new URI(entry)) : [];
+    }
+
+    static setDraggedEditorUris(dataTransfer: DataTransfer, uris: URI[]): void {
+        dataTransfer.setData('theia-editor-dnd', uris.map(uri => uri.toString()).join('\n'));
+    }
+
+    /**
+     * Create the dock panel in the bottom shell area.
+     */
+    protected createBottomPanel(): TheiaDockPanel {
+        const renderer = this.dockPanelRendererFactory();
+        renderer.tabBarClasses.push(MAIN_BOTTOM_AREA_CLASS);
+        renderer.tabBarClasses.push(BOTTOM_AREA_CLASS);
+        const dockPanel = this.dockPanelFactory({
+            mode: 'multiple-document',
+            renderer,
+            spacing: 0
+        });
+        dockPanel.id = BOTTOM_AREA_ID;
+        dockPanel.widgetAdded.connect((sender, widget) => {
+            this.refreshBottomPanelToggleButton();
+        });
+        dockPanel.widgetRemoved.connect((sender, widget) => {
+            if (sender.isEmpty) {
+                this.collapseBottomPanel();
+            }
+            this.refreshBottomPanelToggleButton();
+        }, this);
+        dockPanel.node.addEventListener('p-dragenter', event => {
+            // Make sure that the main panel hides its overlay when the bottom panel is expanded
+            this.mainPanel.overlay.hide(0);
+        });
+        dockPanel.hide();
+        dockPanel.widgetAdded.connect((_, widget) => this.fireDidAddWidget(widget));
+        dockPanel.widgetRemoved.connect((_, widget) => this.fireDidRemoveWidget(widget));
+        return dockPanel;
+    }
+
+    /**
+     * Create the top panel, which is used to hold the main menu.
+     */
+    protected createTopPanel(): Panel {
+        const topPanel = new Panel();
+        topPanel.id = 'theia-top-panel';
+        topPanel.hide();
+        return topPanel;
+    }
+
+    /**
+     * Create a box layout to assemble the application shell layout.
+     */
+    protected createBoxLayout(widgets: Widget[], stretch?: number[], options?: BoxPanel.IOptions): BoxLayout {
+        const boxLayout = new BoxLayout(options);
+        for (let i = 0; i < widgets.length; i++) {
+            if (stretch !== undefined && i < stretch.length) {
+                BoxPanel.setStretch(widgets[i], stretch[i]);
+            }
+            boxLayout.addWidget(widgets[i]);
+        }
+        return boxLayout;
+    }
+
+    /**
+     * Create a split layout to assemble the application shell layout.
+     */
+    protected createSplitLayout(widgets: Widget[], stretch?: number[], options?: Partial<SplitLayout.IOptions>): SplitLayout {
+        let optParam: SplitLayout.IOptions = { renderer: SplitPanel.defaultRenderer, };
+        if (options) {
+            optParam = { ...optParam, ...options };
+        }
+        const splitLayout = new SplitLayout(optParam);
+        for (let i = 0; i < widgets.length; i++) {
+            if (stretch !== undefined && i < stretch.length) {
+                SplitPanel.setStretch(widgets[i], stretch[i]);
+            }
+            splitLayout.addWidget(widgets[i]);
+        }
+        return splitLayout;
+    }
+
+    /**
+     * Assemble the application shell layout. Override this method in order to change the arrangement
+     * of the main area and the side panels.
+     */
+    protected createLayout(): Layout {
+        const bottomSplitLayout = this.createSplitLayout(
+            [this.mainPanel, this.bottomPanel],
+            [1, 0],
+            { orientation: 'vertical', spacing: 0 }
+        );
+        const panelForBottomArea = new SplitPanel({ layout: bottomSplitLayout });
+        panelForBottomArea.id = 'theia-bottom-split-panel';
+
+        const leftRightSplitLayout = this.createSplitLayout(
+            [this.leftPanelHandler.container, panelForBottomArea, this.rightPanelHandler.container],
+            [0, 1, 0],
+            { orientation: 'horizontal', spacing: 0 }
+        );
+        const panelForSideAreas = new SplitPanel({ layout: leftRightSplitLayout });
+        panelForSideAreas.id = 'theia-left-right-split-panel';
+
+        return this.createBoxLayout(
+            [this.topPanel, panelForSideAreas, this.statusBar],
+            [0, 1, 0],
+            { direction: 'top-to-bottom', spacing: 0 }
+        );
+    }
+
+    /**
+     * Create an object that describes the current shell layout. This object may contain references
+     * to widgets; these need to be transformed before the layout can be serialized.
+     */
+    getLayoutData(): ApplicationShell.LayoutData {
+        return {
+            version: applicationShellLayoutVersion,
+            mainPanel: this.mainPanel.saveLayout(),
+            mainPanelPinned: this.getPinnedMainWidgets(),
+            bottomPanel: {
+                config: this.bottomPanel.saveLayout(),
+                pinned: this.getPinnedBottomWidgets(),
+                size: this.bottomPanel.isVisible ? this.getBottomPanelSize() : this.bottomPanelState.lastPanelSize,
+                expanded: this.isExpanded('bottom')
+            },
+            leftPanel: this.leftPanelHandler.getLayoutData(),
+            rightPanel: this.rightPanelHandler.getLayoutData(),
+            activeWidgetId: this.activeWidget ? this.activeWidget.id : undefined
+        };
+    }
+
+    // Get an array corresponding to main panel widgets' pinned state.
+    getPinnedMainWidgets(): boolean[] {
+        const pinned: boolean[] = [];
+
+        toArray(this.mainPanel.widgets()).forEach((a, i) => {
+            pinned[i] = a.title.className.includes(PINNED_CLASS);
+        });
+
+        return pinned;
+    }
+
+    // Get an array corresponding to bottom panel widgets' pinned state.
+    getPinnedBottomWidgets(): boolean[] {
+        const pinned: boolean[] = [];
+
+        toArray(this.bottomPanel.widgets()).forEach((a, i) => {
+            pinned[i] = a.title.className.includes(PINNED_CLASS);
+        });
+
+        return pinned;
+    }
+
+    /**
+     * Compute the current height of the bottom panel. This implementation assumes that the container
+     * of the bottom panel is a `SplitPanel`.
+     */
+    protected getBottomPanelSize(): number | undefined {
+        const parent = this.bottomPanel.parent;
+        if (parent instanceof SplitPanel && parent.isVisible) {
+            const index = parent.widgets.indexOf(this.bottomPanel) - 1;
+            if (index >= 0) {
+                const handle = parent.handles[index];
+                if (!handle.classList.contains('p-mod-hidden')) {
+                    const parentHeight = parent.node.clientHeight;
+                    return parentHeight - handle.offsetTop;
+                }
+            }
+        }
+    }
+
+    /**
+     * Determine the default size to apply when the bottom panel is expanded for the first time.
+     */
+    protected getDefaultBottomPanelSize(): number | undefined {
+        const parent = this.bottomPanel.parent;
+        if (parent && parent.isVisible) {
+            return parent.node.clientHeight * this.options.bottomPanel.initialSizeRatio;
+        }
+    }
+
+    /**
+     * Apply a shell layout that has been previously created with `getLayoutData`.
+     */
+    async setLayoutData(layoutData: ApplicationShell.LayoutData): Promise<void> {
+        const { mainPanel, mainPanelPinned, bottomPanel, leftPanel, rightPanel, activeWidgetId } = layoutData;
+        if (leftPanel) {
+            this.leftPanelHandler.setLayoutData(leftPanel);
+            this.registerWithFocusTracker(leftPanel);
+        }
+        if (rightPanel) {
+            this.rightPanelHandler.setLayoutData(rightPanel);
+            this.registerWithFocusTracker(rightPanel);
+        }
+        // Proceed with the bottom panel once the side panels are set up
+        await Promise.all([this.leftPanelHandler.state.pendingUpdate, this.rightPanelHandler.state.pendingUpdate]);
+        if (bottomPanel) {
+            if (bottomPanel.config) {
+                this.bottomPanel.restoreLayout(bottomPanel.config);
+                this.registerWithFocusTracker(bottomPanel.config.main);
+            }
+            if (bottomPanel.size) {
+                this.bottomPanelState.lastPanelSize = bottomPanel.size;
+            }
+            if (bottomPanel.expanded) {
+                this.expandBottomPanel();
+            } else {
+                this.collapseBottomPanel();
+            }
+            const widgets = toArray(this.bottomPanel.widgets());
+            this.bottomPanel.markActiveTabBar(widgets[0]?.title);
+            if (bottomPanel.pinned && bottomPanel.pinned.length === widgets.length) {
+                widgets.forEach((a, i) => {
+                    if (bottomPanel.pinned![i]) {
+                        a.title.className += ` ${PINNED_CLASS}`;
+                        a.title.closable = false;
+                    }
+                });
+            }
+            this.refreshBottomPanelToggleButton();
+        }
+        // Proceed with the main panel once all others are set up
+        await this.bottomPanelState.pendingUpdate;
+        if (mainPanel) {
+            this.mainPanel.restoreLayout(mainPanel);
+            this.registerWithFocusTracker(mainPanel.main);
+            const widgets = toArray(this.mainPanel.widgets());
+            // We don't store information about the last active tabbar
+            // So we simply mark the first as being active
+            this.mainPanel.markActiveTabBar(widgets[0]?.title);
+            if (mainPanelPinned && mainPanelPinned.length === widgets.length) {
+                widgets.forEach((a, i) => {
+                    if (mainPanelPinned[i]) {
+                        a.title.className += ` ${PINNED_CLASS}`;
+                        a.title.closable = false;
+                    }
+                });
+            }
+        }
+        if (activeWidgetId) {
+            this.activateWidget(activeWidgetId);
+        }
+    }
+
+    /**
+     * Modify the height of the bottom panel. This implementation assumes that the container of the
+     * bottom panel is a `SplitPanel`.
+     */
+    protected setBottomPanelSize(size: number): Promise<void> {
+        const enableAnimation = this.applicationStateService.state === 'ready';
+        const options: SplitPositionOptions = {
+            side: 'bottom',
+            duration: enableAnimation ? this.options.bottomPanel.expandDuration : 0,
+            referenceWidget: this.bottomPanel
+        };
+        const promise = this.splitPositionHandler.setSidePanelSize(this.bottomPanel, size, options);
+        const result = new Promise<void>(resolve => {
+            // Resolve the resulting promise in any case, regardless of whether resizing was successful
+            promise.then(() => resolve(), () => resolve());
+        });
+        this.bottomPanelState.pendingUpdate = this.bottomPanelState.pendingUpdate.then(() => result);
+        return result;
+    }
+
+    /**
+     * A promise that is resolved when all currently pending updates are done.
+     */
+    get pendingUpdates(): Promise<void> {
+        return Promise.all([
+            this.bottomPanelState.pendingUpdate,
+            this.leftPanelHandler.state.pendingUpdate,
+            this.rightPanelHandler.state.pendingUpdate
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ]) as Promise<any>;
+    }
+
+    /**
+     * Track all widgets that are referenced by the given layout data.
+     */
+    protected registerWithFocusTracker(data: DockLayout.ITabAreaConfig | DockLayout.ISplitAreaConfig | SidePanel.LayoutData | null): void {
+        if (data) {
+            if (data.type === 'tab-area') {
+                for (const widget of data.widgets) {
+                    if (widget) {
+                        this.track(widget);
+                    }
+                }
+            } else if (data.type === 'split-area') {
+                for (const child of data.children) {
+                    this.registerWithFocusTracker(child);
+                }
+            } else if (data.type === 'sidepanel' && data.items) {
+                for (const item of data.items) {
+                    if (item.widget) {
+                        this.track(item.widget);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Add a widget to the application shell. The given widget must have a unique `id` property,
+     * which will be used as the DOM id.
+     *
+     * Widgets are removed from the shell by calling their `close` or `dispose` methods.
+     *
+     * Widgets added to the top area are not tracked regarding the _current_ and _active_ states.
+     */
+    async addWidget(widget: Widget, options?: Readonly<ApplicationShell.WidgetOptions>): Promise<void> {
+        if (!widget.id) {
+            console.error('Widgets added to the application shell must have a unique id property.');
+            return;
+        }
+        const { area, addOptions } = this.getInsertionOptions(options);
+        const sidePanelOptions: SidePanel.WidgetOptions = { rank: options?.rank };
+        switch (area) {
+            case 'main':
+                this.mainPanel.addWidget(widget, addOptions);
+                break;
+            case 'top':
+                this.topPanel.addWidget(widget);
+                break;
+            case 'bottom':
+                this.bottomPanel.addWidget(widget, addOptions);
+                break;
+            case 'left':
+                this.leftPanelHandler.addWidget(widget, sidePanelOptions);
+                break;
+            case 'right':
+                this.rightPanelHandler.addWidget(widget, sidePanelOptions);
+                break;
+            case 'secondaryWindow':
+                /** At the moment, widgets are only moved to this area (i.e. a secondary window) by moving them from one of the other areas. */
+                throw new Error('Widgets cannot be added directly to a secondary window');
+            default:
+                throw new Error('Unexpected area: ' + options?.area);
+        }
+        if (area !== 'top') {
+            this.track(widget);
+        }
+    }
+
+    getInsertionOptions(options?: Readonly<ApplicationShell.WidgetOptions>): { area: string; addOptions: DockLayout.IAddOptions; } {
+        let ref: Widget | undefined = options?.ref;
+        let area: ApplicationShell.Area = options?.area || 'main';
+        if (!ref && (area === 'main' || area === 'bottom')) {
+            const tabBar = this.getTabBarFor(area);
+            ref = tabBar && tabBar.currentTitle && tabBar.currentTitle.owner || undefined;
+        }
+        // make sure that ref belongs to area
+        area = ref && this.getAreaFor(ref) || area;
+        const addOptions: DockPanel.IAddOptions = {};
+        if (ApplicationShell.isOpenToSideMode(options?.mode)) {
+            const areaPanel = area === 'main' ? this.mainPanel : area === 'bottom' ? this.bottomPanel : undefined;
+            const sideRef = areaPanel && ref && (options?.mode === 'open-to-left' ?
+                areaPanel.previousTabBarWidget(ref) :
+                areaPanel.nextTabBarWidget(ref));
+            if (sideRef) {
+                addOptions.ref = sideRef;
+            } else {
+                addOptions.ref = ref;
+                addOptions.mode = options?.mode === 'open-to-left' ? 'split-left' : 'split-right';
+            }
+        } else {
+            addOptions.ref = ref;
+            addOptions.mode = options?.mode;
+        }
+        return { area, addOptions };
+    }
+
+    /**
+     * The widgets contained in the given shell area.
+     */
+    getWidgets(area: ApplicationShell.Area): Widget[] {
+        switch (area) {
+            case 'main':
+                return toArray(this.mainPanel.widgets());
+            case 'top':
+                return toArray(this.topPanel.widgets);
+            case 'bottom':
+                return toArray(this.bottomPanel.widgets());
+            case 'left':
+                return toArray(this.leftPanelHandler.dockPanel.widgets());
+            case 'right':
+                return toArray(this.rightPanelHandler.dockPanel.widgets());
+            case 'secondaryWindow':
+                return toArray(this.secondaryWindowHandler.widgets);
+            default:
+                throw new Error('Illegal argument: ' + area);
+        }
+    }
+
+    /**
+     * Find the widget that contains the given HTML element. The returned widget may be one
+     * that is managed by the application shell, or one that is embedded in another widget and
+     * not directly managed by the shell, or a tab bar.
+     */
+    findWidgetForElement(element: HTMLElement): Widget | undefined {
+        let widgetNode: HTMLElement | null = element;
+        while (widgetNode && !widgetNode.classList.contains('p-Widget')) {
+            widgetNode = widgetNode.parentElement;
+        }
+        if (widgetNode) {
+            return this.findWidgetForNode(widgetNode, this);
+        }
+        return undefined;
+    }
+
+    private findWidgetForNode(widgetNode: HTMLElement, widget: Widget): Widget | undefined {
+        if (widget.node === widgetNode) {
+            return widget;
+        }
+        let result: Widget | undefined;
+        each(widget.children(), child => {
+            result = this.findWidgetForNode(widgetNode, child);
+            return !result;
+        });
+        return result;
+    }
+
+    /**
+     * Finds the title widget from the tab-bar.
+     * @param tabBar used for providing an array of titles.
+     * @returns the selected title widget, else returns the currentTitle or undefined.
+     */
+    findTitle(tabBar: TabBar<Widget>, event?: Event): Title<Widget> | undefined {
+        if (event?.target instanceof HTMLElement) {
+            const tabNode = event.target;
+
+            const titleIndex = Array.from(tabBar.contentNode.getElementsByClassName('p-TabBar-tab'))
+                .findIndex(node => node.contains(tabNode));
+
+            if (titleIndex !== -1) {
+                return tabBar.titles[titleIndex];
+            }
+
+        }
+        return tabBar.currentTitle || undefined;
+    }
+
+    /**
+     * Finds the tab-bar widget.
+     * @returns the selected tab-bar, else returns the currentTabBar.
+     */
+    findTabBar(event?: Event): TabBar<Widget> | undefined {
+        if (event?.target instanceof HTMLElement) {
+            const tabBar = this.findWidgetForElement(event.target);
+            if (tabBar instanceof TabBar) {
+                return tabBar;
+            }
+        }
+        return this.currentTabBar;
+    }
+
+    /**
+     *  @returns the widget whose title has been targeted by a DOM event on a tabbar, or undefined if none can be found.
+     */
+    findTargetedWidget(event?: Event): Widget | undefined {
+        if (event) {
+            const tab = this.findTabBar(event);
+            const title = tab && this.findTitle(tab, event);
+            return title && title.owner;
+        }
+    }
+
+    /**
+     * The current widget in the application shell. The current widget is the last widget that
+     * was active and not yet closed. See the remarks to `activeWidget` on what _active_ means.
+     */
+    get currentWidget(): Widget | undefined {
+        return this.tracker.currentWidget || undefined;
+    }
+
+    /**
+     * The active widget in the application shell. The active widget is the one that has focus
+     * (either the widget itself or any of its contents).
+     *
+     * _Note:_ Focus is taken by a widget through the `onActivateRequest` method. It is up to the
+     * widget implementation which DOM element will get the focus. The default implementation
+     * does not take any focus; in that case the widget is never returned by this property.
+     */
+    get activeWidget(): Widget | undefined {
+        return this.tracker.activeWidget || undefined;
+    }
+
+    /**
+     * Returns the last active widget in the given shell area.
+     */
+    getCurrentWidget(area: ApplicationShell.Area): Widget | undefined {
+        let title: Title<Widget> | null | undefined;
+        switch (area) {
+            case 'main':
+                title = this.mainPanel.currentTitle;
+                break;
+            case 'bottom':
+                title = this.bottomPanel.currentTitle;
+                break;
+            case 'left':
+                title = this.leftPanelHandler.tabBar.currentTitle;
+                break;
+            case 'right':
+                title = this.rightPanelHandler.tabBar.currentTitle;
+                break;
+            case 'secondaryWindow':
+                // The current widget in a secondary window is not tracked.
+                return undefined;
+            default:
+                throw new Error('Illegal argument: ' + area);
+        }
+        return title ? title.owner : undefined;
+    }
+
+    /**
+     * Handle a change to the current widget.
+     */
+    private onCurrentChanged(sender: FocusTracker<Widget>, args: FocusTracker.IChangedArgs<Widget>): void {
+        this.onDidChangeCurrentWidgetEmitter.fire(args);
+    }
+
+    protected readonly toDisposeOnActiveChanged = new DisposableCollection();
+
+    /**
+     * Handle a change to the active widget.
+     */
+    private onActiveChanged(sender: FocusTracker<Widget>, args: FocusTracker.IChangedArgs<Widget>): void {
+        this.toDisposeOnActiveChanged.dispose();
+        const { newValue, oldValue } = args;
+        if (oldValue) {
+            let w: Widget | null = oldValue;
+            while (w) {
+                // Remove the mark of the previously active widget
+                w.title.className = w.title.className.replace(' theia-mod-active', '');
+                w = w.parent;
+            }
+            // Reset the z-index to the default
+            // eslint-disable-next-line no-null/no-null
+            this.setZIndex(oldValue.node, null);
+        }
+        if (newValue) {
+            let w: Widget | null = newValue;
+            while (w) {
+                // Mark the tab of the active widget
+                w.title.className += ' theia-mod-active';
+                w = w.parent;
+            }
+            // Reveal the title of the active widget in its tab bar
+            const tabBar = this.getTabBarFor(newValue);
+            if (tabBar instanceof ScrollableTabBar) {
+                const index = tabBar.titles.indexOf(newValue.title);
+                if (index >= 0) {
+                    tabBar.revealTab(index);
+                }
+            }
+            const widget = this.toTrackedStack(newValue.id).pop();
+            const panel = this.findPanel(widget);
+            if (panel) {
+                // if widget was undefined, we wouldn't have gotten a panel back before
+                panel.markAsCurrent(widget!.title);
+            }
+            // Add checks to ensure that the 'sash' for left panel is displayed correctly
+            if (newValue.node.className === 'p-Widget theia-view-container p-DockPanel-widget') {
+                // Set the z-index so elements with `position: fixed` contained in the active widget are displayed correctly
+                this.setZIndex(newValue.node, '1');
+            }
+
+            // activate another widget if an active widget will be closed
+            const onCloseRequest = newValue['onCloseRequest'];
+            newValue['onCloseRequest'] = msg => {
+                const currentTabBar = this.currentTabBar;
+                if (currentTabBar) {
+                    const recentlyUsedInTabBar = currentTabBar['_previousTitle'] as TabBar<Widget>['currentTitle'];
+                    if (recentlyUsedInTabBar && recentlyUsedInTabBar.owner !== newValue) {
+                        currentTabBar.currentIndex = ArrayExt.firstIndexOf(currentTabBar.titles, recentlyUsedInTabBar);
+                        if (currentTabBar.currentTitle) {
+                            this.activateWidget(currentTabBar.currentTitle.owner.id);
+                        }
+                    } else if (!this.activateNextTabInTabBar(currentTabBar)) {
+                        if (!this.activatePreviousTabBar(currentTabBar)) {
+                            this.activateNextTabBar(currentTabBar);
+                        }
+                    }
+                }
+                newValue['onCloseRequest'] = onCloseRequest;
+                newValue['onCloseRequest'](msg);
+            };
+            this.toDisposeOnActiveChanged.push(Disposable.create(() => newValue['onCloseRequest'] = onCloseRequest));
+            if (PreviewableWidget.is(newValue)) {
+                newValue.loaded = true;
+            }
+        }
+        this.onDidChangeActiveWidgetEmitter.fire(args);
+    }
+
+    /**
+     * Set the z-index of the given element and its ancestors to the value `z`.
+     */
+    private setZIndex(element: HTMLElement, z: string | null): void {
+        element.style.zIndex = z || '';
+        const parent = element.parentElement;
+        if (parent && parent !== this.node) {
+            this.setZIndex(parent, z);
+        }
+    }
+
+    /**
+     * Track the given widget so it is considered in the `current` and `active` state of the shell.
+     */
+    protected track(widget: Widget): void {
+        if (this.tracker.widgets.indexOf(widget) !== -1) {
+            return;
+        }
+        this.tracker.add(widget);
+        this.checkActivation(widget);
+        Saveable.apply(
+            widget,
+            () => this.widgets.filter((maybeSaveable): maybeSaveable is Widget & SaveableSource => !!Saveable.get(maybeSaveable)),
+            async (toSave, options) => {
+                await this.saveResourceService.save(toSave, options);
+            },
+        );
+        if (ApplicationShell.TrackableWidgetProvider.is(widget)) {
+            for (const toTrack of widget.getTrackableWidgets()) {
+                this.track(toTrack);
+            }
+            if (widget.onDidChangeTrackableWidgets) {
+                widget.onDidChangeTrackableWidgets(widgets => widgets.forEach(w => this.track(w)));
+            }
+        }
+    }
+
+    /**
+     * @returns an array of Widgets, all of which are tracked by the focus tracker
+     * The first member of the array is the widget whose id is passed in, and the other widgets
+     * are its tracked parents in ascending order
+     */
+    protected toTrackedStack(id: string): Widget[] {
+        const tracked = new Map<string, Widget>(this.tracker.widgets.map(w => [w.id, w] as [string, Widget]));
+        let current = tracked.get(id);
+        const stack: Widget[] = [];
+        while (current) {
+            if (tracked.has(current.id)) {
+                stack.push(current);
+            }
+            current = current.parent || undefined;
+        }
+        return stack;
+    }
+
+    /**
+     * Activate a widget in the application shell. This makes the widget visible and usually
+     * also assigns focus to it.
+     *
+     * _Note:_ Focus is taken by a widget through the `onActivateRequest` method. It is up to the
+     * widget implementation which DOM element will get the focus. The default implementation
+     * does not take any focus.
+     *
+     * @returns the activated widget if it was found
+     */
+    async activateWidget(id: string): Promise<Widget | undefined> {
+        const stack = this.toTrackedStack(id);
+        let current = stack.pop();
+        if (current && !this.doActivateWidget(current.id)) {
+            return undefined;
+        }
+        while (current && stack.length) {
+            const child = stack.pop()!;
+            if (ApplicationShell.TrackableWidgetProvider.is(current) && current.activateWidget) {
+                current = current.activateWidget(child.id);
+            } else {
+                child.activate();
+                current = child;
+            }
+        }
+        if (!current) {
+            return undefined;
+        }
+        return Promise.all([
+            this.waitForActivation(current.id),
+            waitForRevealed(current),
+            this.pendingUpdates
+        ]).then(() => current, () => undefined);
+    }
+
+    waitForActivation(id: string): Promise<void> {
+        if (this.activeWidget && this.activeWidget.id === id) {
+            return Promise.resolve();
+        }
+        const activation = new Deferred();
+        const success = this.onDidChangeActiveWidget(() => {
+            if (this.activeWidget && this.activeWidget.id === id) {
+                activation.resolve();
+            }
+        });
+        const failure = setTimeout(() => activation.reject(new Error(`Widget with id '${id}' failed to activate.`)), this.activationTimeout + 250);
+        return activation.promise.finally(() => {
+            success.dispose();
+            clearTimeout(failure);
+        });
+    }
+
+    /**
+     * Activate top-level area widget.
+     */
+    protected doActivateWidget(id: string): Widget | undefined {
+        let widget = find(this.mainPanel.widgets(), w => w.id === id);
+        if (widget) {
+            this.mainPanel.activateWidget(widget);
+        }
+        if (!widget) {
+            widget = find(this.bottomPanel.widgets(), w => w.id === id);
+            if (widget) {
+                this.expandBottomPanel();
+                this.bottomPanel.activateWidget(widget);
+            }
+        }
+        if (!widget) {
+            widget = this.leftPanelHandler.activate(id);
+        }
+
+        if (!widget) {
+            widget = this.rightPanelHandler.activate(id);
+        }
+        if (widget) {
+            this.windowService.focus();
+            return widget;
+        }
+        return this.secondaryWindowHandler.activateWidget(id);
+    }
+
+    /**
+     * Focus is taken by a widget through the `onActivateRequest` method. It is up to the
+     * widget implementation which DOM element will get the focus. The default implementation
+     * of Widget does not take any focus. This method can help finding such problems by logging
+     * a warning in case a widget was explicitly activated, but did not trigger a change of the
+     * `activeWidget` property.
+     */
+    private checkActivation(widget: Widget): Widget {
+        const onActivateRequest = widget['onActivateRequest'].bind(widget);
+        widget['onActivateRequest'] = (msg: Message) => {
+            onActivateRequest(msg);
+            this.assertActivated(widget);
+        };
+        return widget;
+    }
+
+    private readonly activationTimeout = 2000;
+    private readonly toDisposeOnActivationCheck = new DisposableCollection();
+    private assertActivated(widget: Widget): void {
+        this.toDisposeOnActivationCheck.dispose();
+
+        const onDispose = () => this.toDisposeOnActivationCheck.dispose();
+        widget.disposed.connect(onDispose);
+        this.toDisposeOnActivationCheck.push(Disposable.create(() => widget.disposed.disconnect(onDispose)));
+
+        let start = 0;
+        const step: FrameRequestCallback = timestamp => {
+            const activeElement = widget.node.ownerDocument.activeElement;
+            if (activeElement && widget.node.contains(activeElement)) {
+                return;
+            }
+            if (!start) {
+                start = timestamp;
+            }
+            const delta = timestamp - start;
+            if (delta < this.activationTimeout) {
+                request = window.requestAnimationFrame(step);
+            } else {
+                console.warn(`Widget was activated, but did not accept focus after ${this.activationTimeout}ms: ${widget.id}`);
+            }
+        };
+        let request = window.requestAnimationFrame(step);
+        this.toDisposeOnActivationCheck.push(Disposable.create(() => window.cancelAnimationFrame(request)));
+    }
+
+    /**
+     * Reveal a widget in the application shell. This makes the widget visible,
+     * but does not activate it.
+     *
+     * @returns the revealed widget if it was found
+     */
+    async revealWidget(id: string): Promise<Widget | undefined> {
+        const stack = this.toTrackedStack(id);
+        let current = stack.pop();
+        if (current && !this.doRevealWidget(current.id)) {
+            return undefined;
+        }
+        while (current && stack.length) {
+            const child = stack.pop()!;
+            if (ApplicationShell.TrackableWidgetProvider.is(current) && current.revealWidget) {
+                current = current.revealWidget(child.id);
+            } else {
+                current = child;
+            }
+        }
+        if (!current) {
+            return undefined;
+        }
+        await Promise.all([
+            waitForRevealed(current),
+            this.pendingUpdates
+        ]);
+        return current;
+    }
+
+    /**
+     * Reveal top-level area widget.
+     */
+    protected doRevealWidget(id: string): Widget | undefined {
+        let widget = find(this.mainPanel.widgets(), w => w.id === id);
+        if (!widget) {
+            widget = find(this.bottomPanel.widgets(), w => w.id === id);
+            if (widget) {
+                this.expandBottomPanel();
+            }
+        }
+        if (widget) {
+            const tabBar = this.getTabBarFor(widget);
+            if (tabBar) {
+                tabBar.currentTitle = widget.title;
+            }
+        }
+        if (!widget) {
+            widget = this.leftPanelHandler.expand(id);
+        }
+        if (!widget) {
+            widget = this.rightPanelHandler.expand(id);
+        }
+        if (widget) {
+            this.windowService.focus();
+            return widget;
+        } else {
+            return this.secondaryWindowHandler.revealWidget(id);
+        }
+    }
+
+    /**
+     * Expand the named side panel area. This makes sure that the panel is visible, even if there
+     * are no widgets in it. If the panel is already visible, nothing happens. If the panel is currently
+     * collapsed (see `collapsePanel`) and it contains widgets, the widgets are revealed that were
+     * visible before it was collapsed.
+     */
+    expandPanel(area: ApplicationShell.Area): void {
+        switch (area) {
+            case 'bottom':
+                this.expandBottomPanel();
+                break;
+            case 'left':
+                this.leftPanelHandler.expand();
+                break;
+            case 'right':
+                this.rightPanelHandler.expand();
+                break;
+            default:
+                throw new Error('Area cannot be expanded: ' + area);
+        }
+    }
+
+    /**
+     * Adjusts the size of the given area in the application shell.
+     *
+     * @param size the desired size of the panel in pixels.
+     * @param area the area to resize.
+     */
+    resize(size: number, area: ApplicationShell.Area): void {
+        switch (area) {
+            case 'bottom':
+                if (this.bottomPanel.isHidden) {
+                    this.bottomPanelState.lastPanelSize = size;
+                } else {
+                    this.setBottomPanelSize(size);
+                }
+                break;
+            case 'left':
+                this.leftPanelHandler.resize(size);
+                break;
+            case 'right':
+                this.rightPanelHandler.resize(size);
+                break;
+            default:
+                throw new Error('Area cannot be resized: ' + area);
+        }
+    }
+
+    /**
+     * Expand the bottom panel. See `expandPanel` regarding the exact behavior.
+     */
+    protected expandBottomPanel(): void {
+        const bottomPanel = this.bottomPanel;
+        if (bottomPanel.isHidden) {
+            let relativeSizes: number[] | undefined;
+            const parent = bottomPanel.parent;
+            if (parent instanceof SplitPanel) {
+                relativeSizes = parent.relativeSizes();
+            }
+            bottomPanel.show();
+            if (relativeSizes && parent instanceof SplitPanel) {
+                // Make sure that the expansion animation starts at the smallest possible size
+                parent.setRelativeSizes(relativeSizes);
+            }
+
+            let size: number | undefined;
+            if (bottomPanel.isEmpty) {
+                bottomPanel.node.style.minHeight = '0';
+                size = this.options.bottomPanel.emptySize;
+            } else if (this.bottomPanelState.lastPanelSize) {
+                size = this.bottomPanelState.lastPanelSize;
+            } else {
+                size = this.getDefaultBottomPanelSize();
+            }
+            if (size) {
+                this.bottomPanelState.expansion = SidePanel.ExpansionState.expanding;
+                this.setBottomPanelSize(size).then(() => {
+                    if (this.bottomPanelState.expansion === SidePanel.ExpansionState.expanding) {
+                        this.bottomPanelState.expansion = SidePanel.ExpansionState.expanded;
+                    }
+                });
+            } else {
+                this.bottomPanelState.expansion = SidePanel.ExpansionState.expanded;
+            }
+        }
+    }
+
+    /**
+     * Collapse the named side panel area. This makes sure that the panel is hidden,
+     * increasing the space that is available for other shell areas.
+     */
+    collapsePanel(area: ApplicationShell.Area): Promise<void> {
+        switch (area) {
+            case 'bottom':
+                return this.collapseBottomPanel();
+            case 'left':
+                return this.leftPanelHandler.collapse();
+            case 'right':
+                return this.rightPanelHandler.collapse();
+            default:
+                throw new Error('Area cannot be collapsed: ' + area);
+        }
+    }
+
+    /**
+     * Collapse the bottom panel. All contained widgets are hidden, but not closed.
+     * They can be restored by calling `expandBottomPanel`.
+     */
+    protected collapseBottomPanel(): Promise<void> {
+        const bottomPanel = this.bottomPanel;
+        if (bottomPanel.isHidden) {
+            return Promise.resolve();
+        }
+        if (this.bottomPanelState.expansion === SidePanel.ExpansionState.expanded) {
+            const size = this.getBottomPanelSize();
+            if (size) {
+                this.bottomPanelState.lastPanelSize = size;
+            }
+        }
+        this.bottomPanelState.expansion = SidePanel.ExpansionState.collapsed;
+        bottomPanel.hide();
+        return animationFrame();
+    }
+
+    /**
+     * Refresh the toggle button for the bottom panel. This implementation creates a status bar entry
+     * and refers to the command `core.toggle.bottom.panel`.
+     */
+    protected refreshBottomPanelToggleButton(): void {
+        if (this.bottomPanel.isEmpty) {
+            this.statusBar.removeElement(BOTTOM_PANEL_TOGGLE_ID);
+        } else {
+            const label = nls.localize('theia/core/common/collapseBottomPanel', 'Toggle Bottom Panel');
+            const element: StatusBarEntry = {
+                name: label,
+                text: '$(codicon-window)',
+                alignment: StatusBarAlignment.RIGHT,
+                tooltip: label,
+                command: 'core.toggle.bottom.panel',
+                accessibilityInformation: {
+                    label: label,
+                    role: 'button'
+                },
+                priority: -1000
+            };
+            this.statusBar.setElement(BOTTOM_PANEL_TOGGLE_ID, element);
+        }
+    }
+
+    /**
+     * Check whether the named side panel area is expanded (returns `true`) or collapsed (returns `false`).
+     */
+    isExpanded(area: ApplicationShell.Area): boolean {
+        switch (area) {
+            case 'bottom':
+                return this.bottomPanelState.expansion === SidePanel.ExpansionState.expanded;
+            case 'left':
+                return this.leftPanelHandler.state.expansion === SidePanel.ExpansionState.expanded;
+            case 'right':
+                return this.rightPanelHandler.state.expansion === SidePanel.ExpansionState.expanded;
+            default:
+                return true;
+        }
+    }
+
+    /**
+     * Close all tabs or a selection of tabs in a specific part of the application shell.
+     *
+     * @param tabBarOrArea
+     *      Either the name of a shell area or a `TabBar` that is contained in such an area.
+     * @param filter
+     *      If undefined, all tabs are closed; otherwise only those tabs that match the filter are closed.
+     */
+    async closeTabs(tabBarOrArea: TabBar<Widget> | ApplicationShell.Area,
+        filter?: (title: Title<Widget>, index: number) => boolean): Promise<void> {
+        const titles: Array<Title<Widget>> = this.getWidgetTitles(tabBarOrArea, filter);
+        if (titles.length) {
+            await this.closeMany(titles.map(title => title.owner));
+        }
+    }
+
+    saveTabs(tabBarOrArea: TabBar<Widget> | ApplicationShell.Area,
+        filter?: (title: Title<Widget>, index: number) => boolean): void {
+
+        const titles = this.getWidgetTitles(tabBarOrArea, filter);
+        for (let i = 0; i < titles.length; i++) {
+            const widget = titles[i].owner;
+            const saveable = Saveable.get(widget);
+            saveable?.save();
+        }
+    }
+
+    /**
+     * Collects all widget titles for the given tab bar or area and optionally filters them.
+     *
+     * @param tabBarOrArea The tab bar or area to retrieve the widget titles for
+     * @param filter The filter to apply to the result
+     * @returns The filtered array of widget titles or an empty array
+     */
+    protected getWidgetTitles(tabBarOrArea: TabBar<Widget> | ApplicationShell.Area,
+        filter?: (title: Title<Widget>, index: number) => boolean): Title<Widget>[] {
+
+        const titles: Title<Widget>[] = [];
+        if (tabBarOrArea === 'main') {
+            this.mainAreaTabBars.forEach(tabbar => titles.push(...toArray(tabbar.titles)));
+        } else if (tabBarOrArea === 'bottom') {
+            this.bottomAreaTabBars.forEach(tabbar => titles.push(...toArray(tabbar.titles)));
+        } else if (tabBarOrArea === 'secondaryWindow') {
+            titles.push(...this.secondaryWindowHandler.widgets.map(w => w.title));
+        } else if (typeof tabBarOrArea === 'string') {
+            const tabbar = this.getTabBarFor(tabBarOrArea);
+            if (tabbar) {
+                titles.push(...toArray(tabbar.titles));
+            }
+        } else if (tabBarOrArea) {
+            titles.push(...toArray(tabBarOrArea.titles));
+        }
+
+        return filter ? titles.filter(filter) : titles;
+    }
+
+    /**
+     * @param targets the widgets to be closed
+     * @return an array of all the widgets that were actually closed.
+     */
+    async closeMany(targets: Widget[], options?: ApplicationShell.CloseOptions): Promise<Widget[]> {
+        if (options?.save === false || await Saveable.confirmSaveBeforeClose(targets, this.widgets.filter(widget => !targets.includes(widget)))) {
+            return (await Promise.all(targets.map(target => this.closeWidget(target.id, options)))).filter((widget): widget is Widget => widget !== undefined);
+        }
+        return [];
+    }
+
+    /**
+     * @returns the widget that was closed, if any, `undefined` otherwise.
+     *
+     * If your use case requires closing multiple widgets, use {@link ApplicationShell#closeMany} instead. That method handles closing saveable widgets more reliably.
+     */
+    async closeWidget(id: string, options?: ApplicationShell.CloseOptions): Promise<Widget | undefined> {
+        // TODO handle save for composite widgets, i.e. the preference widget has 2 editors
+        const stack = this.toTrackedStack(id);
+        const current = stack.pop();
+        if (!current) {
+            return undefined;
+        }
+        const saveableOptions = options && { shouldSave: () => options.save };
+        const pendingClose = SaveableWidget.is(current)
+            ? current.closeWithSaving(saveableOptions)
+            : (current.close(), waitForClosed(current));
+        await Promise.all([
+            pendingClose,
+            this.pendingUpdates
+        ]);
+        return stack[0] || current;
+    }
+
+    /**
+     * The shell area name of the currently active tab, or undefined.
+     */
+    get currentTabArea(): ApplicationShell.Area | undefined {
+        const currentWidget = this.currentWidget;
+        if (currentWidget) {
+            return this.getAreaFor(currentWidget);
+        }
+    }
+
+    /**
+     * 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: TabBar<Widget> | Widget): ApplicationShell.Area | undefined {
+        if (input instanceof TabBar) {
+            if (find(this.mainPanel.tabBars(), tb => tb === input)) {
+                return 'main';
+            }
+            if (find(this.bottomPanel.tabBars(), tb => tb === input)) {
+                return 'bottom';
+            }
+            if (this.leftPanelHandler.tabBar === input) {
+                return 'left';
+            }
+            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';
+        }
+        if (this.secondaryWindowHandler.widgets.includes(widget)) {
+            return 'secondaryWindow';
+        }
+        return undefined;
+    }
+
+    protected getAreaPanelFor(input: Widget): DockPanel | undefined {
+        const widget = this.toTrackedStack(input.id).pop();
+        if (!widget) {
+            return undefined;
+        }
+        return this.findPanel(widget);
+    }
+
+    /**
+     * Find the shell panel this top-level widget is part of
+     */
+    protected findPanel(widget: Widget | undefined): TheiaDockPanel | undefined {
+        if (!widget) {
+            return undefined;
+        }
+        const title = widget.title;
+        const mainPanelTabBar = this.mainPanel.findTabBar(title);
+        if (mainPanelTabBar) {
+            return this.mainPanel;
+        }
+        const bottomPanelTabBar = this.bottomPanel.findTabBar(title);
+        if (bottomPanelTabBar) {
+            return this.bottomPanel;
+        }
+        if (ArrayExt.firstIndexOf(this.leftPanelHandler.tabBar.titles, title) > -1) {
+            return this.leftPanelHandler.dockPanel;
+        }
+        if (ArrayExt.firstIndexOf(this.rightPanelHandler.tabBar.titles, title) > -1) {
+            return this.rightPanelHandler.dockPanel;
+        }
+        return undefined;
+    }
+
+    /**
+     * Return the tab bar that has the currently active widget, or undefined.
+     */
+    get currentTabBar(): TabBar<Widget> | undefined {
+        const currentWidget = this.currentWidget;
+        if (currentWidget) {
+            return this.getTabBarFor(currentWidget);
+        }
+    }
+
+    /**
+     * Return the tab bar in the given shell area, or the tab bar that has the given widget, or undefined.
+     */
+    getTabBarFor(widgetOrArea: Widget | ApplicationShell.Area): TabBar<Widget> | undefined {
+        if (typeof widgetOrArea === 'string') {
+            switch (widgetOrArea) {
+                case 'main':
+                    return this.mainPanel.currentTabBar;
+                case 'bottom':
+                    return this.bottomPanel.currentTabBar;
+                case 'left':
+                    return this.leftPanelHandler.tabBar;
+                case 'right':
+                    return this.rightPanelHandler.tabBar;
+                case 'secondaryWindow':
+                    // Secondary windows don't have a tab bar
+                    return undefined;
+                default:
+                    throw new Error('Illegal argument: ' + widgetOrArea);
+            }
+        }
+        const widget = this.toTrackedStack(widgetOrArea.id).pop();
+        if (!widget) {
+            return undefined;
+        }
+        const widgetTitle = widget.title;
+        const mainPanelTabBar = this.mainPanel.findTabBar(widgetTitle);
+        if (mainPanelTabBar) {
+            return mainPanelTabBar;
+        }
+        const bottomPanelTabBar = this.bottomPanel.findTabBar(widgetTitle);
+        if (bottomPanelTabBar) {
+            return bottomPanelTabBar;
+        }
+        const leftPanelTabBar = this.leftPanelHandler.tabBar;
+        if (ArrayExt.firstIndexOf(leftPanelTabBar.titles, widgetTitle) > -1) {
+            return leftPanelTabBar;
+        }
+        const rightPanelTabBar = this.rightPanelHandler.tabBar;
+        if (ArrayExt.firstIndexOf(rightPanelTabBar.titles, widgetTitle) > -1) {
+            return rightPanelTabBar;
+        }
+        return undefined;
+    }
+
+    /**
+     * The tab bars contained in the main shell area. If there is no widget in the main area, the
+     * returned array is empty.
+     */
+    get mainAreaTabBars(): TabBar<Widget>[] {
+        return toArray(this.mainPanel.tabBars());
+    }
+
+    /**
+     * The tab bars contained in the bottom shell area. If there is no widget in the bottom area,
+     * the returned array is empty.
+     */
+    get bottomAreaTabBars(): TabBar<Widget>[] {
+        return toArray(this.bottomPanel.tabBars());
+    }
+
+    /**
+     * The tab bars contained in all shell areas.
+     */
+    get allTabBars(): TabBar<Widget>[] {
+        return [...this.mainAreaTabBars, ...this.bottomAreaTabBars, this.leftPanelHandler.tabBar, this.rightPanelHandler.tabBar];
+    }
+
+    /*
+     * Activate the next tab in the current tab bar.
+     */
+    activateNextTabInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
+        const index = this.nextTabIndexInTabBar(current);
+        if (!current || index === -1) {
+            return false;
+        }
+        current.currentIndex = index;
+        if (current.currentTitle) {
+            this.activateWidget(current.currentTitle.owner.id);
+        }
+        return true;
+    }
+
+    nextTabIndexInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): number {
+        if (!current || current.titles.length <= 1) {
+            return -1;
+        }
+        const index = current.currentIndex;
+        if (index === -1) {
+            return -1;
+        }
+        if (index < current.titles.length - 1) {
+            return index + 1;
+        }
+        return 0;
+    }
+
+    activateNextTab(): boolean {
+        const current = this.currentTabBar;
+        if (current) {
+            const ci = current.currentIndex;
+            if (ci !== -1) {
+                if (ci < current.titles.length - 1) {
+                    current.currentIndex += 1;
+                    if (current.currentTitle) {
+                        this.activateWidget(current.currentTitle.owner.id);
+                    }
+                    return true;
+                } else if (ci === current.titles.length - 1) {
+                    return this.activateNextTabBar(current);
+                }
+            }
+        }
+        return false;
+    }
+
+    activateNextTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
+        const nextBar = this.nextTabBar(current);
+        if (nextBar) {
+            nextBar.currentIndex = 0;
+            if (nextBar.currentTitle) {
+                this.activateWidget(nextBar.currentTitle.owner.id);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Return the tab bar next to the given tab bar; return the given tab bar if there is no adjacent one.
+     */
+    nextTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): TabBar<Widget> | undefined {
+        let bars = toArray(this.bottomPanel.tabBars());
+        let len = bars.length;
+        let ci = ArrayExt.firstIndexOf(bars, current);
+        if (ci < 0) {
+            bars = toArray(this.mainPanel.tabBars());
+            len = bars.length;
+            ci = ArrayExt.firstIndexOf(bars, current);
+        }
+        if (ci >= 0 && ci < len - 1) {
+            return bars[ci + 1];
+        } else if (ci >= 0 && ci === len - 1) {
+            return bars[0];
+        } else {
+            return current;
+        }
+    }
+
+    /*
+     * Activate the previous tab in the current tab bar.
+     */
+    activatePreviousTabInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
+        const index = this.previousTabIndexInTabBar(current);
+        if (!current || index === -1) {
+            return false;
+        }
+        current.currentIndex = index;
+        if (current.currentTitle) {
+            this.activateWidget(current.currentTitle.owner.id);
+        }
+        return true;
+    }
+
+    previousTabIndexInTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): number {
+        if (!current || current.titles.length <= 1) {
+            return -1;
+        }
+        const index = current.currentIndex;
+        if (index === -1) {
+            return -1;
+        }
+        if (index > 0) {
+            return index - 1;
+        }
+        return current.titles.length - 1;
+    }
+
+    activatePreviousTab(): boolean {
+        const current = this.currentTabBar;
+        if (current) {
+            const ci = current.currentIndex;
+            if (ci !== -1) {
+                if (ci > 0) {
+                    current.currentIndex -= 1;
+                    if (current.currentTitle) {
+                        this.activateWidget(current.currentTitle.owner.id);
+                    }
+                    return true;
+                } else if (ci === 0) {
+                    if (current && current.titles.length > 0) {
+                        current.currentIndex = current.titles.length - 1;
+                        if (current.currentTitle) {
+                            this.activateWidget(current.currentTitle.owner.id);
+                        }
+                        return true;
+                    }
+                    return this.activatePreviousTabBar(current);
+                }
+            }
+        }
+        return false;
+    }
+
+    activatePreviousTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): boolean {
+        const prevBar = this.previousTabBar(current);
+        if (!prevBar) {
+            return false;
+        }
+        if (!prevBar.currentTitle) {
+            prevBar.currentIndex = prevBar.titles.length - 1;
+        }
+        if (prevBar.currentTitle) {
+            this.activateWidget(prevBar.currentTitle.owner.id);
+        }
+        return true;
+    }
+
+    /**
+     * Return the tab bar previous to the given tab bar; return the given tab bar if there is no adjacent one.
+     */
+    previousTabBar(current: TabBar<Widget> | undefined = this.currentTabBar): TabBar<Widget> | undefined {
+        const bars = toArray(this.mainPanel.tabBars());
+        const len = bars.length;
+        const ci = ArrayExt.firstIndexOf(bars, current);
+        if (ci > 0) {
+            return bars[ci - 1];
+        } else if (ci === 0) {
+            return bars[len - 1];
+        } else {
+            return current;
+        }
+    }
+
+    /**
+     * Test whether the current widget is dirty.
+     */
+    canSave(): boolean {
+        return this.saveResourceService.canSave(this.currentWidget);
+    }
+
+    /**
+     * Save the current widget if it is dirty.
+     */
+    async save(options?: SaveOptions): Promise<void> {
+        await this.saveResourceService.save(this.currentWidget, options);
+    }
+
+    /**
+     * Test whether there is a dirty widget.
+     */
+    canSaveAll(): boolean {
+        return this.tracker.widgets.some(widget => this.saveResourceService.canSave(widget));
+    }
+
+    /**
+     * Save all dirty widgets.
+     */
+    async saveAll(options?: SaveOptions): Promise<void> {
+        for (const widget of this.widgets) {
+            if (this.saveResourceService.canSaveNotSaveAs(widget)) {
+                await this.saveResourceService.save(widget, options);
+            }
+        }
+    }
+
+    /**
+     * Returns a snapshot of all tracked widgets to allow async modifications.
+     */
+    get widgets(): ReadonlyArray<Widget> {
+        return [...this.tracker.widgets];
+    }
+
+    getWidgetById(id: string): Widget | undefined {
+        for (const widget of this.tracker.widgets) {
+            if (widget.id === id) {
+                return widget;
+            }
+        }
+        return undefined;
+    }
+
+    canToggleMaximized(widget: Widget | undefined = this.currentWidget): boolean {
+        const area = widget && this.getAreaFor(widget);
+        return area === 'main' || area === 'bottom';
+    }
+
+    toggleMaximized(widget: Widget | undefined = this.currentWidget): void {
+        const area = widget && this.getAreaPanelFor(widget);
+        if (area instanceof TheiaDockPanel && (area === this.mainPanel || area === this.bottomPanel)) {
+            area.toggleMaximized();
+            this.revealWidget(widget!.id);
+        }
+    }
+
+}
+
+/**
+ * The namespace for `ApplicationShell` class statics.
+ */
+export namespace ApplicationShell {
+    /**
+     * The areas of the application shell where widgets can reside.
+     */
+    export type Area = 'main' | 'top' | 'left' | 'right' | 'bottom' | 'secondaryWindow';
+
+    export const areaLabels: Record<Area, string> = {
+        main: nls.localizeByDefault('Main'),
+        top: nls.localizeByDefault('Top'),
+        left: nls.localizeByDefault('Left'),
+        right: nls.localizeByDefault('Right'),
+        bottom: nls.localizeByDefault('Bottom'),
+        secondaryWindow: nls.localize('theia/shell-area/secondary', 'Secondary Window'),
+    };
+
+    /**
+     * The _side areas_ are those shell areas that can be collapsed and expanded,
+     * i.e. `left`, `right`, and `bottom`.
+     */
+    export function isSideArea(area?: string): area is 'left' | 'right' | 'bottom' {
+        return area === 'left' || area === 'right' || area === 'bottom';
+    }
+
+    export function isValidArea(area?: unknown): area is ApplicationShell.Area {
+        const areas = ['main', 'top', 'left', 'right', 'bottom', 'secondaryWindow'];
+        return typeof area === 'string' && areas.includes(area);
+    }
+
+    /**
+     * General options for the application shell. These are passed on construction and can be modified
+     * through dependency injection (`ApplicationShellOptions` symbol).
+     */
+    export interface Options extends Widget.IOptions {
+        bottomPanel: BottomPanelOptions;
+        leftPanel: SidePanel.Options;
+        rightPanel: SidePanel.Options;
+    }
+
+    export interface BottomPanelOptions extends SidePanel.Options {
+    }
+
+    /**
+     * The default values for application shell options.
+     */
+    export const DEFAULT_OPTIONS = Object.freeze(<Options>{
+        bottomPanel: Object.freeze(<BottomPanelOptions>{
+            emptySize: 140,
+            expandThreshold: 160,
+            expandDuration: 0,
+            initialSizeRatio: 0.382
+        }),
+        leftPanel: Object.freeze(<SidePanel.Options>{
+            emptySize: 140,
+            expandThreshold: 140,
+            expandDuration: 0,
+            initialSizeRatio: 0.191
+        }),
+        rightPanel: Object.freeze(<SidePanel.Options>{
+            emptySize: 140,
+            expandThreshold: 140,
+            expandDuration: 0,
+            initialSizeRatio: 0.191
+        })
+    });
+
+    /**
+     * Whether a widget should be opened to the side tab bar relatively to the reference widget.
+     */
+    export type OpenToSideMode = 'open-to-left' | 'open-to-right';
+
+    export function isOpenToSideMode(mode: unknown): mode is OpenToSideMode {
+        return mode === 'open-to-left' || mode === 'open-to-right';
+    }
+
+    /**
+     * Options for adding a widget to the application shell.
+     */
+    export interface WidgetOptions extends SidePanel.WidgetOptions {
+        /**
+         * The area of the application shell where the widget will reside.
+         */
+        area?: Area;
+        /**
+         * The insertion mode for adding the widget.
+         *
+         * The default is `'tab-after'`.
+         */
+        mode?: DockLayout.InsertMode | OpenToSideMode
+        /**
+         * The reference widget for the insert location.
+         *
+         * The default is `undefined`.
+         */
+        ref?: Widget;
+    }
+
+    export interface CloseOptions {
+        /**
+         * if optional then a user will be prompted
+         * if undefined then close will be canceled
+         * if true then will be saved on close
+         * if false then won't be saved on close
+         */
+        save?: boolean | undefined
+    }
+
+    /**
+     * Data to save and load the application shell layout.
+     */
+    export interface LayoutData {
+        version?: string | ApplicationShellLayoutVersion,
+        mainPanel?: DockPanel.ILayoutConfig;
+        mainPanelPinned?: boolean[];
+        bottomPanel?: BottomPanelLayoutData;
+        leftPanel?: SidePanel.LayoutData;
+        rightPanel?: SidePanel.LayoutData;
+        activeWidgetId?: string;
+    }
+
+    /**
+     * Data to save and load the bottom panel layout.
+     */
+    export interface BottomPanelLayoutData {
+        config?: DockPanel.ILayoutConfig;
+        size?: number;
+        expanded?: boolean;
+        pinned?: boolean[];
+    }
+
+    /**
+     * Exposes widgets which activation state should be tracked by shell.
+     */
+    export interface TrackableWidgetProvider {
+        getTrackableWidgets(): Widget[]
+        readonly onDidChangeTrackableWidgets?: CommonEvent<Widget[]>
+        /**
+         * Make visible and focus a trackable widget for the given id.
+         * If not implemented then `activate` request will be sent to a child widget directly.
+         */
+        activateWidget?(id: string): Widget | undefined;
+        /**
+         * Make visible a trackable widget for the given id.
+         * If not implemented then a widget should be always visible when an owner is visible.
+         */
+        revealWidget?(id: string): Widget | undefined;
+    }
+
+    export namespace TrackableWidgetProvider {
+        export function is(widget: unknown): widget is TrackableWidgetProvider {
+            return isObject(widget) && 'getTrackableWidgets' in widget;
+        }
+    }
+
+}