@theia/core 1.53.0-next.4 → 1.53.0-next.55

package/src/browser/external-uri-service.ts

@@ -1,79 +1,79 @@
-// *****************************************************************************
-// Copyright (C) 2019 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { environment } from '@theia/application-package/lib/environment';
-import { injectable } from 'inversify';
-import { MaybePromise } from '../common/types';
-import URI from '../common/uri';
-import { Endpoint } from './endpoint';
-
-export interface AddressPort {
-    address: string
-    port: number
-}
-
-@injectable()
-export class ExternalUriService {
-
-    /**
-     * Maps local to remote URLs.
-     * Should be no-op if the given URL is not a localhost URL.
-     *
-     * By default maps to an origin serving Theia.
-     *
-     * Use `parseLocalhost` to retrieve localhost address and port information.
-     */
-    resolve(uri: URI): MaybePromise<URI> {
-        const address = this.parseLocalhost(uri);
-        if (address) {
-            return this.toRemoteUrl(uri, address);
-        }
-        return uri;
-    }
-
-    parseLocalhost(uri: URI): AddressPort | undefined {
-        if (uri.scheme !== 'http' && uri.scheme !== 'https') {
-            return;
-        }
-        const localhostMatch = /^(localhost|127\.0\.0\.1|0\.0\.0\.0):(\d+)$/.exec(uri.authority);
-        if (!localhostMatch) {
-            return;
-        }
-        return {
-            address: localhostMatch[1],
-            port: +localhostMatch[2],
-        };
-    }
-
-    protected toRemoteUrl(uri: URI, address: AddressPort): URI {
-        return new Endpoint({ host: this.toRemoteHost(address) })
-            .getRestUrl()
-            .withPath(uri.path)
-            .withFragment(uri.fragment)
-            .withQuery(uri.query);
-    }
-
-    protected toRemoteHost(address: AddressPort): string {
-        return `${this.getRemoteHost()}:${address.port}`;
-    }
-
-    /**
-     * @returns The remote host (where the backend is running).
-     */
-    protected getRemoteHost(): string {
-        return environment.electron.is() ? 'localhost' : window.location.hostname;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { environment } from '@theia/application-package/lib/environment';
+import { injectable } from 'inversify';
+import { MaybePromise } from '../common/types';
+import URI from '../common/uri';
+import { Endpoint } from './endpoint';
+
+export interface AddressPort {
+    address: string
+    port: number
+}
+
+@injectable()
+export class ExternalUriService {
+
+    /**
+     * Maps local to remote URLs.
+     * Should be no-op if the given URL is not a localhost URL.
+     *
+     * By default maps to an origin serving Theia.
+     *
+     * Use `parseLocalhost` to retrieve localhost address and port information.
+     */
+    resolve(uri: URI): MaybePromise<URI> {
+        const address = this.parseLocalhost(uri);
+        if (address) {
+            return this.toRemoteUrl(uri, address);
+        }
+        return uri;
+    }
+
+    parseLocalhost(uri: URI): AddressPort | undefined {
+        if (uri.scheme !== 'http' && uri.scheme !== 'https') {
+            return;
+        }
+        const localhostMatch = /^(localhost|127\.0\.0\.1|0\.0\.0\.0):(\d+)$/.exec(uri.authority);
+        if (!localhostMatch) {
+            return;
+        }
+        return {
+            address: localhostMatch[1],
+            port: +localhostMatch[2],
+        };
+    }
+
+    protected toRemoteUrl(uri: URI, address: AddressPort): URI {
+        return new Endpoint({ host: this.toRemoteHost(address) })
+            .getRestUrl()
+            .withPath(uri.path)
+            .withFragment(uri.fragment)
+            .withQuery(uri.query);
+    }
+
+    protected toRemoteHost(address: AddressPort): string {
+        return `${this.getRemoteHost()}:${address.port}`;
+    }
+
+    /**
+     * @returns The remote host (where the backend is running).
+     */
+    protected getRemoteHost(): string {
+        return environment.electron.is() ? 'localhost' : window.location.hostname;
+    }
+}

package/src/browser/file-icons-js.d.ts

@@ -1,20 +1,20 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-declare module 'file-icons-js' {
-    function getClass(filePath: string): string;
-    function getClassWithColor(filePath: string): string;
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+declare module 'file-icons-js' {
+    function getClass(filePath: string): string;
+    function getClassWithColor(filePath: string): string;
+}

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

@@ -1,62 +1,62 @@
-// *****************************************************************************
-// Copyright (C) 2019 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { interfaces } from 'inversify';
-import {
-    bindContributionProvider, DefaultResourceProvider, MaybePromise, MessageClient,
-    MessageService, ResourceProvider, ResourceResolver
-} from '../common';
-import {
-    bindPreferenceSchemaProvider, PreferenceProvider,
-    PreferenceProviderProvider, PreferenceProxyOptions, PreferenceSchema, PreferenceSchemaProvider, PreferenceScope,
-    PreferenceService, PreferenceServiceImpl, PreferenceValidationService
-} from './preferences';
-import { InjectablePreferenceProxy, PreferenceProxyFactory, PreferenceProxySchema } from './preferences/injectable-preference-proxy';
-
-export function bindMessageService(bind: interfaces.Bind): interfaces.BindingWhenOnSyntax<MessageService> {
-    bind(MessageClient).toSelf().inSingletonScope();
-    return bind(MessageService).toSelf().inSingletonScope();
-}
-
-export function bindPreferenceService(bind: interfaces.Bind): void {
-    bind(PreferenceProvider).toSelf().inSingletonScope().whenTargetNamed(PreferenceScope.User);
-    bind(PreferenceProvider).toSelf().inSingletonScope().whenTargetNamed(PreferenceScope.Workspace);
-    bind(PreferenceProvider).toSelf().inSingletonScope().whenTargetNamed(PreferenceScope.Folder);
-    bind(PreferenceProviderProvider).toFactory(ctx => (scope: PreferenceScope) => {
-        if (scope === PreferenceScope.Default) {
-            return ctx.container.get(PreferenceSchemaProvider);
-        }
-        return ctx.container.getNamed(PreferenceProvider, scope);
-    });
-    bind(PreferenceServiceImpl).toSelf().inSingletonScope();
-    bind(PreferenceService).toService(PreferenceServiceImpl);
-    bindPreferenceSchemaProvider(bind);
-    bind(PreferenceValidationService).toSelf().inSingletonScope();
-    bind(InjectablePreferenceProxy).toSelf();
-    bind(PreferenceProxyFactory).toFactory(({ container }) => (schema: MaybePromise<PreferenceSchema>, options: PreferenceProxyOptions = {}) => {
-        const child = container.createChild();
-        child.bind(PreferenceProxyOptions).toConstantValue(options ?? {});
-        child.bind(PreferenceProxySchema).toConstantValue(() => schema);
-        const handler = child.get(InjectablePreferenceProxy);
-        return new Proxy(Object.create(null), handler); // eslint-disable-line no-null/no-null
-    });
-}
-
-export function bindResourceProvider(bind: interfaces.Bind): void {
-    bind(DefaultResourceProvider).toSelf().inSingletonScope();
-    bind(ResourceProvider).toProvider(context => uri => context.container.get(DefaultResourceProvider).get(uri));
-    bindContributionProvider(bind, ResourceResolver);
-}
+// *****************************************************************************
+// Copyright (C) 2019 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { interfaces } from 'inversify';
+import {
+    bindContributionProvider, DefaultResourceProvider, MaybePromise, MessageClient,
+    MessageService, ResourceProvider, ResourceResolver
+} from '../common';
+import {
+    bindPreferenceSchemaProvider, PreferenceProvider,
+    PreferenceProviderProvider, PreferenceProxyOptions, PreferenceSchema, PreferenceSchemaProvider, PreferenceScope,
+    PreferenceService, PreferenceServiceImpl, PreferenceValidationService
+} from './preferences';
+import { InjectablePreferenceProxy, PreferenceProxyFactory, PreferenceProxySchema } from './preferences/injectable-preference-proxy';
+
+export function bindMessageService(bind: interfaces.Bind): interfaces.BindingWhenOnSyntax<MessageService> {
+    bind(MessageClient).toSelf().inSingletonScope();
+    return bind(MessageService).toSelf().inSingletonScope();
+}
+
+export function bindPreferenceService(bind: interfaces.Bind): void {
+    bind(PreferenceProvider).toSelf().inSingletonScope().whenTargetNamed(PreferenceScope.User);
+    bind(PreferenceProvider).toSelf().inSingletonScope().whenTargetNamed(PreferenceScope.Workspace);
+    bind(PreferenceProvider).toSelf().inSingletonScope().whenTargetNamed(PreferenceScope.Folder);
+    bind(PreferenceProviderProvider).toFactory(ctx => (scope: PreferenceScope) => {
+        if (scope === PreferenceScope.Default) {
+            return ctx.container.get(PreferenceSchemaProvider);
+        }
+        return ctx.container.getNamed(PreferenceProvider, scope);
+    });
+    bind(PreferenceServiceImpl).toSelf().inSingletonScope();
+    bind(PreferenceService).toService(PreferenceServiceImpl);
+    bindPreferenceSchemaProvider(bind);
+    bind(PreferenceValidationService).toSelf().inSingletonScope();
+    bind(InjectablePreferenceProxy).toSelf();
+    bind(PreferenceProxyFactory).toFactory(({ container }) => (schema: MaybePromise<PreferenceSchema>, options: PreferenceProxyOptions = {}) => {
+        const child = container.createChild();
+        child.bind(PreferenceProxyOptions).toConstantValue(options ?? {});
+        child.bind(PreferenceProxySchema).toConstantValue(() => schema);
+        const handler = child.get(InjectablePreferenceProxy);
+        return new Proxy(Object.create(null), handler); // eslint-disable-line no-null/no-null
+    });
+}
+
+export function bindResourceProvider(bind: interfaces.Bind): void {
+    bind(DefaultResourceProvider).toSelf().inSingletonScope();
+    bind(ResourceProvider).toProvider(context => uri => context.container.get(DefaultResourceProvider).get(uri));
+    bindContributionProvider(bind, ResourceResolver);
+}

package/src/browser/frontend-application-config-provider.spec.ts

@@ -1,45 +1,45 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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 { enableJSDOM } from '../browser/test/jsdom';
-let disableJSDOM = enableJSDOM();
-
-import { FrontendApplicationConfig } from '@theia/application-package/lib/';
-import { expect } from 'chai';
-import { FrontendApplicationConfigProvider } from './frontend-application-config-provider';
-
-disableJSDOM();
-
-const { DEFAULT } = FrontendApplicationConfig;
-
-describe('FrontendApplicationConfigProvider', function (): void {
-
-    before(() => disableJSDOM = enableJSDOM());
-    after(() => disableJSDOM());
-
-    it('should use defaults when calling `set`', function (): void {
-        FrontendApplicationConfigProvider.set({
-            applicationName: DEFAULT.applicationName + ' Something Else',
-        });
-        const config = FrontendApplicationConfigProvider.get();
-        // custom values
-        expect(config.applicationName).not.equal(DEFAULT.applicationName);
-        // defaults
-        expect(config.defaultIconTheme).equal(DEFAULT.defaultIconTheme);
-        expect(config.defaultTheme).deep.equal(DEFAULT.defaultTheme);
-        expect(config.electron.windowOptions).deep.equal(DEFAULT.electron.windowOptions);
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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 { enableJSDOM } from '../browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+
+import { FrontendApplicationConfig } from '@theia/application-package/lib/';
+import { expect } from 'chai';
+import { FrontendApplicationConfigProvider } from './frontend-application-config-provider';
+
+disableJSDOM();
+
+const { DEFAULT } = FrontendApplicationConfig;
+
+describe('FrontendApplicationConfigProvider', function (): void {
+
+    before(() => disableJSDOM = enableJSDOM());
+    after(() => disableJSDOM());
+
+    it('should use defaults when calling `set`', function (): void {
+        FrontendApplicationConfigProvider.set({
+            applicationName: DEFAULT.applicationName + ' Something Else',
+        });
+        const config = FrontendApplicationConfigProvider.get();
+        // custom values
+        expect(config.applicationName).not.equal(DEFAULT.applicationName);
+        // defaults
+        expect(config.defaultIconTheme).equal(DEFAULT.defaultIconTheme);
+        expect(config.defaultTheme).deep.equal(DEFAULT.defaultTheme);
+        expect(config.electron.windowOptions).deep.equal(DEFAULT.electron.windowOptions);
+    });
+});

package/src/browser/frontend-application-config-provider.ts

@@ -1,50 +1,50 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { FrontendApplicationConfig, deepmerge } from '@theia/application-package/lib/application-props';
-
-export const DEFAULT_BACKGROUND_COLOR_STORAGE_KEY = 'theme.background';
-
-export class FrontendApplicationConfigProvider {
-
-    private static KEY = Symbol('FrontendApplicationConfigProvider');
-
-    static get(): FrontendApplicationConfig {
-        const config = FrontendApplicationConfigProvider.doGet();
-        if (config === undefined) {
-            throw new Error('The configuration is not set. Did you call FrontendApplicationConfigProvider#set?');
-        }
-        return config;
-    }
-
-    static set(config: FrontendApplicationConfig.Partial): void {
-        if (FrontendApplicationConfigProvider.doGet() !== undefined) {
-            throw new Error('The configuration is already set.');
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const globalObject = window as any;
-        const key = FrontendApplicationConfigProvider.KEY;
-        globalObject[key] = deepmerge(FrontendApplicationConfig.DEFAULT, config);
-    }
-
-    private static doGet(): FrontendApplicationConfig | undefined {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const globalObject = window as any;
-        const key = FrontendApplicationConfigProvider.KEY;
-        return globalObject[key];
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { FrontendApplicationConfig, deepmerge } from '@theia/application-package/lib/application-props';
+
+export const DEFAULT_BACKGROUND_COLOR_STORAGE_KEY = 'theme.background';
+
+export class FrontendApplicationConfigProvider {
+
+    private static KEY = Symbol('FrontendApplicationConfigProvider');
+
+    static get(): FrontendApplicationConfig {
+        const config = FrontendApplicationConfigProvider.doGet();
+        if (config === undefined) {
+            throw new Error('The configuration is not set. Did you call FrontendApplicationConfigProvider#set?');
+        }
+        return config;
+    }
+
+    static set(config: FrontendApplicationConfig.Partial): void {
+        if (FrontendApplicationConfigProvider.doGet() !== undefined) {
+            throw new Error('The configuration is already set.');
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const globalObject = window as any;
+        const key = FrontendApplicationConfigProvider.KEY;
+        globalObject[key] = deepmerge(FrontendApplicationConfig.DEFAULT, config);
+    }
+
+    private static doGet(): FrontendApplicationConfig | undefined {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const globalObject = window as any;
+        const key = FrontendApplicationConfigProvider.KEY;
+        return globalObject[key];
+    }
+
+}