@theia/core 1.25.0-next.7 → 1.25.0

package/src/common/uri.ts

@@ -17,7 +17,11 @@
 import { URI as Uri } from 'vscode-uri';
 import { Path } from './path';
 
-export default class URI {
+export class URI {
+
+    public static fromComponents(components: UriComponents): URI {
+        return new URI(Uri.revive(components));
+    }
 
     private readonly codeUri: Uri;
     private _path: Path | undefined;
@@ -245,4 +249,25 @@ export default class URI {
     private hasSameOrigin(uri: URI): boolean {
         return (this.authority === uri.authority) && (this.scheme === uri.scheme);
     }
+
+    toComponents(): UriComponents {
+        return {
+            scheme: this.scheme,
+            authority: this.authority,
+            path: this.path.toString(),
+            query: this.query,
+            fragment: this.fragment
+        };
+    }
 }
+
+export interface UriComponents {
+    scheme: string;
+    authority: string;
+    path: string;
+    query: string;
+    fragment: string;
+    external?: string;
+}
+
+export default URI;

package/src/electron-browser/menu/electron-menu-contribution.ts

@@ -101,10 +101,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
     override onStart(app: FrontendApplication): void {
         this.handleTitleBarStyling(app);
         if (isOSX) {
-            // OSX: Recreate the menus when changing windows.
-            // OSX only has one menu bar for all windows, so we need to swap
-            // between them as the user switches windows.
-            electronRemote.getCurrentWindow().on('focus', () => this.setMenu(app));
+            this.attachWindowFocusListener(app);
         }
         // Make sure the application menu is complete, once the frontend application is ready.
         // https://github.com/theia-ide/theia/issues/5100
@@ -125,6 +122,16 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         });
     }
 
