@theia/core 1.18.0 → 1.21.0-next.12

package/lib/electron-common/messaging/electron-messages.d.ts

@@ -0,0 +1,20 @@
+/********************************************************************************
+ * Copyright (C) 2021 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export declare const RequestTitleBarStyle = "requestTitleBarStyle";
+export declare const TitleBarStyleChanged = "titleBarStyleChanged";
+export declare const TitleBarStyleAtStartup = "titleBarStyleAtStartup";
+export declare const Restart = "restart";
+//# sourceMappingURL=electron-messages.d.ts.map

package/lib/electron-common/messaging/electron-messages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"electron-messages.d.ts","sourceRoot":"","sources":["../../../src/electron-common/messaging/electron-messages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAC/D,eAAO,MAAM,OAAO,YAAY,CAAC"}

package/lib/electron-common/messaging/electron-messages.js

@@ -0,0 +1,23 @@
+"use strict";
+/********************************************************************************
+ * Copyright (C) 2021 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Restart = exports.TitleBarStyleAtStartup = exports.TitleBarStyleChanged = exports.RequestTitleBarStyle = void 0;
+exports.RequestTitleBarStyle = 'requestTitleBarStyle';
+exports.TitleBarStyleChanged = 'titleBarStyleChanged';
+exports.TitleBarStyleAtStartup = 'titleBarStyleAtStartup';
+exports.Restart = 'restart';
+//# sourceMappingURL=electron-messages.js.map

package/lib/electron-common/messaging/electron-messages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"electron-messages.js","sourceRoot":"","sources":["../../../src/electron-common/messaging/electron-messages.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAErE,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,sBAAsB,GAAG,wBAAwB,CAAC;AAClD,QAAA,OAAO,GAAG,SAAS,CAAC"}

package/lib/electron-main/electron-main-application.d.ts

@@ -30,6 +30,12 @@ import Storage = require('electron-store');
 export interface TheiaBrowserWindowOptions extends BrowserWindowConstructorOptions {
     isMaximized?: boolean;
     isFullScreen?: boolean;
+    /**
+     * Represents the complete screen layout for all available displays.
+     * This field is used to determine if the layout was updated since the electron window was last opened,
+     * in which case we want to invalidate the stored options and use the default options instead.
+     */
+    screenLayout?: string;
 }
 /**
  * Options passed to the main/default command handler.
@@ -116,8 +122,12 @@ export declare class ElectronMainApplication {
     protected readonly _backendPort: Deferred<number>;
     readonly backendPort: Promise<number>;
     protected _config: FrontendApplicationConfig | undefined;
+    protected useNativeWindowFrame: boolean;
+    protected didUseNativeWindowFrameOnStart: Map<number, boolean>;
+    protected restarting: boolean;
     get config(): FrontendApplicationConfig;
     start(config: FrontendApplicationConfig): Promise<void>;
+    protected getTitleBarStyle(config: FrontendApplicationConfig): 'native' | 'custom';
     protected launch(params: ElectronMainExecutionParams): Promise<void>;
     /**
      * Use this rather than creating `BrowserWindow` instances from scratch, since some security parameters need to be set, this method will do it.
@@ -145,6 +155,11 @@ export declare class ElectronMainApplication {
      * Save the window geometry state on every change.
      */
     protected attachSaveWindowState(electronWindow: BrowserWindow): void;
+    protected saveWindowState(electronWindow: BrowserWindow): void;
+    /**
+     * Return a string unique to the current display layout.
+     */
+    protected getCurrentScreenLayout(): string;
     /**
      * Catch certain keybindings to prevent reloading the window using keyboard shortcuts.
      */
@@ -162,6 +177,7 @@ export declare class ElectronMainApplication {
     protected onWillQuit(event: ElectronEvent): void;
     protected onSecondInstance(event: ElectronEvent, argv: string[], cwd: string): Promise<void>;
     protected onWindowAllClosed(event: ElectronEvent): void;
+    protected restart(id: number): void;
     protected startContributions(): Promise<void>;
     protected stopContributions(): void;
 }

package/lib/electron-main/electron-main-application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-application.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-main-application.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":"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"}

package/lib/electron-main/electron-main-application.js

@@ -36,8 +36,9 @@ const contribution_provider_1 = require("../common/contribution-provider");
 const electron_security_token_service_1 = require("./electron-security-token-service");
 const electron_token_1 = require("../electron-common/electron-token");
 const Storage = require("electron-store");
