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

package/src/browser/preload/preloader.ts

@@ -1,37 +1,37 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { MaybePromise } from '../../common/types';
-import { inject, injectable, interfaces, named } from 'inversify';
-import { ContributionProvider } from '../../common/contribution-provider';
-
-export const PreloadContribution = Symbol('PreloadContribution') as symbol & interfaces.Abstract<PreloadContribution>;
-
-export interface PreloadContribution {
-    initialize(): MaybePromise<void>;
-}
-
-@injectable()
-export class Preloader {
-
-    @inject(ContributionProvider) @named(PreloadContribution)
-    protected readonly contributions: ContributionProvider<PreloadContribution>;
-
-    async initialize(): Promise<void> {
-        await Promise.allSettled(this.contributions.getContributions().map(contrib => contrib.initialize()));
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2023 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 { MaybePromise } from '../../common/types';
+import { inject, injectable, interfaces, named } from 'inversify';
+import { ContributionProvider } from '../../common/contribution-provider';
+
+export const PreloadContribution = Symbol('PreloadContribution') as symbol & interfaces.Abstract<PreloadContribution>;
+
+export interface PreloadContribution {
+    initialize(): MaybePromise<void>;
+}
+
+@injectable()
+export class Preloader {
+
+    @inject(ContributionProvider) @named(PreloadContribution)
+    protected readonly contributions: ContributionProvider<PreloadContribution>;
+
+    async initialize(): Promise<void> {
+        await Promise.allSettled(this.contributions.getContributions().map(contrib => contrib.initialize()));
+    }
+
+}

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

@@ -1,31 +1,31 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { PreloadContribution } from './preloader';
-import { DEFAULT_BACKGROUND_COLOR_STORAGE_KEY } from '../frontend-application-config-provider';
-import { injectable } from 'inversify';
-import { DefaultTheme } from '@theia/application-package/lib/application-props';
-
-@injectable()
-export class ThemePreloadContribution implements PreloadContribution {
-
-    initialize(): void {
-        const dark = window.matchMedia?.('(prefers-color-scheme: dark)').matches;
-        const value = window.localStorage.getItem(DEFAULT_BACKGROUND_COLOR_STORAGE_KEY) || DefaultTheme.defaultBackgroundColor(dark);
-        document.documentElement.style.setProperty('--theia-editor-background', value);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2023 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 { PreloadContribution } from './preloader';
+import { DEFAULT_BACKGROUND_COLOR_STORAGE_KEY } from '../frontend-application-config-provider';
+import { injectable } from 'inversify';
+import { DefaultTheme } from '@theia/application-package/lib/application-props';
+
+@injectable()
+export class ThemePreloadContribution implements PreloadContribution {
+
+    initialize(): void {
+        const dark = window.matchMedia?.('(prefers-color-scheme: dark)').matches;
+        const value = window.localStorage.getItem(DEFAULT_BACKGROUND_COLOR_STORAGE_KEY) || DefaultTheme.defaultBackgroundColor(dark);
+        document.documentElement.style.setProperty('--theia-editor-background', value);
+    }
+
+}

package/src/browser/progress-bar-factory.ts

@@ -1,29 +1,29 @@
-// *****************************************************************************
-// 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 { ProgressBar } from './progress-bar';
-
-export const ProgressBarFactory = Symbol('ProgressBarFactory');
-export interface ProgressBarFactory {
-    (options: ProgressBarOptions): ProgressBar;
-}
-
-export const ProgressBarOptions = Symbol('ProgressBarOptions');
-export interface ProgressBarOptions {
-    locationId: string;
-    container: HTMLElement;
-    insertMode: 'append' | 'prepend';
-}
+// *****************************************************************************
+// 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 { ProgressBar } from './progress-bar';
+
+export const ProgressBarFactory = Symbol('ProgressBarFactory');
+export interface ProgressBarFactory {
+    (options: ProgressBarOptions): ProgressBar;
+}
+
+export const ProgressBarOptions = Symbol('ProgressBarOptions');
+export interface ProgressBarOptions {
+    locationId: string;
+    container: HTMLElement;
+    insertMode: 'append' | 'prepend';
+}

package/src/browser/progress-bar.ts

@@ -1,76 +1,76 @@
-// *****************************************************************************
-// 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 { LocationProgress, ProgressLocationService } from './progress-location-service';
-import { DisposableCollection, Disposable } from '../common';
-import { injectable, inject, postConstruct } from 'inversify';
-import { ProgressBarOptions } from './progress-bar-factory';
-
-@injectable()
-export class ProgressBar implements Disposable {
-
-    @inject(ProgressLocationService)
-    protected readonly progressLocationService: ProgressLocationService;
-
-    @inject(ProgressBarOptions)
-    protected readonly options: ProgressBarOptions;
-
-    protected readonly toDispose = new DisposableCollection();
-    dispose(): void {
-        this.toDispose.dispose();
-    }
-
-    protected progressBar: HTMLDivElement;
-    protected progressBarContainer: HTMLDivElement;
-
-    constructor() {
-        this.progressBar = document.createElement('div');
-        this.progressBar.className = 'theia-progress-bar';
-        this.progressBar.style.display = 'none';
-        this.progressBarContainer = document.createElement('div');
-        this.progressBarContainer.className = 'theia-progress-bar-container';
-        this.progressBarContainer.append(this.progressBar);
-    }
-
-    @postConstruct()
-    protected init(): void {
-        const { container, insertMode, locationId } = this.options;
-        if (insertMode === 'prepend') {
-            container.prepend(this.progressBarContainer);
-        } else {
-            container.append(this.progressBarContainer);
-        }
-        this.toDispose.push(Disposable.create(() => this.progressBarContainer.remove()));
-        const onProgress = this.progressLocationService.onProgress(locationId);
-        this.toDispose.push(onProgress(event => this.onProgress(event)));
-        const current = this.progressLocationService.getProgress(locationId);
-        if (current) {
-            this.onProgress(current);
-        }
-    }
-
-    protected onProgress(event: LocationProgress): void {
-        if (this.toDispose.disposed) {
-            return;
-        }
-        this.setVisible(event.show);
-    }
-
-    protected setVisible(visible: boolean): void {
-        this.progressBar.style.display = visible ? 'block' : 'none';
-    }
-
-}
+// *****************************************************************************
+// 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 { LocationProgress, ProgressLocationService } from './progress-location-service';
+import { DisposableCollection, Disposable } from '../common';
+import { injectable, inject, postConstruct } from 'inversify';
+import { ProgressBarOptions } from './progress-bar-factory';
+
+@injectable()
+export class ProgressBar implements Disposable {
+
+    @inject(ProgressLocationService)
+    protected readonly progressLocationService: ProgressLocationService;
+
+    @inject(ProgressBarOptions)
+    protected readonly options: ProgressBarOptions;
+
+    protected readonly toDispose = new DisposableCollection();
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+    protected progressBar: HTMLDivElement;
+    protected progressBarContainer: HTMLDivElement;
+
+    constructor() {
+        this.progressBar = document.createElement('div');
+        this.progressBar.className = 'theia-progress-bar';
+        this.progressBar.style.display = 'none';
+        this.progressBarContainer = document.createElement('div');
+        this.progressBarContainer.className = 'theia-progress-bar-container';
+        this.progressBarContainer.append(this.progressBar);
+    }
+
+    @postConstruct()
+    protected init(): void {
+        const { container, insertMode, locationId } = this.options;
+        if (insertMode === 'prepend') {
+            container.prepend(this.progressBarContainer);
+        } else {
+            container.append(this.progressBarContainer);
+        }
+        this.toDispose.push(Disposable.create(() => this.progressBarContainer.remove()));
+        const onProgress = this.progressLocationService.onProgress(locationId);
+        this.toDispose.push(onProgress(event => this.onProgress(event)));
+        const current = this.progressLocationService.getProgress(locationId);
+        if (current) {
+            this.onProgress(current);
+        }
+    }
+
+    protected onProgress(event: LocationProgress): void {
+        if (this.toDispose.disposed) {
+            return;
+        }
+        this.setVisible(event.show);
+    }
+
+    protected setVisible(visible: boolean): void {
+        this.progressBar.style.display = visible ? 'block' : 'none';
+    }
+
+}

package/src/browser/progress-client.ts

@@ -1,53 +1,53 @@
-// *****************************************************************************
-// 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 { injectable, inject } from 'inversify';
-import { CancellationToken } from '../common/cancellation';
-import { ProgressClient } from '../common/progress-service-protocol';
-import { ProgressMessage, ProgressUpdate } from '../common/message-service-protocol';
-import { ProgressStatusBarItem } from './progress-status-bar-item';
-import { ProgressLocationService } from './progress-location-service';
-
-@injectable()
-export class DispatchingProgressClient implements ProgressClient {
-
-    @inject(ProgressStatusBarItem)
-    protected statusBarItem: ProgressStatusBarItem;
-
-    @inject(ProgressLocationService)
-    protected locationService: ProgressLocationService;
-
-    showProgress(progressId: string, message: ProgressMessage, cancellationToken: CancellationToken): Promise<string | undefined> {
-        const locationId = this.getLocationId(message);
-        if (locationId === 'window') {
-            return this.statusBarItem.showProgress(progressId, message, cancellationToken);
-        }
-        return this.locationService.showProgress(progressId, message, cancellationToken);
-    }
-
-    reportProgress(progressId: string, update: ProgressUpdate, message: ProgressMessage, cancellationToken: CancellationToken): Promise<void> {
-        const locationId = this.getLocationId(message);
-        if (locationId === 'window') {
-            return this.statusBarItem.reportProgress(progressId, update, message, cancellationToken);
-        }
-        return this.locationService.reportProgress(progressId, update, message, cancellationToken);
-    }
-
-    protected getLocationId(message: ProgressMessage): string {
-        return message.options && message.options.location || 'unknownLocation';
-    }
-
-}
+// *****************************************************************************
+// 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 { injectable, inject } from 'inversify';
+import { CancellationToken } from '../common/cancellation';
+import { ProgressClient } from '../common/progress-service-protocol';
+import { ProgressMessage, ProgressUpdate } from '../common/message-service-protocol';
+import { ProgressStatusBarItem } from './progress-status-bar-item';
+import { ProgressLocationService } from './progress-location-service';
+
+@injectable()
+export class DispatchingProgressClient implements ProgressClient {
+
+    @inject(ProgressStatusBarItem)
+    protected statusBarItem: ProgressStatusBarItem;
+
+    @inject(ProgressLocationService)
+    protected locationService: ProgressLocationService;
+
+    showProgress(progressId: string, message: ProgressMessage, cancellationToken: CancellationToken): Promise<string | undefined> {
+        const locationId = this.getLocationId(message);
+        if (locationId === 'window') {
+            return this.statusBarItem.showProgress(progressId, message, cancellationToken);
+        }
+        return this.locationService.showProgress(progressId, message, cancellationToken);
+    }
+
+    reportProgress(progressId: string, update: ProgressUpdate, message: ProgressMessage, cancellationToken: CancellationToken): Promise<void> {
+        const locationId = this.getLocationId(message);
+        if (locationId === 'window') {
+            return this.statusBarItem.reportProgress(progressId, update, message, cancellationToken);
+        }
+        return this.locationService.reportProgress(progressId, update, message, cancellationToken);
+    }
+
+    protected getLocationId(message: ProgressMessage): string {
+        return message.options && message.options.location || 'unknownLocation';
+    }
+
+}

package/src/browser/progress-location-service.spec.ts

@@ -1,50 +1,50 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 { expect } from 'chai';
-import { ProgressLocationService } from './progress-location-service';
-import { CancellationTokenSource } from '../common';
-
-describe('progress-location-service', () => {
-
-    const EXP = 'exp';
-    const SCM = 'scm';
-    const FOO = 'foo';
-
-    it('done event should be fired for multiple progress locations – bug #7311', async () => {
-        const eventLog = new Array<string>();
-        const logEvent = (location: string, show: boolean) => eventLog.push(`${location} show: ${show}`);
-
-        const service = new ProgressLocationService();
-
-        [EXP, SCM, FOO].map(location => {
-            service.onProgress(location)(e => logEvent(location, e.show));
-            const progressToken = new CancellationTokenSource();
-            service.showProgress(`progress-${location}-${Date.now()}`, { text: '', options: { location } }, progressToken.token);
-            return progressToken;
-        }).forEach(t => t.cancel());
-
-        expect(eventLog.join('\n')).eq(`
-exp show: true
-scm show: true
-foo show: true
-exp show: false
-scm show: false
-foo show: false
-        `.trim());
-    });
-
-});
+// *****************************************************************************
+// Copyright (C) 2020 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 { expect } from 'chai';
+import { ProgressLocationService } from './progress-location-service';
+import { CancellationTokenSource } from '../common';
+
+describe('progress-location-service', () => {
+
+    const EXP = 'exp';
+    const SCM = 'scm';
+    const FOO = 'foo';
+
+    it('done event should be fired for multiple progress locations – bug #7311', async () => {
+        const eventLog = new Array<string>();
+        const logEvent = (location: string, show: boolean) => eventLog.push(`${location} show: ${show}`);
+
+        const service = new ProgressLocationService();
+
+        [EXP, SCM, FOO].map(location => {
+            service.onProgress(location)(e => logEvent(location, e.show));
+            const progressToken = new CancellationTokenSource();
+            service.showProgress(`progress-${location}-${Date.now()}`, { text: '', options: { location } }, progressToken.token);
+            return progressToken;
+        }).forEach(t => t.cancel());
+
+        expect(eventLog.join('\n')).eq(`
+exp show: true
+scm show: true
+foo show: true
+exp show: false
+scm show: false
+foo show: false
+        `.trim());
+    });
+
+});