+    protected attachWindowFocusListener(app: FrontendApplication): void {
+        // OSX: Recreate the menus when changing windows.
+        // OSX only has one menu bar for all windows, so we need to swap
+        // between them as the user switches windows.
+        const targetWindow = electronRemote.getCurrentWindow();
+        const callback = () => this.setMenu(app);
+        targetWindow.on('focus', callback);
+        window.addEventListener('unload', () => targetWindow.off('focus', callback));
+    }
+
     handleTitleBarStyling(app: FrontendApplication): void {
         this.hideTopPanel(app);
         electron.ipcRenderer.on(TitleBarStyleAtStartup, (_event, style: string) => {

package/src/electron-common/electron-token.ts

@@ -15,12 +15,13 @@
 // *****************************************************************************
 
 /**
- * This token is unique the the current running instance. It is used by the backend
+ * This token is unique to the current running instance. It is used by the backend
  * to make sure it is an electron browser window that is connecting to its services.
  *
- * The identifier is a string, which makes it usable as a key for cookies or similar.
+ * The identifier is a string, which makes it usable as a key for cookies, environments, etc.
  */
-export const ElectronSecurityToken = 'x-theia-electron-token';
+// Note that it needs to be uppercase for it to work properly in Windows environments.
+export const ElectronSecurityToken: string = 'THEIA_ELECTRON_TOKEN';
 export interface ElectronSecurityToken {
     value: string;
 };

package/src/node/backend-application-module.ts

@@ -36,6 +36,7 @@ import { ContributionFilterRegistry, ContributionFilterRegistryImpl } from '../c
 import { EnvironmentUtils } from './environment-utils';
 import { ProcessUtils } from './process-utils';
 import { bindNodeStopwatch, bindBackendStopwatchServer } from './performance';
+import { OSBackendApplicationContribution } from './os-backend-application-contribution';
 
 decorate(injectable(), ApplicationPackage);
 
@@ -111,6 +112,9 @@ export const backendApplicationModule = new ContainerModule(bind => {
     bind(EnvironmentUtils).toSelf().inSingletonScope();
     bind(ProcessUtils).toSelf().inSingletonScope();
 
+    bind(OSBackendApplicationContribution).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(OSBackendApplicationContribution);
+
     bindNodeStopwatch(bind);
     bindBackendStopwatchServer(bind);
 });

package/src/node/i18n/localization-backend-contribution.ts

@@ -36,7 +36,7 @@ export class LocalizationBackendContribution implements BackendApplicationContri
     configure(app: express.Application): void {
         app.get('/i18n/:locale', (req, res) => {
             let locale = req.params.locale;
-            locale = this.localizationProvider.getAvailableLanguages().includes(locale) && locale || 'en';
+            locale = this.localizationProvider.getAvailableLanguages().some(e => e.languageId === locale) ? locale : 'en';
             this.localizationProvider.setCurrentLanguage(locale);
             res.send(this.localizationProvider.loadLocalization(locale));
         });

package/src/node/i18n/localization-contribution.ts

@@ -17,7 +17,7 @@
 import * as fs from 'fs-extra';
 import { inject, injectable, named } from 'inversify';
 import { ContributionProvider } from '../../common';
-import { Localization } from '../../common/i18n/localization';
+import { LanguageInfo, Localization } from '../../common/i18n/localization';
 import { LocalizationProvider } from './localization-provider';
 
 export const LocalizationContribution = Symbol('LocalizationContribution');
@@ -45,16 +45,12 @@ export class LocalizationRegistry {
         this.localizationProvider.addLocalizations(localization);
     }
 
-    registerLocalizationFromRequire(locale: string, required: unknown): void {
+    registerLocalizationFromRequire(locale: string | LanguageInfo, required: unknown): void {
         const translations = this.flattenTranslations(required);
-        const localization: Localization = {
-            languageId: locale,
-            translations
-        };
-        this.registerLocalization(localization);
+        this.registerLocalization(this.createLocalization(locale, translations));
     }
 
-    async registerLocalizationFromFile(localizationPath: string, locale?: string): Promise<void> {
+    async registerLocalizationFromFile(localizationPath: string, locale?: string | LanguageInfo): Promise<void> {
         if (!locale) {
             locale = this.identifyLocale(localizationPath);
         }
@@ -63,11 +59,23 @@ export class LocalizationRegistry {
         }
         const translationJson = await fs.readJson(localizationPath);
         const translations = this.flattenTranslations(translationJson);
-        const localization: Localization = {
-            languageId: locale,
-            translations
-        };
-        this.registerLocalization(localization);
+        this.registerLocalization(this.createLocalization(locale, translations));
+    }
+
+    protected createLocalization(locale: string | LanguageInfo, translations: Record<string, string>): Localization {
+        let localization: Localization;
+        if (typeof locale === 'string') {
+            localization = {
+                languageId: locale,
+                translations
+            };
+        } else {
+            localization = {
+                ...locale,
+                translations
+            };
+        }
+        return localization;
     }
 
     protected flattenTranslations(localization: unknown): Record<string, string> {

package/src/node/i18n/localization-provider.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable } from 'inversify';
-import { Localization } from '../../common/i18n/localization';
+import { LanguageInfo, Localization } from '../../common/i18n/localization';
 
 @injectable()
 export class LocalizationProvider {
@@ -29,11 +29,11 @@ export class LocalizationProvider {
             if (!merged) {
                 this.localizations.set(localization.languageId, merged = {
                     languageId: localization.languageId,
-                    languageName: localization.languageName,
-                    localizedLanguageName: localization.localizedLanguageName,
                     translations: {}
                 });
             }
+            merged.languageName = merged.languageName || localization.languageName;
+            merged.localizedLanguageName = merged.localizedLanguageName || localization.localizedLanguageName;
             merged.languagePack = merged.languagePack || localization.languagePack;
             Object.assign(merged.translations, localization.translations);
         }
@@ -47,14 +47,19 @@ export class LocalizationProvider {
         return this.currentLanguage;
     }
 
-    getAvailableLanguages(all?: boolean): string[] {
-        const languageIds: string[] = [];
+    getAvailableLanguages(all?: boolean): LanguageInfo[] {
+        const languageIds: LanguageInfo[] = [];
         for (const localization of this.localizations.values()) {
             if (all || localization.languagePack) {
-                languageIds.push(localization.languageId);
+                languageIds.push({
+                    languageId: localization.languageId,
+                    languageName: localization.languageName,
+                    languagePack: localization.languagePack,
+                    localizedLanguageName: localization.localizedLanguageName
+                });
             }
         }
-        return languageIds.sort((a, b) => a.localeCompare(b));
+        return languageIds.sort((a, b) => a.languageId.localeCompare(b.languageId));
     }
 
     loadLocalization(languageId: string): Localization {

package/src/node/os-backend-application-contribution.ts

@@ -0,0 +1,30 @@
+// *****************************************************************************
+// Copyright (C) 2022 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
+// *****************************************************************************
+
+import * as express from 'express';
+import { injectable } from 'inversify';
+import { BackendApplicationContribution } from './backend-application';
+import { OS } from '../common/os';
+
+@injectable()
+export class OSBackendApplicationContribution implements BackendApplicationContribution {
+
+    configure(app: express.Application): void {
+        app.get('/os', (_, res) => {
+            res.send(OS.type());
+        });
+    }
+}

package/lib/browser/nls-loader.d.ts

@@ -1,2 +0,0 @@
-export declare function loadTranslations(): Promise<void>;
-//# sourceMappingURL=nls-loader.d.ts.map

package/lib/browser/nls-loader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"nls-loader.d.ts","sourceRoot":"","sources":["../../src/browser/nls-loader.ts"],"names":[],"mappings":"AAoBA,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAYtD"}

package/lib/browser/nls-loader.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"nls-loader.js","sourceRoot":"","sources":["../../src/browser/nls-loader.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,uCAAoC;AACpC,yCAAsC;AACtC,iGAA2F;AAEpF,KAAK,UAAU,gBAAgB;IAClC,MAAM,aAAa,GAAG,wEAAiC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;IAC5E,IAAI,aAAa,IAAI,CAAC,SAAG,CAAC,MAAM,EAAE;QAC9B,MAAM,CAAC,MAAM,CAAC,SAAG,EAAE;YACf,MAAM,EAAE,aAAa;SACxB,CAAC,CAAC;KACN;IACD,IAAI,SAAG,CAAC,MAAM,EAAE;QACZ,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,GAAG,SAAG,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC;QACvF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QACvC,SAAG,CAAC,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;KAC5C;AACL,CAAC;AAZD,4CAYC"}