@theia/core 1.45.1 → 1.46.0-next.137

package/src/browser/browser.ts

@@ -18,6 +18,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { environment } from '../common';
+
 const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : '';
 
 export const isIE = (userAgent.indexOf('Trident') >= 0);
@@ -31,7 +33,10 @@ export const isChrome = (userAgent.indexOf('Chrome') >= 0);
 export const isSafari = (userAgent.indexOf('Chrome') === -1) && (userAgent.indexOf('Safari') >= 0);
 export const isIPad = (userAgent.indexOf('iPad') >= 0);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isNative = typeof (window as any).process !== 'undefined';
+/**
+ * @deprecated us Environment.electron.is
+ */
+export const isNative = environment.electron.is();
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const isBasicWasmSupported = typeof (window as any).WebAssembly !== 'undefined';
 

package/src/browser/color-application-contribution.ts

@@ -22,6 +22,7 @@ import { FrontendApplicationContribution } from './frontend-application-contribu
 import { ContributionProvider } from '../common/contribution-provider';
 import { Disposable, DisposableCollection } from '../common/disposable';
 import { DEFAULT_BACKGROUND_COLOR_STORAGE_KEY } from './frontend-application-config-provider';
+import { SecondaryWindowHandler } from './secondary-window-handler';
 
 export const ColorContribution = Symbol('ColorContribution');
 export interface ColorContribution {
@@ -43,6 +44,9 @@ export class ColorApplicationContribution implements FrontendApplicationContribu
 
     @inject(ThemeService) protected readonly themeService: ThemeService;
 
+    @inject(SecondaryWindowHandler)
+    protected readonly secondaryWindowHandler: SecondaryWindowHandler;
+
     onStart(): void {
         for (const contribution of this.colorContributions.getContributions()) {
             contribution.registerColors(this.colors);
@@ -55,13 +59,18 @@ export class ColorApplicationContribution implements FrontendApplicationContribu
         this.colors.onDidChange(() => this.update());
 
         this.registerWindow(window);
+        this.secondaryWindowHandler.onWillAddWidget(([widget, window]) => {
+            this.registerWindow(window);
+        });
+        this.secondaryWindowHandler.onWillRemoveWidget(([widget, window]) => {
+            this.windows.delete(window);
+        });
     }
 
-    registerWindow(win: Window): Disposable {
+    registerWindow(win: Window): void {
         this.windows.add(win);
         this.updateWindow(win);
         this.onDidChangeEmitter.fire();
-        return Disposable.create(() => this.windows.delete(win));
     }
 
     protected readonly toUpdate = new DisposableCollection();

package/src/browser/command-open-handler.ts

@@ -41,7 +41,7 @@ export class CommandOpenHandler implements OpenHandler {
             try {
                 args = JSON.parse(uri.query);
             } catch {
-                // ignore error
+                args = uri.query;
             }
         }
         if (!Array.isArray(args)) {

package/src/browser/common-frontend-contribution.ts

@@ -280,6 +280,15 @@ export namespace CommonCommands {
         category: VIEW_CATEGORY,
         label: 'Toggle Menu Bar'
     });
+    /**
+     * Command Parameters:
+     * - `fileName`: string
+     * - `directory`: URI
+     */
+    export const NEW_FILE = Command.toDefaultLocalizedCommand({
+        id: 'workbench.action.files.newFile',
+        category: FILE_CATEGORY
+    });
     export const NEW_UNTITLED_TEXT_FILE = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.files.newUntitledTextFile',
         category: FILE_CATEGORY,
@@ -351,12 +360,12 @@ export namespace CommonCommands {
     });
 }
 
-export const supportCut = browser.isNative || document.queryCommandSupported('cut');
-export const supportCopy = browser.isNative || document.queryCommandSupported('copy');
+export const supportCut = environment.electron.is() || document.queryCommandSupported('cut');
+export const supportCopy = environment.electron.is() || document.queryCommandSupported('copy');
 // Chrome incorrectly returns true for document.queryCommandSupported('paste')
 // when the paste feature is available but the calling script has insufficient
 // privileges to actually perform the action
-export const supportPaste = browser.isNative || (!browser.isChrome && document.queryCommandSupported('paste'));
+export const supportPaste = environment.electron.is() || (!browser.isChrome && document.queryCommandSupported('paste'));
 
 export const RECENT_COMMANDS_STORAGE_KEY = 'commands';
 
@@ -1424,6 +1433,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         const items: QuickPickItemOrSeparator[] = [
             {
                 label: nls.localizeByDefault('New Text File'),
+                description: nls.localizeByDefault('Built-in'),
                 execute: async () => this.commandRegistry.executeCommand(CommonCommands.NEW_UNTITLED_TEXT_FILE.id)
             },
             ...newFileContributions.children
@@ -1446,10 +1456,43 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
 
                 })
         ];
