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

package/src/common/label-protocol.ts

@@ -1,35 +1,35 @@
-// *****************************************************************************
-// Copyright (C) 2020 Red Hat, Inc. 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
-// *****************************************************************************
-
-// copied and modified from https://github.com/microsoft/vscode/blob/1.44.2/src/vs/platform/label/common/label.ts#L35-L49
-/*---------------------------------------------------------------------------------------------
-*  Copyright (c) Microsoft Corporation. All rights reserved.
-*  Licensed under the MIT License. See License.txt in the project root for license information.
-*--------------------------------------------------------------------------------------------*/
-export interface ResourceLabelFormatter {
-    scheme: string;
-    authority?: string;
-    priority?: boolean;
-    formatting: ResourceLabelFormatting;
-}
-
-export interface ResourceLabelFormatting {
-    label: string; // myLabel:/${path}
-    separator: '/' | '\\' | '';
-    tildify?: boolean;
-    normalizeDriveLetter?: boolean;
-    authorityPrefix?: string;
-}
+// *****************************************************************************
+// Copyright (C) 2020 Red Hat, Inc. 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
+// *****************************************************************************
+
+// copied and modified from https://github.com/microsoft/vscode/blob/1.44.2/src/vs/platform/label/common/label.ts#L35-L49
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+export interface ResourceLabelFormatter {
+    scheme: string;
+    authority?: string;
+    priority?: boolean;
+    formatting: ResourceLabelFormatting;
+}
+
+export interface ResourceLabelFormatting {
+    label: string; // myLabel:/${path}
+    separator: '/' | '\\' | '';
+    tildify?: boolean;
+    normalizeDriveLetter?: boolean;
+    authorityPrefix?: string;
+}

package/src/common/logger-protocol.ts

