@theia/core 1.43.1 → 1.45.0

package/lib/node/messaging/websocket-frontend-connection-service.d.ts

@@ -0,0 +1,30 @@
+/// <reference types="node" />
+import { Channel, WriteBuffer } from '../../common/message-rpc';
+import { MessagingService } from './messaging-service';
+import { Socket } from 'socket.io';
+import { ConnectionHandlers } from './default-messaging-service';
+import { FrontendConnectionService } from './frontend-connection-service';
+import { AbstractChannel } from '../../common/message-rpc/channel';
+import { WebsocketEndpoint } from './websocket-endpoint';
+export declare class WebsocketFrontendConnectionService implements FrontendConnectionService {
+    protected readonly websocketServer: WebsocketEndpoint;
+    protected readonly wsHandlers: ConnectionHandlers<unknown>;
+    protected readonly connectionsByFrontend: Map<string, ReconnectableSocketChannel>;
+    protected readonly closeTimeouts: Map<string, NodeJS.Timeout>;
+    protected readonly channelsMarkedForClose: Set<string>;
+    registerConnectionHandler(spec: string, callback: (params: MessagingService.PathParams, channel: Channel) => void): void;
+    protected handleConnection(socket: Socket, channelCreatedHandler: (channel: Channel) => void): Promise<void>;
+    protected closeConnection(frontEndId: string, reason: string): void;
+    protected createConnection(socket: Socket, frontEndId: string): Channel;
+    markForClose(channelId: string): void;
+}
+declare class ReconnectableSocketChannel extends AbstractChannel {
+    private socket;
+    private socketBuffer;
+    private disposables;
+    connect(socket: Socket): void;
+    disconnect(): void;
+    getWriteBuffer(): WriteBuffer;
+}
+export {};
+//# sourceMappingURL=websocket-frontend-connection-service.d.ts.map

package/lib/node/messaging/websocket-frontend-connection-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-frontend-connection-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,qBACa,kCAAmC,YAAW,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,UAAU,8BAA4B;IACzD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,0CAAiD;IACzF,SAAS,CAAC,QAAQ,CAAC,aAAa,8BAAqC;IACrE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,cAAqB;IAE9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;cAIxG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiClH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAcnE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IA2BvE,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAGxC;AAED,cAAM,0BAA2B,SAAQ,eAAe;IACpD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,WAAW,CAA8B;IAEjD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAyB7B,UAAU,IAAI,IAAI;IAKT,cAAc,IAAI,WAAW;CAWzC"}

package/lib/node/messaging/websocket-frontend-connection-service.js