-// eslint-disable-next-line @theia/runtime-import-check
-const window_service_1 = require("../browser/window/window-service");
+const common_1 = require("../common");
+const electron_messages_1 = require("../electron-common/messaging/electron-messages");
+const window_1 = require("../common/window");
 const createYargs = require('yargs/yargs');
 exports.ElectronMainApplicationGlobals = Symbol('ElectronMainApplicationGlobals');
 /**
@@ -100,6 +101,9 @@ let ElectronMainApplication = class ElectronMainApplication {
         this.electronStore = new Storage();
         this._backendPort = new promise_util_1.Deferred();
         this.backendPort = this._backendPort.promise;
+        this.useNativeWindowFrame = true;
+        this.didUseNativeWindowFrameOnStart = new Map();
+        this.restarting = false;
     }
     get config() {
         if (!this._config) {
@@ -108,6 +112,7 @@ let ElectronMainApplication = class ElectronMainApplication {
         return this._config;
     }
     async start(config) {
+        this.useNativeWindowFrame = this.getTitleBarStyle(config) === 'native';
         this._config = config;
         this.hookApplicationEvents();
         const port = await this.startBackend();
@@ -121,6 +126,23 @@ let ElectronMainApplication = class ElectronMainApplication {
             cwd: process.cwd()
         });
     }
+    getTitleBarStyle(config) {
+        var _a;
+        if (common_1.isOSX) {
+            return 'native';
+        }
+        const storedFrame = (_a = this.electronStore.get('windowstate')) === null || _a === void 0 ? void 0 : _a.frame;
+        if (storedFrame !== undefined) {
+            return !!storedFrame ? 'native' : 'custom';
+        }
+        if (config.preferences && config.preferences['window.titleBarStyle']) {
+            const titleBarStyle = config.preferences['window.titleBarStyle'];
+            if (titleBarStyle === 'native' || titleBarStyle === 'custom') {
+                return titleBarStyle;
+            }
+        }
+        return common_1.isWindows ? 'custom' : 'native';
+    }
     async launch(params) {
         createYargs(params.argv, params.cwd)
             .command('$0 [file]', false, cmd => cmd
@@ -143,8 +165,11 @@ let ElectronMainApplication = class ElectronMainApplication {
         return electronWindow;
     }
     async getLastWindowOptions() {
-        const windowState = this.electronStore.get('windowstate') || this.getDefaultTheiaWindowOptions();
-        return Object.assign(Object.assign({}, windowState), this.getDefaultOptions());
+        const previousWindowState = this.electronStore.get('windowstate');
+        const windowState = (previousWindowState === null || previousWindowState === void 0 ? void 0 : previousWindowState.screenLayout) === this.getCurrentScreenLayout()
+            ? previousWindowState
+            : this.getDefaultTheiaWindowOptions();
+        return Object.assign(Object.assign({ frame: this.useNativeWindowFrame }, this.getDefaultOptions()), windowState);
     }
     avoidOverlap(options) {
         const existingWindowsBounds = electron_1.BrowserWindow.getAllWindows().map(window => window.getBounds());
@@ -172,7 +197,7 @@ let ElectronMainApplication = class ElectronMainApplication {
     }
     async openDefaultWindow() {
         const [uri, electronWindow] = await Promise.all([this.createWindowUri(), this.createWindow()]);
-        electronWindow.loadURL(uri.withFragment(window_service_1.DEFAULT_WINDOW_HASH).toString(true));
+        electronWindow.loadURL(uri.withFragment(window_1.DEFAULT_WINDOW_HASH).toString(true));
         return electronWindow;
     }
     async openWindowWithWorkspace(workspacePath) {
@@ -224,7 +249,7 @@ let ElectronMainApplication = class ElectronMainApplication {
         const width = Math.round(bounds.width * (2 / 3));
         const y = Math.round(bounds.y + (bounds.height - height) / 2);
         const x = Math.round(bounds.x + (bounds.width - width) / 2);
-        return Object.assign({ isFullScreen: false, isMaximized: false, width,
+        return Object.assign({ frame: this.useNativeWindowFrame, isFullScreen: false, isMaximized: false, width,
             height,
             x,
             y }, this.getDefaultOptions());
@@ -239,32 +264,48 @@ let ElectronMainApplication = class ElectronMainApplication {
      * Save the window geometry state on every change.
      */
     attachSaveWindowState(electronWindow) {
-        const saveWindowState = () => {
-            try {
-                const bounds = electronWindow.getBounds();
-                this.electronStore.set('windowstate', {
-                    isFullScreen: electronWindow.isFullScreen(),
-                    isMaximized: electronWindow.isMaximized(),
-                    width: bounds.width,
-                    height: bounds.height,
-                    x: bounds.x,
-                    y: bounds.y
-                });
-            }
-            catch (e) {
-                console.error('Error while saving window state:', e);
-            }
-        };
         let delayedSaveTimeout;
         const saveWindowStateDelayed = () => {
             if (delayedSaveTimeout) {
                 clearTimeout(delayedSaveTimeout);
             }
-            delayedSaveTimeout = setTimeout(saveWindowState, 1000);
+            delayedSaveTimeout = setTimeout(() => this.saveWindowState(electronWindow), 1000);
         };
-        electronWindow.on('close', saveWindowState);
+        electronWindow.on('close', () => {
+            this.saveWindowState(electronWindow);
+            this.didUseNativeWindowFrameOnStart.delete(electronWindow.id);
+        });
         electronWindow.on('resize', saveWindowStateDelayed);
         electronWindow.on('move', saveWindowStateDelayed);
+        this.didUseNativeWindowFrameOnStart.set(electronWindow.id, this.useNativeWindowFrame);
+    }
+    saveWindowState(electronWindow) {
+        // In some circumstances the `electronWindow` can be `null`
+        if (!electronWindow) {
+            return;
+        }
+        try {
+            const bounds = electronWindow.getBounds();
+            this.electronStore.set('windowstate', {
+                isFullScreen: electronWindow.isFullScreen(),
+                isMaximized: electronWindow.isMaximized(),
+                width: bounds.width,
+                height: bounds.height,
+                x: bounds.x,
+                y: bounds.y,
+                frame: this.useNativeWindowFrame,
+                screenLayout: this.getCurrentScreenLayout(),
+            });
+        }
+        catch (e) {
+            console.error('Error while saving window state:', e);
+        }
+    }
+    /**
+     * Return a string unique to the current display layout.
+     */
+    getCurrentScreenLayout() {
+        return electron_1.screen.getAllDisplays().map(display => `${display.bounds.x}:${display.bounds.y}:${display.bounds.width}:${display.bounds.height}`).sort().join('-');
     }
     /**
      * Catch certain keybindings to prevent reloading the window using keyboard shortcuts.
@@ -360,6 +401,16 @@ let ElectronMainApplication = class ElectronMainApplication {
         electron_1.app.on('will-quit', this.onWillQuit.bind(this));
         electron_1.app.on('second-instance', this.onSecondInstance.bind(this));
         electron_1.app.on('window-all-closed', this.onWindowAllClosed.bind(this));
+        electron_1.ipcMain.on(electron_messages_1.TitleBarStyleChanged, ({ sender }, titleBarStyle) => {
+            this.useNativeWindowFrame = titleBarStyle === 'native';
+            this.saveWindowState(electron_1.BrowserWindow.fromId(sender.id));
+        });
+        electron_1.ipcMain.on(electron_messages_1.Restart, ({ sender }) => {
+            this.restart(sender.id);
+        });
+        electron_1.ipcMain.on(electron_messages_1.RequestTitleBarStyle, ({ sender }) => {
+            sender.send(electron_messages_1.TitleBarStyleAtStartup, this.didUseNativeWindowFrameOnStart.get(sender.id) ? 'native' : 'custom');
+        });
     }
     onWillQuit(event) {
         this.stopContributions();
@@ -375,7 +426,22 @@ let ElectronMainApplication = class ElectronMainApplication {
         }
     }
     onWindowAllClosed(event) {
-        this.requestStop();
+        if (!this.restarting) {
+            this.requestStop();
+        }
+    }
+    restart(id) {
+        this.restarting = true;
+        const window = electron_1.BrowserWindow.fromId(id);
+        window.on('closed', async () => {
+            await this.launch({
+                secondInstance: false,
+                argv: this.processArgv.getProcessArgvWithoutBin(process.argv),
+                cwd: process.cwd()
+            });
+            this.restarting = false;
+        });
+        window.close();
     }
     async startContributions() {
         const promises = [];

package/lib/electron-main/electron-main-application.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-application.js","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,yCAAsD;AACtD,oDAA4I;AAC5I,6BAA6B;AAG7B,2BAAoC;AACpC,iDAAkD;AAGlD,+CAA2C;AAC3C,yDAAkD;AAElD,2EAAuE;AACvE,uFAAiF;AACjF,sEAA0E;AAC1E,0CAA2C;AAC3C,uDAAuD;AACvD,qEAAuE;AAEvE,MAAM,WAAW,GAA4C,OAAO,CAAC,aAAa,CAAC,CAAC;AAmCvE,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAOvF;;;;;;;;;;;;;;;;;;GAkBG;AACU,QAAA,mCAAmC,GAAG,MAAM,CAAC,qCAAqC,CAAC,CAAC;AAejG,uEAAuE;AACvE,4GAA4G;AAE5G,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAEhC,IAAc,mBAAmB;QAC7B,0DAA0D;QAC1D,qDAAqD;QACrD,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC3B,OAAO,CAAC,CAAC;SACZ;QACD,mCAAmC;QACnC,0DAA0D;QAC1D,kEAAkE;QAClE,OAAO,CAAC,CAAC;IACb,CAAC;IAED,IAAc,oBAAoB;QAC9B,0FAA0F;QAC1F,sGAAsG;QACtG,OAAO,IAAI,CAAC,aAAa,IAAI,CAAE,OAAuD,CAAC,UAAU,CAAC;IACtG,CAAC;IAED,IAAc,aAAa;QACvB,oEAAoE;QACpE,4GAA4G;QAC5G,OAAO,CAAC,CAAE,OAAuD,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACxF,CAAC;IAED,wBAAwB,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI;QACxC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,iBAAiB,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC1C,CAAC;CAEJ,CAAA;AAlCY,uBAAuB;IADnC,sBAAU,EAAE;GACA,uBAAuB,CAkCnC;AAlCY,0DAAuB;AA8CpC,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAApC;QAkBuB,kBAAa,GAAG,IAAI,OAAO,EAAE,CAAC;QAE9B,iBAAY,GAAG,IAAI,uBAAQ,EAAU,CAAC;QAChD,gBAAW,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;IAiVrD,CAAC;IA9UG,IAAI,MAAM;QACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;SAC/D;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAiC;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACvC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,cAAG,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,MAAM,IAAI,CAAC,MAAM,CAAC;YACd,cAAc,EAAE,KAAK;YACrB,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC;YAC7D,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SACrB,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,MAAM,CAAC,MAAmC;QACtD,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC;aAC/B,OAAO,CAAC,WAAW,EAAE,KAAK,EACvB,GAAG,CAAC,EAAE,CAAC,GAAG;aACL,UAAU,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAC3C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAC9D,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,YAAY,CAAC,eAAwD,IAAI,CAAC,4BAA4B,EAAE;QAC1G,IAAI,OAAO,GAAG,MAAM,YAAY,CAAC;QACjC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,cAAc,GAAG,IAAI,wBAAa,CAAC,OAAO,CAAC,CAAC;QAClD,cAAc,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QACvC,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAC3C,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAC3C,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,MAAM,WAAW,GAA0C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACxI,uCACO,WAAW,GACX,IAAI,CAAC,iBAAiB,EAAE,EAC7B;IACN,CAAC;IAES,YAAY,CAAC,OAAkC;QACrD,MAAM,qBAAqB,GAAG,wBAAa,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9F,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,OAAO,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC3F,+EAA+E;gBAC/E,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE;oBAC7C,OAAO,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;iBACjD;gBACD,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,CAAE,GAAG,EAAE,CAAC;gBAC5B,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,CAAE,GAAG,EAAE,CAAC;aAE/B;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,iBAAiB;;QACvB,uBACI,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,EAClC,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,GAAG,EACd,cAAc,EAAE;gBACZ,qDAAqD;gBACrD,eAAe,EAAE,IAAI;gBACrB,iFAAiF;gBACjF,4DAA4D;gBAC5D,uBAAuB,EAAE,KAAK;aACjC,IACE,OAAA,IAAI,CAAC,MAAM,CAAC,QAAQ,0CAAE,aAAa,KAAI,EAAE,EAC9C;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAC/F,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,oCAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7E,OAAO,cAAc,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,uBAAuB,CAAC,aAAqB;QACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClD,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAClF,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,WAAW;QACP,cAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,MAAmC,EAAE,OAAmC;QACtG,IAAI,MAAM,CAAC,cAAc,KAAK,KAAK,EAAE;YACjC,MAAM,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC,CAAC,8BAA8B;SACzE;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;YACnC,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAClC;aAAM;YACH,IAAI,aAAiC,CAAC;YACtC,IAAI;gBACA,aAAa,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;aAC7E;YAAC,WAAM;gBACJ,OAAO,CAAC,KAAK,CAAC,0CAA0C,OAAO,CAAC,IAAI,iFAAiF,CAAC,CAAC;aAC1J;YACD,IAAI,aAAa,KAAK,SAAS,EAAE;gBAC7B,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;aAClC;iBAAM;gBACH,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;aACrD;SACJ;IACL,CAAC;IAES,KAAK,CAAC,eAAe;QAC3B,OAAO,kBAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC;aACvD,SAAS,CAAC,QAAQ,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACrD,CAAC;IAES,4BAA4B;QAClC,mEAAmE;QACnE,qDAAqD;QACrD,uFAAuF;QACvF,wDAAwD;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAM,CAAC,sBAAsB,CAAC,iBAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5D,uBACI,YAAY,EAAE,KAAK,EACnB,WAAW,EAAE,KAAK,EAClB,KAAK;YACL,MAAM;YACN,CAAC;YACD,CAAC,IACE,IAAI,CAAC,iBAAiB,EAAE,EAC7B;IACN,CAAC;IAED;;OAEG;IACO,iBAAiB,CAAC,cAA6B;QACrD,cAAc,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACO,qBAAqB,CAAC,cAA6B;QACzD,MAAM,eAAe,GAAG,GAAG,EAAE;YACzB,IAAI;gBACA,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;gBAC1C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE;oBAClC,YAAY,EAAE,cAAc,CAAC,YAAY,EAAE;oBAC3C,WAAW,EAAE,cAAc,CAAC,WAAW,EAAE;oBACzC,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,CAAC,EAAE,MAAM,CAAC,CAAC;oBACX,CAAC,EAAE,MAAM,CAAC,CAAC;iBACd,CAAC,CAAC;aACN;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC,CAAC,CAAC;aACxD;QACL,CAAC,CAAC;QACF,IAAI,kBAA4C,CAAC;QACjD,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAChC,IAAI,kBAAkB,EAAE;gBACpB,YAAY,CAAC,kBAAkB,CAAC,CAAC;aACpC;YACD,kBAAkB,GAAG,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC3D,CAAC,CAAC;QACF,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC5C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QACpD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACtD,CAAC;IAED;;OAEG;IACO,qBAAqB,CAAC,cAA6B;;QACzD,UAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,0CAAE,wBAAwB,EAAE;YAChD,MAAM,YAAY,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YAC3C,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAC5B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;oBACpC,yBAAc,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;iBACnD;YACL,CAAC,CAAC,CAAC;YACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBAC3B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;oBACpC,yBAAc,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;iBAC1C;YACL,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAES,qBAAqB,CAAC,cAA6B,EAAE,OAAkC;QAC7F,IAAI,OAAO,CAAC,WAAW,EAAE;YACrB,cAAc,CAAC,QAAQ,EAAE,CAAC;SAC7B;aAAM;YACH,cAAc,CAAC,UAAU,EAAE,CAAC;SAC/B;IACL,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,YAAY;QACxB,oDAAoD;QACpD,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,wHAAwH;QACxH,+HAA+H;QAC/H,4EAA4E;QAC5E,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC;QACzE,0HAA0H;QAC1H,oGAAoG;QACpG,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC/D,IAAI,aAAa,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,sCAAqB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAChF,mHAAmH;YACnH,MAAM,OAAO,GAAgB,MAAM,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;YACjF,OAAO,OAAO,CAAC,IAAI,CAAC;SACvB;aAAM;YACH,MAAM,cAAc,GAAG,oBAAI,CACvB,IAAI,CAAC,OAAO,CAAC,uBAAuB,EACpC,IAAI,CAAC,WAAW,CAAC,wBAAwB,EAAE,EAC3C,MAAM,IAAI,CAAC,cAAc,EAAE,CAC9B,CAAC;YACF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,kGAAkG;gBAClG,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAoB,EAAE,EAAE;oBAClD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC,CAAC,CAAC;gBACH,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;oBAC/B,MAAM,CAAC,KAAK,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;gBACH,cAAG,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBAChB,8DAA8D;oBAC9D,2CAA2C;oBAC3C,IAAI,cAAc,CAAC,QAAQ,KAAK,IAAI,IAAI,cAAc,CAAC,UAAU,KAAK,IAAI,EAAE;wBACxE,IAAI;4BACA,+EAA+E;4BAC/E,yDAAyD;4BACzD,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;yBACpC;wBAAC,OAAO,KAAK,EAAE;4BACZ,+DAA+D;4BAC/D,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;gCACxB,OAAO;6BACV;4BACD,MAAM,KAAK,CAAC;yBACf;qBACJ;gBACL,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAES,KAAK,CAAC,cAAc;QAC1B,OAAO;YACH,sFAAsF;YACtF,+EAA+E;YAC/E,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;YACtC,GAAG,kCACI,OAAO,CAAC,GAAG,KACd,CAAC,sCAAqB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,GACtE;SACJ,CAAC;IACN,CAAC;IAES,KAAK,CAAC,2BAA2B,CAAC,IAAY;QACpD,MAAM,IAAI,CAAC,4BAA4B,CAAC,8BAA8B,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;IACvG,CAAC;IAES,qBAAqB;QAC3B,cAAG,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,cAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,cAAG,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,CAAC;IAES,UAAU,CAAC,KAAoB;QACrC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,KAAoB,EAAE,IAAc,EAAE,GAAW;QAC9E,MAAM,eAAe,GAAG,wBAAa,CAAC,aAAa,EAAE,CAAC;QACtD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,MAAM,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,cAAc,CAAC,WAAW,EAAE,EAAE;gBAC9B,cAAc,CAAC,OAAO,EAAE,CAAC;aAC5B;YACD,cAAc,CAAC,KAAK,EAAE,CAAC;SAC1B;IACL,CAAC;IAES,iBAAiB,CAAC,KAAoB;QAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAES,KAAK,CAAC,kBAAkB;QAC9B,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE;YAC9D,IAAI,YAAY,CAAC,OAAO,EAAE;gBACtB,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;aAC7C;SACJ;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAES,iBAAiB;QACvB,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE;YAC9D,IAAI,YAAY,CAAC,MAAM,EAAE;gBACrB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC7B;SACJ;IACL,CAAC;CAEJ,CAAA;AAlWG;IAFC,kBAAM,CAAC,4CAAoB,CAAC;IAC5B,iBAAK,CAAC,2CAAmC,CAAC;;8DACiD;AAG5F;IADC,kBAAM,CAAC,sCAA8B,CAAC;;wDACoB;AAG3D;IADC,kBAAM,CAAC,uBAAuB,CAAC;8BACT,uBAAuB;4DAAC;AAG/C;IADC,kBAAM,CAAC,8DAA4B,CAAC;8BACG,8DAA4B;6EAAC;AAGrE;IADC,kBAAM,CAAC,sCAAqB,CAAC;;sEACkC;AAhBvD,uBAAuB;IADnC,sBAAU,EAAE;GACA,uBAAuB,CAsWnC;AAtWY,0DAAuB"}
+{"version":3,"file":"electron-main-application.js","sourceRoot":"","sources":["../../src/electron-main/electron-main-application.ts"],"names":[],"mappings":"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"}

package/lib/electron-main/electron-main-window-service-impl.d.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 import { ElectronMainWindowService } from '../electron-common/electron-main-window-service';
 import { ElectronMainApplication } from './electron-main-application';
-import { NewWindowOptions } from '../browser/window/window-service';
+import { NewWindowOptions } from '../common/window';
 export declare class ElectronMainWindowServiceImpl implements ElectronMainWindowService {
     protected readonly app: ElectronMainApplication;
     openNewWindow(url: string, { external }: NewWindowOptions): undefined;

package/lib/electron-main/electron-main-window-service-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-window-service-impl.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-main-window-service-impl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,qBACa,6BAA8B,YAAW,yBAAyB;IAG3E,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,uBAAuB,CAAC;IAEhD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,GAAG,SAAS;IAWrE,oBAAoB,IAAI,IAAI;CAI/B"}
+{"version":3,"file":"electron-main-window-service-impl.d.ts","sourceRoot":"","sources":["../../src/electron-main/electron-main-window-service-impl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,qBACa,6BAA8B,YAAW,yBAAyB;IAG3E,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,uBAAuB,CAAC;IAEhD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,GAAG,SAAS;IAWrE,oBAAoB,IAAI,IAAI;CAI/B"}

package/lib/electron-main/electron-main-window-service-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-window-service-impl.js","sourceRoot":"","sources":["../../src/electron-main/electron-main-window-service-impl.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,oDAA8C;AAC9C,yCAA+C;AAE/C,2EAAsE;AAKtE,IAAa,6BAA6B,GAA1C,MAAa,6BAA6B;IAKtC,aAAa,CAAC,GAAW,EAAE,EAAE,QAAQ,EAAoB;QACrD,IAAI,QAAQ,EAAE;YACV,gBAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SAC3B;aAAM;YACH,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;gBAC1C,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;SACN;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,oBAAoB;QAChB,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;IACjC,CAAC;CAEJ,CAAA;AAjBG;IADC,kBAAM,CAAC,mDAAuB,CAAC;8BACR,mDAAuB;0DAAC;AAHvC,6BAA6B;IADzC,sBAAU,EAAE;GACA,6BAA6B,CAoBzC;AApBY,sEAA6B"}
+{"version":3,"file":"electron-main-window-service-impl.js","sourceRoot":"","sources":["../../src/electron-main/electron-main-window-service-impl.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,oDAA8C;AAC9C,yCAA+C;AAE/C,2EAAsE;AAItE,IAAa,6BAA6B,GAA1C,MAAa,6BAA6B;IAKtC,aAAa,CAAC,GAAW,EAAE,EAAE,QAAQ,EAAoB;QACrD,IAAI,QAAQ,EAAE;YACV,gBAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SAC3B;aAAM;YACH,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;gBAC1C,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;SACN;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,oBAAoB;QAChB,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;IACjC,CAAC;CAEJ,CAAA;AAjBG;IADC,kBAAM,CAAC,mDAAuB,CAAC;8BACR,mDAAuB;0DAAC;AAHvC,6BAA6B;IADzC,sBAAU,EAAE;GACA,6BAA6B,CAoBzC;AApBY,sEAA6B"}

package/lib/electron-main/messaging/electron-messaging-contribution.d.ts

@@ -18,9 +18,9 @@ import { MessageConnection } from 'vscode-ws-jsonrpc';
 import { ContributionProvider } from '../../common/contribution-provider';
 import { WebSocketChannel } from '../../common/messaging/web-socket-channel';
 import { MessagingContribution } from '../../node/messaging/messaging-contribution';
+import { ElectronConnectionHandler } from '../../electron-common/messaging/electron-connection-handler';
 import { ElectronMainApplicationContribution } from '../electron-main-application';
 import { ElectronMessagingService } from './electron-messaging-service';
-import { ElectronConnectionHandler } from '../../electron-common/messaging/electron-connection-handler';
 /**
  * This component replicates the role filled by `MessagingContribution` but for Electron.
  * Unlike the WebSocket based implementation, we do not expect to receive

package/lib/electron-main/messaging/electron-messaging-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-messaging-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,YAAY,EAAW,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAGpF,OAAO,EAAE,mCAAmC,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6DAA6D,CAAC;AAExG;;;;;;;GAOG;AACH,qBACa,6BAA8B,YAAW,mCAAmC,EAAE,wBAAwB;IAG/G,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAGvG,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAEvF,SAAS,CAAC,QAAQ,CAAC,eAAe,6DAAoE;IACtG,SAAS,CAAC,QAAQ,CAAC,cAAc,6CAAoD;IAGrF,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,OAAO,IAAI,IAAI;IAYf,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI;IAQ1H,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI;IAI1F,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IA2CnE,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,gBAAgB;CAQ7E"}
+{"version":3,"file":"electron-messaging-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,YAAY,EAAW,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAEpF,OAAO,EAAE,yBAAyB,EAAmC,MAAM,6DAA6D,CAAC;AACzI,OAAO,EAAE,mCAAmC,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE;;;;;;;GAOG;AACH,qBACa,6BAA8B,YAAW,mCAAmC,EAAE,wBAAwB;IAG/G,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAGvG,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAEvF,SAAS,CAAC,QAAQ,CAAC,eAAe,6DAAoE;IACtG,SAAS,CAAC,QAAQ,CAAC,cAAc,6CAAoD;IAGrF,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,OAAO,IAAI,IAAI;IAYf,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI;IAQ1H,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI;IAI1F,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IA2CnE,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,gBAAgB;CAQ7E"}

package/lib/electron-main/messaging/electron-messaging-contribution.js

@@ -34,7 +34,6 @@ const messaging_contribution_1 = require("../../node/messaging/messaging-contrib
 const logger_1 = require("../../node/messaging/logger");
 const electron_connection_handler_1 = require("../../electron-common/messaging/electron-connection-handler");
 const electron_messaging_service_1 = require("./electron-messaging-service");
-const electron_connection_handler_2 = require("../../electron-common/messaging/electron-connection-handler");
 /**
  * This component replicates the role filled by `MessagingContribution` but for Electron.
  * Unlike the WebSocket based implementation, we do not expect to receive
@@ -135,7 +134,7 @@ __decorate([
 ], ElectronMessagingContribution.prototype, "messagingContributions", void 0);
 __decorate([
     inversify_1.inject(contribution_provider_1.ContributionProvider),
-    inversify_1.named(electron_connection_handler_2.ElectronConnectionHandler),
+    inversify_1.named(electron_connection_handler_1.ElectronConnectionHandler),
     __metadata("design:type", Object)
 ], ElectronMessagingContribution.prototype, "connectionHandlers", void 0);
 __decorate([

package/lib/electron-main/messaging/electron-messaging-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-messaging-contribution.js","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-messaging-contribution.js","sourceRoot":"","sources":["../../../src/electron-main/messaging/electron-messaging-contribution.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.18.0",
+  "version": "1.21.0-next.12+c8248f736ed",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -17,7 +17,7 @@
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
     "@primer/octicons-react": "^9.0.0",
-    "@theia/application-package": "1.18.0",
+    "@theia/application-package": "1.21.0-next.12+c8248f736ed",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -32,7 +32,7 @@
     "@types/safer-buffer": "^2.1.0",
     "@types/ws": "^5.1.2",
     "@types/yargs": "^15",
-    "@vscode/codicons": "^0.0.21",
+    "@vscode/codicons": "*",
     "ajv": "^6.5.3",
     "body-parser": "^1.17.2",
     "cookie": "^0.4.0",
@@ -55,6 +55,7 @@
     "perfect-scrollbar": "^1.3.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
+    "react-tooltip": "^4.2.21",
     "react-virtualized": "^9.20.0",
     "reconnecting-websocket": "^4.2.0",
     "reflect-metadata": "^0.1.10",
@@ -92,6 +93,7 @@
       "@phosphor/virtualdom",
       "@phosphor/widgets",
       "@theia/application-package:@theia/application-package/index",
+      "@theia/application-package/lib/api",
       "@theia/application-package/lib/environment",
       "fs-extra",
       "fuzzy",
@@ -169,11 +171,11 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.18.0",
+    "@theia/ext-scripts": "1.20.0",
     "minimist": "^1.2.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "76318d01b7b3364cdf35ee456797699363f2634d"
+  "gitHead": "c8248f736edb4939155711987333ed39d9394b11"
 }

package/shared/@theia/application-package/lib/api.d.ts

@@ -0,0 +1 @@
+export * from '@theia/application-package/lib/api';

package/shared/@theia/application-package/lib/api.js

@@ -0,0 +1 @@
+module.exports = require('@theia/application-package/lib/api');

package/src/browser/about-dialog.tsx

@@ -16,7 +16,7 @@
 
 import * as React from 'react';
 import { inject, injectable, postConstruct } from 'inversify';
-import { DialogProps } from './dialogs';
+import { Dialog, DialogProps } from './dialogs';
 import { ReactDialog } from './dialogs/react-dialog';
 import { ApplicationServer, ApplicationInfo, ExtensionInfo } from '../common/application-protocol';
 import { Message } from './widgets/widget';
@@ -44,7 +44,7 @@ export class AboutDialog extends ReactDialog<void> {
         super({
             title: FrontendApplicationConfigProvider.get().applicationName,
         });
-        this.appendAcceptButton('Ok');
+        this.appendAcceptButton(Dialog.OK);
     }
 
     @postConstruct()

package/src/browser/authentication-service.ts

@@ -23,10 +23,9 @@
 import { injectable, inject, postConstruct } from 'inversify';
 import { Emitter, Event } from '../common/event';
 import { StorageService } from '../browser/storage-service';
-import { Disposable } from '../common/disposable';
+import { Disposable, DisposableCollection } from '../common/disposable';
 import { ACCOUNTS_MENU, ACCOUNTS_SUBMENU, MenuModelRegistry } from '../common/menu';
 import { Command, CommandRegistry } from '../common/command';
-import { DisposableCollection } from '../common/disposable';
 
 export interface AuthenticationSessionsChangeEvent {
     added: ReadonlyArray<string>;