@@ -1,119 +1,119 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 { injectable } from 'inversify';
-import { RpcServer } from './messaging/proxy-factory';
-
-export const ILoggerServer = Symbol('ILoggerServer');
-
-export const loggerPath = '/services/logger';
-
-export interface ILoggerServer extends RpcServer<ILoggerClient> {
-    setLogLevel(name: string, logLevel: number): Promise<void>;
-    getLogLevel(name: string): Promise<number>;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    log(name: string, logLevel: number, message: any, params: any[]): Promise<void>;
-    child(name: string): Promise<void>;
-}
-
-export const ILoggerClient = Symbol('ILoggerClient');
-
-export interface ILogLevelChangedEvent {
-    loggerName: string;
-    newLogLevel: number;
-}
-
-export interface ILoggerClient {
-    onLogLevelChanged(event: ILogLevelChangedEvent): void;
-    onLogConfigChanged(): void;
-}
-
-@injectable()
-export class DispatchingLoggerClient implements ILoggerClient {
-
-    readonly clients = new Set<ILoggerClient>();
-
-    onLogLevelChanged(event: ILogLevelChangedEvent): void {
-        this.clients.forEach(client => client.onLogLevelChanged(event));
-    }
-
-    onLogConfigChanged(): void {
-        this.clients.forEach(client => client.onLogConfigChanged());
-    }
-}
-
-export const rootLoggerName = 'root';
-
-export enum LogLevel {
-    FATAL = 60,
-    ERROR = 50,
-    WARN = 40,
-    INFO = 30,
-    DEBUG = 20,
-    TRACE = 10
-}
-export namespace LogLevel {
-    export const strings = new Map<LogLevel, string>([
-        [LogLevel.FATAL, 'fatal'],
-        [LogLevel.ERROR, 'error'],
-        [LogLevel.WARN, 'warn'],
-        [LogLevel.INFO, 'info'],
-        [LogLevel.DEBUG, 'debug'],
-        [LogLevel.TRACE, 'trace']
-    ]);
-
-    export function toString(level: LogLevel): string | undefined {
-        return strings.get(level);
-    }
-
-    export function fromString(levelStr: string): LogLevel | undefined {
-        for (const pair of strings) {
-            if (pair[1] === levelStr) {
-                return pair[0];
-            }
-        }
-
-        return undefined;
-    }
-}
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export namespace ConsoleLogger {
-    type Console = (message?: any, ...optionalParams: any[]) => void;
-    const originalConsoleLog = console.log;
-    const consoles = new Map<LogLevel, Console>([
-        [LogLevel.FATAL, console.error],
-        [LogLevel.ERROR, console.error],
-        [LogLevel.WARN, console.warn],
-        [LogLevel.INFO, console.info],
-        [LogLevel.DEBUG, console.debug],
-        [LogLevel.TRACE, console.trace]
-    ]);
-    export function reset(): void {
-        console.error = consoles.get(LogLevel.ERROR)!;
-        console.warn = consoles.get(LogLevel.WARN)!;
-        console.info = consoles.get(LogLevel.INFO)!;
-        console.debug = consoles.get(LogLevel.DEBUG)!;
-        console.trace = consoles.get(LogLevel.TRACE)!;
-        console.log = originalConsoleLog;
-    }
-    export function log(name: string, logLevel: number, message: string, params: any[]): void {
-        const console = consoles.get(logLevel) || originalConsoleLog;
-        const severity = (LogLevel.strings.get(logLevel) || 'unknown').toUpperCase();
-        const now = new Date();
-        console(`${now.toISOString()} ${name} ${severity} ${message}`, ...params);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 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 { injectable } from 'inversify';
+import { RpcServer } from './messaging/proxy-factory';
+
+export const ILoggerServer = Symbol('ILoggerServer');
+
+export const loggerPath = '/services/logger';
+
+export interface ILoggerServer extends RpcServer<ILoggerClient> {
+    setLogLevel(name: string, logLevel: number): Promise<void>;
+    getLogLevel(name: string): Promise<number>;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    log(name: string, logLevel: number, message: any, params: any[]): Promise<void>;
+    child(name: string): Promise<void>;
+}
+
+export const ILoggerClient = Symbol('ILoggerClient');
+
+export interface ILogLevelChangedEvent {
+    loggerName: string;
+    newLogLevel: number;
+}
+
+export interface ILoggerClient {
+    onLogLevelChanged(event: ILogLevelChangedEvent): void;
+    onLogConfigChanged(): void;
+}
+
+@injectable()
+export class DispatchingLoggerClient implements ILoggerClient {
+
+    readonly clients = new Set<ILoggerClient>();
+
+    onLogLevelChanged(event: ILogLevelChangedEvent): void {
+        this.clients.forEach(client => client.onLogLevelChanged(event));
+    }
+
+    onLogConfigChanged(): void {
+        this.clients.forEach(client => client.onLogConfigChanged());
+    }
+}
+
+export const rootLoggerName = 'root';
+
+export enum LogLevel {
+    FATAL = 60,
+    ERROR = 50,
+    WARN = 40,
+    INFO = 30,
+    DEBUG = 20,
+    TRACE = 10
+}
+export namespace LogLevel {
+    export const strings = new Map<LogLevel, string>([
+        [LogLevel.FATAL, 'fatal'],
+        [LogLevel.ERROR, 'error'],
+        [LogLevel.WARN, 'warn'],
+        [LogLevel.INFO, 'info'],
+        [LogLevel.DEBUG, 'debug'],
+        [LogLevel.TRACE, 'trace']
+    ]);
+
+    export function toString(level: LogLevel): string | undefined {
+        return strings.get(level);
+    }
+
+    export function fromString(levelStr: string): LogLevel | undefined {
+        for (const pair of strings) {
+            if (pair[1] === levelStr) {
+                return pair[0];
+            }
+        }
+
+        return undefined;
+    }
+}
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export namespace ConsoleLogger {
+    type Console = (message?: any, ...optionalParams: any[]) => void;
+    const originalConsoleLog = console.log;
+    const consoles = new Map<LogLevel, Console>([
+        [LogLevel.FATAL, console.error],
+        [LogLevel.ERROR, console.error],
+        [LogLevel.WARN, console.warn],
+        [LogLevel.INFO, console.info],
+        [LogLevel.DEBUG, console.debug],
+        [LogLevel.TRACE, console.trace]
+    ]);
+    export function reset(): void {
+        console.error = consoles.get(LogLevel.ERROR)!;
+        console.warn = consoles.get(LogLevel.WARN)!;
+        console.info = consoles.get(LogLevel.INFO)!;
+        console.debug = consoles.get(LogLevel.DEBUG)!;
+        console.trace = consoles.get(LogLevel.TRACE)!;
+        console.log = originalConsoleLog;
+    }
+    export function log(name: string, logLevel: number, message: string, params: any[]): void {
+        const console = consoles.get(logLevel) || originalConsoleLog;
+        const severity = (LogLevel.strings.get(logLevel) || 'unknown').toUpperCase();
+        const now = new Date();
+        console(`${now.toISOString()} ${name} ${severity} ${message}`, ...params);
+    }
+}

package/src/common/logger-watcher.ts

@@ -1,48 +1,48 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 { injectable } from 'inversify';
-import { Emitter, Event } from './event';
-import { ILoggerClient, ILogLevelChangedEvent } from './logger-protocol';
-
-@injectable()
-export class LoggerWatcher {
-
-    getLoggerClient(): ILoggerClient {
-        const logLevelEmitter = this.onLogLevelChangedEmitter;
-        const logConfigEmitter = this.onLogConfigChangedEmitter;
-        return {
-            onLogLevelChanged(event: ILogLevelChangedEvent): void {
-                logLevelEmitter.fire(event);
-            },
-            onLogConfigChanged(): void {
-                logConfigEmitter.fire();
-            },
-        };
-    }
-
-    protected onLogLevelChangedEmitter = new Emitter<ILogLevelChangedEvent>();
-
-    get onLogLevelChanged(): Event<ILogLevelChangedEvent> {
-        return this.onLogLevelChangedEmitter.event;
-    }
-
-    protected onLogConfigChangedEmitter = new Emitter<void>();
-
-    get onLogConfigChanged(): Event<void> {
-        return this.onLogConfigChangedEmitter.event;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 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 { injectable } from 'inversify';
+import { Emitter, Event } from './event';
+import { ILoggerClient, ILogLevelChangedEvent } from './logger-protocol';
+
+@injectable()
+export class LoggerWatcher {
+
+    getLoggerClient(): ILoggerClient {
+        const logLevelEmitter = this.onLogLevelChangedEmitter;
+        const logConfigEmitter = this.onLogConfigChangedEmitter;
+        return {
+            onLogLevelChanged(event: ILogLevelChangedEvent): void {
+                logLevelEmitter.fire(event);
+            },
+            onLogConfigChanged(): void {
+                logConfigEmitter.fire();
+            },
+        };
+    }
+
+    protected onLogLevelChangedEmitter = new Emitter<ILogLevelChangedEvent>();
+
+    get onLogLevelChanged(): Event<ILogLevelChangedEvent> {
+        return this.onLogLevelChangedEmitter.event;
+    }
+
+    protected onLogConfigChangedEmitter = new Emitter<void>();
+
+    get onLogConfigChanged(): Event<void> {
+        return this.onLogConfigChangedEmitter.event;
+    }
+}

package/src/common/logger.spec.ts

@@ -1,46 +1,46 @@
-// *****************************************************************************
-// 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 { expect } from 'chai';
-import { MockLogger } from './test/mock-logger';
-import { setRootLogger, unsetRootLogger } from './logger';
-
-describe('logger', () => {
-
-    it('window is not defined', () => {
-        expect(() => { window; }).to.throw(ReferenceError, /window is not defined/);
-    });
-
-    it('window is not defined when converting to boolean', () => {
-        expect(() => { !!window; }).to.throw(ReferenceError, /window is not defined/);
-    });
-
-    it('window is not defined safe', () => {
-        expect(() => { typeof window !== 'undefined'; }).to.not.throw(ReferenceError);
-    });
-
-    it('setting the root logger should not throw an error when the window is not defined', () => {
-        expect(() => {
-            try {
-                setRootLogger(new MockLogger());
-            } finally {
-                unsetRootLogger();
-            }
-        }
-        ).to.not.throw(ReferenceError);
-    });
-
-});
+// *****************************************************************************
+// 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 { expect } from 'chai';
+import { MockLogger } from './test/mock-logger';
+import { setRootLogger, unsetRootLogger } from './logger';
+
+describe('logger', () => {
+
+    it('window is not defined', () => {
+        expect(() => { window; }).to.throw(ReferenceError, /window is not defined/);
+    });
+
+    it('window is not defined when converting to boolean', () => {
+        expect(() => { !!window; }).to.throw(ReferenceError, /window is not defined/);
+    });
+
+    it('window is not defined safe', () => {
+        expect(() => { typeof window !== 'undefined'; }).to.not.throw(ReferenceError);
+    });
+
+    it('setting the root logger should not throw an error when the window is not defined', () => {
+        expect(() => {
+            try {
+                setRootLogger(new MockLogger());
+            } finally {
+                unsetRootLogger();
+            }
+        }
+        ).to.not.throw(ReferenceError);
+    });
+
+});