@@ -0,0 +1,173 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2023 STMicroelectronics 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
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketFrontendConnectionService = void 0;
+const inversify_1 = require("inversify");
+const default_messaging_service_1 = require("./default-messaging-service");
+const socket_write_buffer_1 = require("../../common/messaging/socket-write-buffer");
+const channel_1 = require("../../common/message-rpc/channel");
+const uint8_array_message_buffer_1 = require("../../common/message-rpc/uint8-array-message-buffer");
+const backend_application_config_provider_1 = require("../backend-application-config-provider");
+const websocket_endpoint_1 = require("./websocket-endpoint");
+const connection_management_1 = require("../../common/messaging/connection-management");
+const common_1 = require("../../common");
+let WebsocketFrontendConnectionService = class WebsocketFrontendConnectionService {
+    constructor() {
+        this.wsHandlers = new default_messaging_service_1.ConnectionHandlers();
+        this.connectionsByFrontend = new Map();
+        this.closeTimeouts = new Map();
+        this.channelsMarkedForClose = new Set();
+    }
+    registerConnectionHandler(spec, callback) {
+        this.websocketServer.registerConnectionHandler(spec, (params, socket) => this.handleConnection(socket, channel => callback(params, channel)));
+    }
+    async handleConnection(socket, channelCreatedHandler) {
+        // eslint-disable-next-line prefer-const
+        let reconnectListener;
+        const initialConnectListener = (frontEndId) => {
+            socket.off(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
+            socket.off(connection_management_1.ConnectionManagementMessages.RECONNECT, reconnectListener);
+            if (this.connectionsByFrontend.has(frontEndId)) {
+                this.closeConnection(frontEndId, 'reconnecting same front end');
+            }
+            channelCreatedHandler(this.createConnection(socket, frontEndId));
+            socket.emit(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT);
+        };
+        reconnectListener = (frontEndId) => {
+            socket.off(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
+            socket.off(connection_management_1.ConnectionManagementMessages.RECONNECT, reconnectListener);
+            const channel = this.connectionsByFrontend.get(frontEndId);
+            if (channel) {
+                console.info(`Reconnecting to front end ${frontEndId}`);
+                socket.emit(connection_management_1.ConnectionManagementMessages.RECONNECT, true);
+                channel.connect(socket);
+                const pendingTimeout = this.closeTimeouts.get(frontEndId);
+                clearTimeout(pendingTimeout);
+                this.closeTimeouts.delete(frontEndId);
+            }
+            else {
+                console.info(`Reconnecting failed for ${frontEndId}`);
+                socket.emit(connection_management_1.ConnectionManagementMessages.RECONNECT, false);
+            }
+        };
+        socket.on(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
+        socket.on(connection_management_1.ConnectionManagementMessages.RECONNECT, reconnectListener);
+    }
+    closeConnection(frontEndId, reason) {
+        console.info(`closing connection for ${frontEndId}`);
+        const connection = this.connectionsByFrontend.get(frontEndId); // not called when no connection is present
+        this.connectionsByFrontend.delete(frontEndId);
+        const pendingTimeout = this.closeTimeouts.get(frontEndId);
+        clearTimeout(pendingTimeout);
+        this.closeTimeouts.delete(frontEndId);
+        connection.onCloseEmitter.fire({ reason });
+        connection.close();
+    }
+    createConnection(socket, frontEndId) {
+        console.info(`creating connection for ${frontEndId}`);
+        const channel = new ReconnectableSocketChannel();
+        channel.connect(socket);
+        socket.on('disconnect', evt => {
+            console.info('socked closed');
+            channel.disconnect();
+            const timeout = backend_application_config_provider_1.BackendApplicationConfigProvider.get().frontendConnectionTimeout;
+            const isMarkedForClose = this.channelsMarkedForClose.delete(frontEndId);
+            if (timeout === 0 || isMarkedForClose) {
+                this.closeConnection(frontEndId, evt);
+            }
+            else if (timeout > 0) {
+                console.info(`setting close timeout for id ${frontEndId} to ${timeout}`);
+                const handle = setTimeout(() => {
+                    this.closeConnection(frontEndId, evt);
+                }, timeout);
+                this.closeTimeouts.set(frontEndId, handle);
+            }
+            else {
+                // timeout < 0: never close the back end
+            }
+        });
+        this.connectionsByFrontend.set(frontEndId, channel);
+        return channel;
+    }
+    markForClose(channelId) {
+        this.channelsMarkedForClose.add(channelId);
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(websocket_endpoint_1.WebsocketEndpoint),
+    __metadata("design:type", websocket_endpoint_1.WebsocketEndpoint)
+], WebsocketFrontendConnectionService.prototype, "websocketServer", void 0);
+WebsocketFrontendConnectionService = __decorate([
+    (0, inversify_1.injectable)()
+], WebsocketFrontendConnectionService);
+exports.WebsocketFrontendConnectionService = WebsocketFrontendConnectionService;
+class ReconnectableSocketChannel extends channel_1.AbstractChannel {
+    constructor() {
+        super(...arguments);
+        this.socketBuffer = new socket_write_buffer_1.SocketWriteBuffer();
+        this.disposables = new common_1.DisposableCollection();
+    }
+    connect(socket) {
+        this.disposables = new common_1.DisposableCollection();
+        this.socket = socket;
+        const errorHandler = (err) => {
+            this.onErrorEmitter.fire(err);
+        };
+        this.disposables.push(common_1.Disposable.create(() => {
+            socket.off('error', errorHandler);
+        }));
+        socket.on('error', errorHandler);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const dataListener = (data) => {
+            // In the browser context socketIO receives binary messages as ArrayBuffers.
+            // So we have to convert them to a Uint8Array before delegating the message to the read buffer.
+            const buffer = data instanceof ArrayBuffer ? new Uint8Array(data) : data;
+            this.onMessageEmitter.fire(() => new uint8_array_message_buffer_1.Uint8ArrayReadBuffer(buffer));
+        };
+        this.disposables.push(common_1.Disposable.create(() => {
+            socket.off('message', dataListener);
+        }));
+        socket.on('message', dataListener);
+        this.socketBuffer.flush(socket);
+    }
+    disconnect() {
+        this.disposables.dispose();
+        this.socket = undefined;
+    }
+    getWriteBuffer() {
+        const writeBuffer = new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer();
+        writeBuffer.onCommit(data => {
+            var _a;
+            if ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.connected) {
+                this.socket.send(data);
+            }
+            else {
+                this.socketBuffer.buffer(data);
+            }
+        });
+        return writeBuffer;
+    }
+}
+//# sourceMappingURL=websocket-frontend-connection-service.js.map

package/lib/node/messaging/websocket-frontend-connection-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-frontend-connection-service.js","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.43.1",
+  "version": "1.45.0",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -16,8 +16,8 @@
     "@phosphor/signaling": "1",
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
-    "@theia/application-package": "1.43.1",
-    "@theia/request": "1.43.1",
+    "@theia/application-package": "1.45.0",
+    "@theia/request": "1.45.0",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -200,12 +200,12 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.43.1",
-    "@theia/re-exports": "1.43.1",
+    "@theia/ext-scripts": "1.45.0",
+    "@theia/re-exports": "1.45.0",
     "minimist": "^1.2.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "df48285b7d3340e0109e89ffdb0f437ba6710378"
+  "gitHead": "2b20a60a0f9b54b19838a0f71760989a19622495"
 }

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

@@ -57,7 +57,7 @@ import { QuickInputService, QuickPickItem, QuickPickItemOrSeparator, QuickPickSe
 import { AsyncLocalizationProvider } from '../common/i18n/localization';
 import { nls } from '../common/nls';
 import { CurrentWidgetCommandAdapter } from './shell/current-widget-command-adapter';
-import { ConfirmDialog, confirmExitWithOrWithoutSaving, Dialog } from './dialogs';
+import { ConfirmDialog, confirmExit, ConfirmSaveDialog, Dialog } from './dialogs';
 import { WindowService } from './window/window-service';
 import { FrontendApplicationConfigProvider } from './frontend-application-config-provider';
 import { DecorationStyle } from './decoration-style';
@@ -360,6 +360,10 @@ export const supportPaste = browser.isNative || (!browser.isChrome && document.q
 
 export const RECENT_COMMANDS_STORAGE_KEY = 'commands';
 
+export const CLASSNAME_OS_MAC = 'mac';
+export const CLASSNAME_OS_WINDOWS = 'windows';
+export const CLASSNAME_OS_LINUX = 'linux';
+
 @injectable()
 export class CommonFrontendContribution implements FrontendApplicationContribution, MenuContribution, CommandContribution, KeybindingContribution, ColorContribution {
 
@@ -452,6 +456,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         this.initResourceContextKeys();
         this.registerCtrlWHandling();
 
+        this.setOsClass();
         this.updateStyles();
         this.preferences.ready.then(() => this.setSashProperties());
         this.preferences.onPreferenceChanged(e => this.handlePreferenceChange(e, app));
@@ -480,6 +485,16 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         });
     }
 
+    protected setOsClass(): void {
+        if (isOSX) {
+            document.body.classList.add(CLASSNAME_OS_MAC);
+        } else if (isWindows) {
+            document.body.classList.add(CLASSNAME_OS_WINDOWS);
+        } else {
+            document.body.classList.add(CLASSNAME_OS_LINUX);
+        }
+    }
+
     protected updateStyles(): void {
         document.body.classList.remove('theia-editor-highlightModifiedTabs');
         if (this.preferences['workbench.editor.highlightModifiedTabs']) {
@@ -1185,22 +1200,60 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
                 action: async () => {
                     const captionsToSave = this.unsavedTabsCaptions();
                     const untitledCaptionsToSave = this.unsavedUntitledTabsCaptions();
-                    const result = await confirmExitWithOrWithoutSaving(captionsToSave, async () => {
+                    const shouldExit = await this.confirmExitWithOrWithoutSaving(captionsToSave, async () => {
                         await this.saveDirty(untitledCaptionsToSave);
                         await this.shell.saveAll();
                     });
-                    if (this.shell.canSaveAll()) {
-                        this.shouldPreventClose = true;
-                        return false;
-                    } else {
-                        this.shouldPreventClose = false;
-                        return result;
-                    }
+                    const allSavedOrDoNotSave = (
+                        shouldExit === true && untitledCaptionsToSave.length === 0 // Should save and cancel if any captions failed to save
+                    ) || shouldExit === false; // Do not save
+
+                    this.shouldPreventClose = !allSavedOrDoNotSave;
+                    return allSavedOrDoNotSave;
 
                 }
             };
         }
     }
+    // Asks the user to confirm whether they want to exit with or without saving the changes
+    private async confirmExitWithOrWithoutSaving(captionsToSave: string[], performSave: () => Promise<void>): Promise<boolean | undefined> {
+        const div: HTMLElement = document.createElement('div');
+        div.innerText = nls.localizeByDefault("Your changes will be lost if you don't save them.");
+
+        let result;
+        if (captionsToSave.length > 0) {
+            const span = document.createElement('span');
+            span.appendChild(document.createElement('br'));
+            captionsToSave.forEach(cap => {
+                const b = document.createElement('b');
+                b.innerText = cap;
+                span.appendChild(b);
+                span.appendChild(document.createElement('br'));
+            });
+            span.appendChild(document.createElement('br'));
+            div.appendChild(span);
+            result = await new ConfirmSaveDialog({
+                title: nls.localizeByDefault('Do you want to save the changes to the following {0} files?', captionsToSave.length),
+                msg: div,
+                dontSave: nls.localizeByDefault("Don't Save"),
+                save: nls.localizeByDefault('Save All'),
+                cancel: Dialog.CANCEL
+            }).open();
+
+            if (result) {
+                await performSave();
+            }
+        } else {
+            // fallback if not passed with an empty caption-list.
+            result = confirmExit();
+        }
+        if (result !== undefined) {
+            return result === true;
+        } else {
+            return undefined;
+        };
+
+    }
     protected unsavedTabsCaptions(): string[] {
         return this.shell.widgets
             .filter(widget => this.saveResourceService.canSave(widget))
@@ -1221,11 +1274,19 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
             this.windowService.reload();
         }
     }
+    /**
+     * saves any dirty widget in toSave
+     * side effect - will pop all widgets from toSave that was saved
+     * @param toSave
+     */
     protected async saveDirty(toSave: Widget[]): Promise<void> {
         for (const widget of toSave) {
             const saveable = Saveable.get(widget);
             if (saveable?.dirty) {
                 await this.saveResourceService.save(widget);
+                if (!this.saveResourceService.canSave(widget)) {
+                    toSave.pop();
+                }
             }
         }
     }

package/src/browser/connection-status-service.spec.ts

@@ -33,8 +33,8 @@ import { MockConnectionStatusService } from './test/mock-connection-status-servi
 import * as sinon from 'sinon';
 
 import { Container } from 'inversify';
-import { WebSocketConnectionProvider } from './messaging/ws-connection-provider';
 import { ILogger, Emitter, Loggable } from '../common';
+import { WebSocketConnectionSource } from './messaging/ws-connection-source';
 
 disableJSDOM();
 
@@ -101,7 +101,7 @@ describe('frontend-connection-status', function (): void {
     let timer: sinon.SinonFakeTimers;
     let pingSpy: sinon.SinonSpy;
     beforeEach(() => {
-        const mockWebSocketConnectionProvider = sinon.createStubInstance(WebSocketConnectionProvider);
+        const mockWebSocketConnectionSource = sinon.createStubInstance(WebSocketConnectionSource);
         const mockPingService: PingService = <PingService>{
             ping(): Promise<void> {
                 return Promise.resolve(undefined);
@@ -118,11 +118,11 @@ describe('frontend-connection-status', function (): void {
         testContainer.bind(PingService).toConstantValue(mockPingService);
         testContainer.bind(ILogger).toConstantValue(mockILogger);
         testContainer.bind(ConnectionStatusOptions).toConstantValue({ offlineTimeout: OFFLINE_TIMEOUT });
-        testContainer.bind(WebSocketConnectionProvider).toConstantValue(mockWebSocketConnectionProvider);
+        testContainer.bind(WebSocketConnectionSource).toConstantValue(mockWebSocketConnectionSource);
 
-        sinon.stub(mockWebSocketConnectionProvider, 'onSocketDidOpen').value(mockSocketOpenedEmitter.event);
-        sinon.stub(mockWebSocketConnectionProvider, 'onSocketDidClose').value(mockSocketClosedEmitter.event);
-        sinon.stub(mockWebSocketConnectionProvider, 'onIncomingMessageActivity').value(mockIncomingMessageActivityEmitter.event);
+        sinon.stub(mockWebSocketConnectionSource, 'onSocketDidOpen').value(mockSocketOpenedEmitter.event);
+        sinon.stub(mockWebSocketConnectionSource, 'onSocketDidClose').value(mockSocketClosedEmitter.event);
+        sinon.stub(mockWebSocketConnectionSource, 'onIncomingMessageActivity').value(mockIncomingMessageActivityEmitter.event);
 
         timer = sinon.useFakeTimers();
 

package/src/browser/connection-status-service.ts

@@ -19,8 +19,8 @@ import { ILogger } from '../common/logger';
 import { Event, Emitter } from '../common/event';
 import { DefaultFrontendApplicationContribution } from './frontend-application-contribution';
 import { StatusBar, StatusBarAlignment } from './status-bar/status-bar';
-import { WebSocketConnectionProvider } from './messaging/ws-connection-provider';
 import { Disposable, DisposableCollection, nls } from '../common';
+import { WebSocketConnectionSource } from './messaging/ws-connection-source';
 
 /**
  * Service for listening on backend connection changes.
@@ -119,7 +119,7 @@ export class FrontendConnectionStatusService extends AbstractConnectionStatusSer
 
     private scheduledPing: number | undefined;
 
-    @inject(WebSocketConnectionProvider) protected readonly wsConnectionProvider: WebSocketConnectionProvider;
+    @inject(WebSocketConnectionSource) protected readonly wsConnectionProvider: WebSocketConnectionSource;
     @inject(PingService) protected readonly pingService: PingService;
 
     @postConstruct()

package/src/browser/core-preferences.ts

@@ -119,6 +119,22 @@ export const corePreferenceSchema: PreferenceSchema = {
             scope: 'application',
             markdownDescription: nls.localizeByDefault('Separator used by {0}.', '`#window.title#`')
         },
+        'window.secondaryWindowPlacement': {
+            type: 'string',
+            enum: ['originalSize', 'halfWidth', 'fullSize'],
+            enumDescriptions: [
+                nls.localize('theia/core/secondaryWindow/originalSize', 'The position and size of the extracted widget will be the same as the original widget.'),
+                nls.localize('theia/core/secondaryWindow/halfWidth', 'The position and size of the extracted widget will be half the width of the running Theia application.'),
+                nls.localize('theia/core/secondaryWindow/fullSize', 'The position and size of the extracted widget will be the same as the running Theia application.'),
+            ],
+            default: 'originalSize',
+            description: nls.localize('theia/core/secondaryWindow/description', 'Sets the initial position and size of the extracted secondary window.'),
+        },
+        'window.secondaryWindowAlwaysOnTop': {
+            type: 'boolean',
+            default: false,
+            description: nls.localize('theia/core/secondaryWindow/alwaysOnTop', 'When enabled, the secondary window stays above all other windows, including those of different applications.'),
+        },
         'http.proxy': {
             type: 'string',
             pattern: '^https?://([^:]*(:[^@]*)?@)?([^:]+|\\[[:0-9a-fA-F]+\\])(:\\d+)?/?$|^$',

package/src/browser/dialogs.ts

@@ -458,40 +458,6 @@ export class ConfirmSaveDialog extends AbstractDialog<boolean | undefined> {
 
 }
 
-// Asks the user to confirm whether they want to exit with or without saving the changes
-export async function confirmExitWithOrWithoutSaving(captionsToSave: string[], performSave: () => Promise<void>): Promise<boolean> {
-    const div: HTMLElement = document.createElement('div');
-    div.innerText = nls.localizeByDefault("Your changes will be lost if you don't save them.");
-
-    if (captionsToSave.length > 0) {
-        const span = document.createElement('span');
-        span.appendChild(document.createElement('br'));
-        captionsToSave.forEach(cap => {
-            const b = document.createElement('b');
-            b.innerText = cap;
-            span.appendChild(b);
-            span.appendChild(document.createElement('br'));
-        });
-        span.appendChild(document.createElement('br'));
-        div.appendChild(span);
-        const result = await new ConfirmSaveDialog({
-            title: nls.localizeByDefault('Do you want to save the changes to the following {0} files?', captionsToSave.length),
-            msg: div,
-            dontSave: nls.localizeByDefault("Don't Save"),
-            save: nls.localizeByDefault('Save All'),
-            cancel: Dialog.CANCEL
-        }).open();
-
-        if (result) {
-            await performSave();
-        }
-        return result !== undefined;
-    } else {
-        // fallback if not passed with an empty caption-list.
-        return confirmExit();
-    }
-
-}
 @injectable()
 export class SingleTextInputDialogProps extends DialogProps {
     readonly confirmButtonLabel?: string;

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

@@ -138,6 +138,7 @@ import { StylingParticipant, StylingService } from './styling-service';
 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';
 
 export { bindResourceProvider, bindMessageService, bindPreferenceService };
 
@@ -150,6 +151,8 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     bind(IconThemeContribution).toService(DefaultFileIconThemeContribution);
     bind(IconThemeApplicationContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(IconThemeApplicationContribution);
+    bind(LanguageIconLabelProvider).toSelf().inSingletonScope();
+    bind(LabelProviderContribution).toService(LanguageIconLabelProvider);
 
     bind(ColorRegistry).toSelf().inSingletonScope();
     bindContributionProvider(bind, ColorContribution);
@@ -442,6 +445,7 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
 
     bind(SaveResourceService).toSelf().inSingletonScope();
     bind(UserWorkingDirectoryProvider).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(UserWorkingDirectoryProvider);
 
     bind(HoverService).toSelf().inSingletonScope();
 

package/src/browser/icon-theme-contribution.ts

@@ -50,6 +50,7 @@ export class DefaultFileIconThemeContribution implements IconTheme, IconThemeCon
     readonly label = 'File Icons (Theia)';
     readonly hasFileIcons = true;
     readonly hasFolderIcons = true;
+    readonly showLanguageModeIcons = true;
 
     registerIconThemes(iconThemes: IconThemeService): MaybePromise<void> {
         iconThemes.register(this);

package/src/browser/icon-theme-service.ts

@@ -31,6 +31,7 @@ export interface IconThemeDefinition {
     readonly hasFileIcons?: boolean;
     readonly hasFolderIcons?: boolean;
     readonly hidesExplorerArrows?: boolean;
+    readonly showLanguageModeIcons?: boolean;
 }
 
 export interface IconTheme extends IconThemeDefinition {

package/src/browser/language-icon-provider.ts

@@ -0,0 +1,55 @@
+// *****************************************************************************
+// Copyright (C) 2023 EclipseSource 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 { inject, injectable, postConstruct } from 'inversify';
+import { Emitter, Event } from '../common';
+import { IconThemeService } from './icon-theme-service';
+import { DidChangeLabelEvent, LabelProviderContribution } from './label-provider';
+import { LanguageService } from './language-service';
+
+@injectable()
+export class LanguageIconLabelProvider implements LabelProviderContribution {
+    @inject(IconThemeService) protected readonly iconThemeService: IconThemeService;
+    @inject(LanguageService) protected readonly languageService: LanguageService;
+
+    protected readonly onDidChangeEmitter = new Emitter<DidChangeLabelEvent>();
+
+    @postConstruct()
+    protected init(): void {
+        this.languageService.onDidChangeIcon(() => this.fireDidChange());
+    }
+
+    canHandle(element: object): number {
+        const current = this.iconThemeService.getDefinition(this.iconThemeService.current);
+        return current?.showLanguageModeIcons === true && this.languageService.getIcon(element) ? Number.MAX_SAFE_INTEGER : 0;
+    }
+
+    getIcon(element: object): string | undefined {
+        const language = this.languageService.detectLanguage(element);
+        return this.languageService.getIcon(language!.id);
+    }
+
+    get onDidChange(): Event<DidChangeLabelEvent> {
+        return this.onDidChangeEmitter.event;
+    }
+
+    protected fireDidChange(): void {
+        this.onDidChangeEmitter.fire({
+            affects: element => this.canHandle(element) > 0
+        });
+    }
+
+}