+
+        const CREATE_NEW_FILE_ITEM_ID = 'create-new-file';
+        const hasNewFileHandler = this.commandRegistry.getActiveHandler(CommonCommands.NEW_FILE.id) !== undefined;
+        // Create a "Create New File" item only if there is a NEW_FILE command handler.
+        const createNewFileItem: QuickPickItem & { value?: string } | undefined = hasNewFileHandler ? {
+            id: CREATE_NEW_FILE_ITEM_ID,
+            label: nls.localizeByDefault('Create New File ({0})'),
+            description: nls.localizeByDefault('Built-in'),
+            execute: async () => {
+                if (createNewFileItem?.value) {
+                    const parent = await this.workingDirProvider.getUserWorkingDir();
+                    // Exec NEW_FILE command with the file name and parent dir as arguments
+                    return this.commandRegistry.executeCommand(CommonCommands.NEW_FILE.id, createNewFileItem.value, parent);
+                }
+            }
+        } : undefined;
+
         this.quickInputService.showQuickPick(items, {
             title: nls.localizeByDefault('New File...'),
             placeholder: nls.localizeByDefault('Select File Type or Enter File Name...'),
-            canSelectMany: false
+            canSelectMany: false,
+            onDidChangeValue: picker => {
+                if (createNewFileItem === undefined) {
+                    return;
+                }
+                // Dynamically show or hide the "Create New File" item based on the input value.
+                if (picker.value) {
+                    createNewFileItem.alwaysShow = true;
+                    createNewFileItem.value = picker.value;
+                    createNewFileItem.label = nls.localizeByDefault('Create New File ({0})', picker.value);
+                    picker.items = [...items, createNewFileItem];
+                } else {
+                    createNewFileItem.alwaysShow = false;
+                    createNewFileItem.value = undefined;
+                    picker.items = items.filter(item => item !== createNewFileItem);
+                }
+            }
         });
     }
 

package/src/browser/context-key-service.ts

@@ -15,7 +15,6 @@
 // *****************************************************************************
 
 import { injectable } from 'inversify';
-import { Disposable } from '../common';
 import { Emitter, Event } from '../common/event';
 
 export type ContextKeyValue = null | undefined | boolean | number | string
@@ -43,7 +42,7 @@ export interface ContextKeyChangeEvent {
 
 export const ContextKeyService = Symbol('ContextKeyService');
 
-export interface ContextMatcher extends Disposable {
+export interface ContextMatcher {
     /**
      * Whether the expression is satisfied. If `context` provided, the service will attempt to retrieve a context object associated with that element.
      */

package/src/browser/context-menu-renderer.ts

@@ -26,10 +26,6 @@ export const Coordinate = Symbol('Coordinate');
 
 export type Anchor = MouseEvent | Coordinate;
 
-export function toAnchor(anchor: HTMLElement | Coordinate): Anchor {
-    return anchor instanceof HTMLElement ? { x: anchor.offsetLeft, y: anchor.offsetTop } : anchor;
-}
-
 export function coordinateFromAnchor(anchor: Anchor): Coordinate {
     const { x, y } = anchor instanceof MouseEvent ? { x: anchor.clientX, y: anchor.clientY } : anchor;
     return { x, y };

package/src/browser/core-preferences.ts

@@ -200,6 +200,11 @@ export const corePreferenceSchema: PreferenceSchema = {
             'description': nls.localizeByDefault('Controls whether an editor is revealed in any of the visible groups if opened. If disabled, an editor will prefer to open in the currently active editor group. If enabled, an already opened editor will be revealed instead of opened again in the currently active editor group. Note that there are some cases where this setting is ignored, such as when forcing an editor to open in a specific group or to the side of the currently active group.'),
             'default': false
         },
+        'workbench.editor.decorations.badges': {
+            'type': 'boolean',
+            'description': nls.localizeByDefault('Controls whether editor file decorations should use badges.'),
+            'default': true
+        },
         'workbench.commandPalette.history': {
             type: 'number',
             default: 50,
@@ -295,6 +300,7 @@ export interface CoreConfiguration {
     'workbench.editor.mouseBackForwardToNavigate': boolean;
     'workbench.editor.closeOnFileDelete': boolean;
     'workbench.editor.revealIfOpen': boolean;
+    'workbench.editor.decorations.badges': boolean;
     'workbench.colorTheme': string;
     'workbench.iconTheme': string;
     'workbench.silentNotifications': boolean;

package/src/browser/decorations-service.ts

@@ -78,7 +78,7 @@ class DecorationProviderWrapper {
                 this.data.clear();
             } else {
                 for (const uri of uris) {
-                    this.fetchData(new URI(uri.toString()));
+                    this.fetchData(uri);
                     const decoration = await provider.provideDecorations(uri, CancellationToken.None);
                     if (decoration) {
                         this.decorations.set(uri.toString(), decoration);
@@ -131,14 +131,14 @@ class DecorationProviderWrapper {
     private fetchData(uri: URI): Decoration | undefined {
 
         // check for pending request and cancel it
-        const pendingRequest = this.data.get(new URI(uri.toString()));
+        const pendingRequest = this.data.get(uri);
         if (pendingRequest instanceof DecorationDataRequest) {
             pendingRequest.source.cancel();
             this.data.delete(uri);
         }
 
         const source = new CancellationTokenSource();
-        const dataOrThenable = this.provider.provideDecorations(new URI(uri.toString()), source.token);
+        const dataOrThenable = this.provider.provideDecorations(uri, source.token);
         if (!isThenable<Decoration | Promise<Decoration | undefined> | undefined>(dataOrThenable)) {
             // sync -> we have a result now
             return this.keepItem(uri, dataOrThenable);
@@ -197,7 +197,7 @@ export class DecorationsServiceImpl implements DecorationsService {
         const data: Decoration[] = [];
         let containsChildren: boolean = false;
         for (const wrapper of this.data) {
-            wrapper.getOrRetrieve(new URI(uri.toString()), includeChildren, (deco, isChild) => {
+            wrapper.getOrRetrieve(uri, includeChildren, (deco, isChild) => {
                 if (!isChild || deco.bubble) {
                     data.push(deco);
                     containsChildren = isChild || containsChildren;

package/src/browser/frontend-application-module.ts

@@ -139,6 +139,7 @@ import { bindCommonStylingParticipants } from './common-styling-participants';
 import { HoverService } from './hover-service';
 import { AdditionalViewsMenuWidget, AdditionalViewsMenuWidgetFactory } from './shell/additional-views-menu-widget';
 import { LanguageIconLabelProvider } from './language-icon-provider';
+import { bindTreePreferences } from './tree';
 
 export { bindResourceProvider, bindMessageService, bindPreferenceService };
 
@@ -199,7 +200,9 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
         const commandService = container.get<CommandService>(CommandService);
         const corePreferences = container.get<CorePreferences>(CorePreferences);
         const hoverService = container.get(HoverService);
-        return new TabBarRenderer(contextMenuRenderer, tabBarDecoratorService, iconThemeService, selectionService, commandService, corePreferences, hoverService);
+        const contextKeyService: ContextKeyService = container.get(ContextKeyService);
+        return new TabBarRenderer(contextMenuRenderer, tabBarDecoratorService, iconThemeService,
+            selectionService, commandService, corePreferences, hoverService, contextKeyService);
     });
     bind(TheiaDockPanel.Factory).toFactory(({ container }) => (options?: DockPanel.IOptions) => {
         const corePreferences = container.get<CorePreferences>(CorePreferences);
@@ -346,7 +349,6 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     });
     bind(FrontendConnectionStatusService).toSelf().inSingletonScope();
     bind(ConnectionStatusService).toService(FrontendConnectionStatusService);
-    bind(FrontendApplicationContribution).toService(FrontendConnectionStatusService);
     bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(ApplicationConnectionStatusContribution);
 
@@ -366,6 +368,7 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     bind(ThemeService).toSelf().inSingletonScope();
 
     bindCorePreferences(bind);
+    bindTreePreferences(bind);
 
     bind(MimeService).toSelf().inSingletonScope();
 

package/src/browser/icon-registry.ts

@@ -19,6 +19,7 @@
  *--------------------------------------------------------------------------------------------*/
 // code copied and modified from https://github.com/Microsoft/vscode/blob/main/src/vs/platform/theme/common/iconRegistry.ts
 
+import { ThemeIcon } from '../common/theme';
 import { URI } from 'vscode-uri';
 
 export interface IconDefinition {
@@ -48,16 +49,6 @@ export interface IconFontSource {
     readonly location: URI;
     readonly format: string;
 }
-
-export interface ThemeIcon {
-    readonly id: string;
-    readonly color?: ThemeColor;
-}
-
-export interface ThemeColor {
-    id: string;
-}
-
 export const IconRegistry = Symbol('IconRegistry');
 export interface IconRegistry {
     /**

package/src/browser/keybinding.ts

@@ -497,6 +497,9 @@ export class KeybindingRegistry {
 
     isEnabledInScope(binding: common.Keybinding, target: HTMLElement | undefined): boolean {
         const context = binding.context && this.contexts[binding.context];
+        if (binding.command && (!this.isPseudoCommand(binding.command) && !this.commandRegistry.isEnabled(binding.command, binding.args))) {
+            return false;
+        }
         if (context && !context.isEnabled(binding)) {
             return false;
         }

package/src/browser/markdown-rendering/markdown-renderer.ts

@@ -24,7 +24,7 @@ import { codicon } from '../widgets';
 
 // #region Copied from Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/base/browser/formattedTextRenderer.ts
 export interface ContentActionHandler {
-    callback: (content: string, event?: MouseEvent) => void;
+    callback: (content: string, event?: MouseEvent | KeyboardEvent) => void;
     readonly disposables: DisposableGroup;
 }
 

package/src/browser/menu/browser-context-menu-renderer.ts

@@ -40,7 +40,8 @@ export class BrowserContextMenuRenderer extends ContextMenuRenderer {
         if (onHide) {
             contextMenu.aboutToClose.connect(() => onHide!());
         }
-        contextMenu.open(x, y);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        contextMenu.open(x, y, undefined, context);
         return new BrowserContextMenuAccess(contextMenu);
     }
 

package/src/browser/menu/browser-menu-plugin.ts

@@ -267,14 +267,14 @@ export class DynamicMenuWidget extends MenuWidget {
         });
     }
 
-    public override open(x: number, y: number, options?: MenuWidget.IOpenOptions): void {
+    public override open(x: number, y: number, options?: MenuWidget.IOpenOptions, anchor?: HTMLElement): void {
         const cb = () => {
             this.restoreFocusedElement();
             this.aboutToClose.disconnect(cb);
         };
         this.aboutToClose.connect(cb);
         this.preserveFocusedElement();
-        super.open(x, y, options);
+        super.open(x, y, options, anchor);
     }
 
     protected updateSubMenus(parent: MenuWidget, menu: CompoundMenuNode, commands: MenuCommandRegistry): void {

package/src/browser/save-resource-service.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { inject, injectable } from 'inversify';
-import { MessageService, UNTITLED_SCHEME } from '../common';
+import { MessageService, UNTITLED_SCHEME, URI } from '../common';
 import { Navigatable, NavigatableWidget } from './navigatable-types';
 import { Saveable, SaveableSource, SaveOptions } from './saveable';
 import { Widget } from './widgets';
@@ -41,11 +41,12 @@ export class SaveResourceService {
      *
      * No op if the widget is not saveable.
      */
-    async save(widget: Widget | undefined, options?: SaveOptions): Promise<void> {
+    async save(widget: Widget | undefined, options?: SaveOptions): Promise<URI | undefined> {
         if (this.canSaveNotSaveAs(widget)) {
             await Saveable.save(widget, options);
+            return NavigatableWidget.getUri(widget);
         } else if (this.canSaveAs(widget)) {
-            await this.saveAs(widget, options);
+            return this.saveAs(widget, options);
         }
     }
 
@@ -53,7 +54,7 @@ export class SaveResourceService {
         return false;
     }
 
-    saveAs(sourceWidget: Widget & SaveableSource & Navigatable, options?: SaveOptions): Promise<void> {
+    saveAs(sourceWidget: Widget & SaveableSource & Navigatable, options?: SaveOptions): Promise<URI | undefined> {
         return Promise.reject('Unsupported: The base SaveResourceService does not support saveAs action.');
     }
 }

package/src/browser/secondary-window-handler.ts

@@ -22,8 +22,6 @@ import { ApplicationShell } from './shell/application-shell';
 import { Emitter } from '../common/event';
 import { SecondaryWindowService } from './window/secondary-window-service';
 import { KeybindingRegistry } from './keybinding';
-import { ColorApplicationContribution } from './color-application-contribution';
-import { StylingService } from './styling-service';
 
 /** Widget to be contained directly in a secondary window. */
 class SecondaryWindowRootWidget extends Widget {
@@ -47,7 +45,6 @@ class SecondaryWindowRootWidget extends Widget {
  * This handler manages the opened secondary windows and sets up messaging between them and the Theia main window.
  * In addition, it provides access to the extracted widgets and provides notifications when widgets are added to or removed from this handler.
  *
- * @experimental The functionality provided by this handler is experimental and has known issues in Electron apps.
  */
 @injectable()
 export class SecondaryWindowHandler {
@@ -59,17 +56,19 @@ export class SecondaryWindowHandler {
     @inject(KeybindingRegistry)
     protected keybindings: KeybindingRegistry;
 
-    @inject(ColorApplicationContribution)
-    protected colorAppContribution: ColorApplicationContribution;
-
-    @inject(StylingService)
-    protected stylingService: StylingService;
+    protected readonly onWillAddWidgetEmitter = new Emitter<[Widget, Window]>();
+    /** Subscribe to get notified when a widget is added to this handler, i.e. the widget was moved to an secondary window . */
+    readonly onWillAddWidget = this.onWillAddWidgetEmitter.event;
 
-    protected readonly onDidAddWidgetEmitter = new Emitter<Widget>();
+    protected readonly onDidAddWidgetEmitter = new Emitter<[Widget, Window]>();
     /** Subscribe to get notified when a widget is added to this handler, i.e. the widget was moved to an secondary window . */
     readonly onDidAddWidget = this.onDidAddWidgetEmitter.event;
 
-    protected readonly onDidRemoveWidgetEmitter = new Emitter<Widget>();
+    protected readonly onWillRemoveWidgetEmitter = new Emitter<[Widget, Window]>();
+    /** Subscribe to get notified when a widget is removed from this handler, i.e. the widget's window was closed or the widget was disposed. */
+    readonly onWillRemoveWidget = this.onWillRemoveWidgetEmitter.event;
+
+    protected readonly onDidRemoveWidgetEmitter = new Emitter<[Widget, Window]>();
     /** Subscribe to get notified when a widget is removed from this handler, i.e. the widget's window was closed or the widget was disposed. */
     readonly onDidRemoveWidget = this.onDidRemoveWidgetEmitter.event;
 
@@ -122,7 +121,8 @@ export class SecondaryWindowHandler {
         }
 
         const mainWindowTitle = document.title;
-        newWindow.onload = () => {
+
+        newWindow.addEventListener('load', () => {
             this.keybindings.registerEventListeners(newWindow);
             // Use the widget's title as the window title
             // Even if the widget's label were malicious, this should be safe against XSS because the HTML standard defines this is inserted via a text node.
@@ -134,8 +134,8 @@ export class SecondaryWindowHandler {
                 console.error('Could not find dom element to attach to in secondary window');
                 return;
             }
-            const unregisterWithColorContribution = this.colorAppContribution.registerWindow(newWindow);
-            const unregisterWithStylingService = this.stylingService.registerWindow(newWindow);
+
+            this.onWillAddWidgetEmitter.fire([widget, newWindow]);
 
             widget.secondaryWindow = newWindow;
             const rootWidget = new SecondaryWindowRootWidget();
@@ -145,13 +145,12 @@ export class SecondaryWindowHandler {
             widget.show();
             widget.update();
 
-            this.addWidget(widget);
+            this.addWidget(widget, newWindow);
 
             // Close the window if the widget is disposed, e.g. by a command closing all widgets.
             widget.disposed.connect(() => {
-                unregisterWithColorContribution.dispose();
-                unregisterWithStylingService.dispose();
-                this.removeWidget(widget);
+                this.onWillRemoveWidgetEmitter.fire([widget, newWindow]);
+                this.removeWidget(widget, newWindow);
                 if (!newWindow.closed) {
                     newWindow.close();
                 }
@@ -165,7 +164,7 @@ export class SecondaryWindowHandler {
                 updateWidget();
             });
             widget.activate();
-        };
+        });
     }
 
     /**
@@ -195,18 +194,18 @@ export class SecondaryWindowHandler {
         return undefined;
     }
 
-    protected addWidget(widget: ExtractableWidget): void {
+    protected addWidget(widget: ExtractableWidget, win: Window): void {
         if (!this._widgets.includes(widget)) {
             this._widgets.push(widget);
-            this.onDidAddWidgetEmitter.fire(widget);
+            this.onDidAddWidgetEmitter.fire([widget, win]);
         }
     }
 
-    protected removeWidget(widget: ExtractableWidget): void {
+    protected removeWidget(widget: ExtractableWidget, win: Window): void {
         const index = this._widgets.indexOf(widget);
         if (index > -1) {
             this._widgets.splice(index, 1);
-            this.onDidRemoveWidgetEmitter.fire(widget);
+            this.onDidRemoveWidgetEmitter.fire([widget, win]);
         }
     }
 }

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

@@ -44,6 +44,7 @@ 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';
@@ -132,16 +133,19 @@ export class DockPanelRenderer implements DockLayout.IRenderer {
             getDynamicTabOptions());
         this.tabBarClasses.forEach(c => tabBar.addClass(c));
         renderer.tabBar = tabBar;
-        tabBar.disposed.connect(() => renderer.dispose());
         renderer.contextMenuPath = SHELL_TABBAR_CONTEXT_MENU;
         tabBar.currentChanged.connect(this.onCurrentTabChanged, this);
-        this.corePreferences.onPreferenceChanged(change => {
+        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;
     }
@@ -270,6 +274,7 @@ export class ApplicationShell extends Widget {
         @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);
 
@@ -335,8 +340,8 @@ export class ApplicationShell extends 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.secondaryWindowHandler.onDidAddWidget(([widget, window]) => this.fireDidAddWidget(widget));
+        this.secondaryWindowHandler.onDidRemoveWidget(([widget, window]) => this.fireDidRemoveWidget(widget));
 
         this.layout = this.createLayout();
 
@@ -1229,7 +1234,9 @@ export class ApplicationShell extends Widget {
         Saveable.apply(
             widget,
             () => this.widgets.filter((maybeSaveable): maybeSaveable is Widget & SaveableSource => !!Saveable.get(maybeSaveable)),
-            (toSave, options) => this.saveResourceService.save(toSave, options),
+            async (toSave, options) => {
+                await this.saveResourceService.save(toSave, options);
+            },
         );
         if (ApplicationShell.TrackableWidgetProvider.is(widget)) {
             for (const toTrack of widget.getTrackableWidgets()) {
@@ -1318,20 +1325,23 @@ export class ApplicationShell extends Widget {
         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;
+        if (!widget) {
+            widget = find(this.bottomPanel.widgets(), w => w.id === id);
+            if (widget) {
+                this.expandBottomPanel();
+                this.bottomPanel.activateWidget(widget);
+            }
         }
-        widget = this.leftPanelHandler.activate(id);
-        if (widget) {
-            return widget;
+        if (!widget) {
+            widget = this.leftPanelHandler.activate(id);
+        }
+
+        if (!widget) {
+            widget = this.rightPanelHandler.activate(id);
         }
-        widget = this.rightPanelHandler.activate(id);
         if (widget) {
+            this.windowService.focus();
             return widget;
         }
         return this.secondaryWindowHandler.activateWidget(id);
@@ -1428,17 +1438,19 @@ export class ApplicationShell extends Widget {
             if (tabBar) {
                 tabBar.currentTitle = widget.title;
             }
-            return widget;
         }
-        widget = this.leftPanelHandler.expand(id);
-        if (widget) {
-            return widget;
+        if (!widget) {
+            widget = this.leftPanelHandler.expand(id);
+        }
+        if (!widget) {
+            widget = this.rightPanelHandler.expand(id);
         }
-        widget = this.rightPanelHandler.expand(id);
         if (widget) {
+            this.windowService.focus();
             return widget;
+        } else {
+            return this.secondaryWindowHandler.revealWidget(id);
         }
-        return this.secondaryWindowHandler.revealWidget(id);
     }
 
     /**