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

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

@@ -1,55 +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
-        });
-    }
-
-}
+// *****************************************************************************
+// 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
+        });
+    }
+
+}

package/src/browser/language-service.ts

@@ -1,77 +1,77 @@
-// *****************************************************************************
-// 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 { injectable } from 'inversify';
-import { Disposable, Emitter, Event } from '../common';
-
-export interface Language {
-    readonly id: string;
-    readonly name: string;
-    readonly extensions: Set<string>;
-    readonly filenames: Set<string>;
-    readonly iconClass?: string;
-}
-
-@injectable()
-export class LanguageService {
-    protected readonly onDidChangeIconEmitter = new Emitter<DidChangeIconEvent>();
-
-    /**
-     * It should be implemented by an extension, e.g. by the monaco extension.
-     */
-    get languages(): Language[] {
-        return [];
-    }
-
-    /**
-     * It should be implemented by an extension, e.g. by the monaco extension.
-     */
-    getLanguage(languageId: string): Language | undefined {
-        return undefined;
-    }
-
-    /**
-     * It should be implemented by an extension, e.g. by the monaco extension.
-     */
-    detectLanguage(obj: unknown): Language | undefined {
-        return undefined;
-    }
-
-    /**
-     * It should be implemented by an extension, e.g. by the monaco extension.
-     */
-    registerIcon(languageId: string, iconClass: string): Disposable {
-        return Disposable.NULL;
-    }
-
-    /**
-     * It should be implemented by an extension, e.g. by the monaco extension.
-     */
-    getIcon(obj: unknown): string | undefined {
-        return undefined;
-    }
-
-    /**
-     * Emit when the icon of a particular language was changed.
-     */
-    get onDidChangeIcon(): Event<DidChangeIconEvent> {
-        return this.onDidChangeIconEmitter.event;
-    }
-}
-
-export interface DidChangeIconEvent {
-    languageId: string;
-}
+// *****************************************************************************
+// 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 { injectable } from 'inversify';
+import { Disposable, Emitter, Event } from '../common';
+
+export interface Language {
+    readonly id: string;
+    readonly name: string;
+    readonly extensions: Set<string>;
+    readonly filenames: Set<string>;
+    readonly iconClass?: string;
+}
+
+@injectable()
+export class LanguageService {
+    protected readonly onDidChangeIconEmitter = new Emitter<DidChangeIconEvent>();
+
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    get languages(): Language[] {
+        return [];
+    }
+
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    getLanguage(languageId: string): Language | undefined {
+        return undefined;
+    }
+
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    detectLanguage(obj: unknown): Language | undefined {
+        return undefined;
+    }
+
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    registerIcon(languageId: string, iconClass: string): Disposable {
+        return Disposable.NULL;
+    }
+
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    getIcon(obj: unknown): string | undefined {
+        return undefined;
+    }
+
+    /**
+     * Emit when the icon of a particular language was changed.
+     */
+    get onDidChangeIcon(): Event<DidChangeIconEvent> {
+        return this.onDidChangeIconEmitter.event;
+    }
+}
+
+export interface DidChangeIconEvent {
+    languageId: string;
+}

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

@@ -1,65 +1,65 @@
-// *****************************************************************************
-// 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 { ContainerModule, Container } from 'inversify';
-import { ILoggerServer, loggerPath, ConsoleLogger } from '../common/logger-protocol';
-import { ILogger, Logger, LoggerFactory, setRootLogger, LoggerName, rootLoggerName } from '../common/logger';
-import { LoggerWatcher } from '../common/logger-watcher';
-import { WebSocketConnectionProvider } from './messaging';
-import { FrontendApplicationContribution } from './frontend-application-contribution';
-import { EncodingError } from '../common/message-rpc/rpc-message-encoder';
-
-export const loggerFrontendModule = new ContainerModule(bind => {
-    bind(FrontendApplicationContribution).toDynamicValue(ctx => ({
-        initialize(): void {
-            setRootLogger(ctx.container.get<ILogger>(ILogger));
-        }
-    }));
-
-    bind(LoggerName).toConstantValue(rootLoggerName);
-    bind(ILogger).to(Logger).inSingletonScope().whenTargetIsDefault();
-    bind(LoggerWatcher).toSelf().inSingletonScope();
-    bind(ILoggerServer).toDynamicValue(ctx => {
-        const loggerWatcher = ctx.container.get(LoggerWatcher);
-        const connection = ctx.container.get(WebSocketConnectionProvider);
-        const target = connection.createProxy<ILoggerServer>(loggerPath, loggerWatcher.getLoggerClient());
-        function get<K extends keyof ILoggerServer>(_: ILoggerServer, property: K): ILoggerServer[K] | ILoggerServer['log'] {
-            if (property === 'log') {
-                return (name, logLevel, message, params) => {
-                    ConsoleLogger.log(name, logLevel, message, params);
-                    return target.log(name, logLevel, message, params).catch(err => {
-                        if (err instanceof EncodingError) {
-                            // In case of an EncodingError no RPC call is sent to the backend `ILoggerServer`. Nevertheless, we want to continue normally.
-                            return;
-                        }
-                        throw err;
-                    });
-                };
-            }
-            return target[property];
-        }
-        return new Proxy(target, { get });
-    }).inSingletonScope();
-    bind(LoggerFactory).toFactory(ctx =>
-        (name: string) => {
-            const child = new Container({ defaultScope: 'Singleton' });
-            child.parent = ctx.container;
-            child.bind(ILogger).to(Logger).inTransientScope();
-            child.bind(LoggerName).toConstantValue(name);
-            return child.get(ILogger);
-        }
-    );
-});
+// *****************************************************************************
+// 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 { ContainerModule, Container } from 'inversify';
+import { ILoggerServer, loggerPath, ConsoleLogger } from '../common/logger-protocol';
+import { ILogger, Logger, LoggerFactory, setRootLogger, LoggerName, rootLoggerName } from '../common/logger';
+import { LoggerWatcher } from '../common/logger-watcher';
+import { WebSocketConnectionProvider } from './messaging';
+import { FrontendApplicationContribution } from './frontend-application-contribution';
+import { EncodingError } from '../common/message-rpc/rpc-message-encoder';
+
+export const loggerFrontendModule = new ContainerModule(bind => {
+    bind(FrontendApplicationContribution).toDynamicValue(ctx => ({
+        initialize(): void {
+            setRootLogger(ctx.container.get<ILogger>(ILogger));
+        }
+    }));
+
+    bind(LoggerName).toConstantValue(rootLoggerName);
+    bind(ILogger).to(Logger).inSingletonScope().whenTargetIsDefault();
+    bind(LoggerWatcher).toSelf().inSingletonScope();
+    bind(ILoggerServer).toDynamicValue(ctx => {
+        const loggerWatcher = ctx.container.get(LoggerWatcher);
+        const connection = ctx.container.get(WebSocketConnectionProvider);
+        const target = connection.createProxy<ILoggerServer>(loggerPath, loggerWatcher.getLoggerClient());
+        function get<K extends keyof ILoggerServer>(_: ILoggerServer, property: K): ILoggerServer[K] | ILoggerServer['log'] {
+            if (property === 'log') {
+                return (name, logLevel, message, params) => {
+                    ConsoleLogger.log(name, logLevel, message, params);
+                    return target.log(name, logLevel, message, params).catch(err => {
+                        if (err instanceof EncodingError) {
+                            // In case of an EncodingError no RPC call is sent to the backend `ILoggerServer`. Nevertheless, we want to continue normally.
+                            return;
+                        }
+                        throw err;
+                    });
+                };
+            }
+            return target[property];
+        }
+        return new Proxy(target, { get });
+    }).inSingletonScope();
+    bind(LoggerFactory).toFactory(ctx =>
+        (name: string) => {
+            const child = new Container({ defaultScope: 'Singleton' });
+            child.parent = ctx.container;
+            child.bind(ILogger).to(Logger).inTransientScope();
+            child.bind(LoggerName).toConstantValue(name);
+            return child.get(ILogger);
+        }
+    );
+});

package/src/browser/markdown-rendering/markdown-renderer.ts

@@ -1,98 +1,98 @@
-// *****************************************************************************
-// Copyright (C) 2022 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 * as DOMPurify from 'dompurify';
-import { injectable, inject, postConstruct } from 'inversify';
-import * as markdownit from 'markdown-it';
-import { MarkdownString } from '../../common/markdown-rendering/markdown-string';
-import { Disposable, DisposableGroup } from '../../common';
-import { LabelParser } from '../label-parser';
-import { codicon } from '../widgets';
-
-// #region Copied from Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/base/browser/formattedTextRenderer.ts
-export interface ContentActionHandler {
-    callback: (content: string, event?: MouseEvent | KeyboardEvent) => void;
-    readonly disposables: DisposableGroup;
-}
-
-export interface FormattedTextRenderOptions {
-    readonly className?: string;
-    readonly inline?: boolean;
-    readonly actionHandler?: ContentActionHandler;
-    readonly renderCodeSegments?: boolean;
-}
-
-// #endregion
-
-// #region Copied from Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/base/browser/markdownRenderer.ts
-
-export interface MarkdownRenderResult extends Disposable {
-    element: HTMLElement;
-}
-
-export interface MarkdownRenderOptions extends FormattedTextRenderOptions {
-    readonly codeBlockRenderer?: (languageId: string, value: string) => Promise<HTMLElement>;
-    readonly asyncRenderCallback?: () => void;
-}
-
-// #endregion
-
-/** Use this directly if you aren't worried about circular dependencies in the Shell */
-export const MarkdownRenderer = Symbol('MarkdownRenderer');
-export interface MarkdownRenderer {
-    render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions): MarkdownRenderResult;
-}
-
-/** Use this to avoid circular dependencies in the Shell */
-export const MarkdownRendererFactory = Symbol('MarkdownRendererFactory');
-export interface MarkdownRendererFactory {
-    (): MarkdownRenderer;
-}
-
-@injectable()
-export class MarkdownRendererImpl implements MarkdownRenderer {
-    @inject(LabelParser) protected readonly labelParser: LabelParser;
-    protected readonly markdownIt = markdownit();
-    protected resetRenderer: Disposable | undefined;
-
-    @postConstruct()
-    protected init(): void {
-        this.markdownItPlugin();
-    }
-
-    render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions): MarkdownRenderResult {
-        const host = document.createElement('div');
-        if (markdown) {
-            const html = this.markdownIt.render(markdown.value);
-            host.innerHTML = DOMPurify.sanitize(html, {
-                ALLOW_UNKNOWN_PROTOCOLS: true // DOMPurify usually strips non http(s) links from hrefs
-            });
-        }
-        return { element: host, dispose: () => { } };
-    }
-
-    protected markdownItPlugin(): void {
-        this.markdownIt.renderer.rules.text = (tokens, idx) => {
-            const content = tokens[idx].content;
-            return this.labelParser.parse(content).map(chunk => {
-                if (typeof chunk === 'string') {
-                    return chunk;
-                }
-                return `<i class="${codicon(chunk.name)} ${chunk.animation ? `fa-${chunk.animation}` : ''} icon-inline"></i>`;
-            }).join('');
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 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 * as DOMPurify from 'dompurify';
+import { injectable, inject, postConstruct } from 'inversify';
+import * as markdownit from 'markdown-it';
+import { MarkdownString } from '../../common/markdown-rendering/markdown-string';
+import { Disposable, DisposableGroup } from '../../common';
+import { LabelParser } from '../label-parser';
+import { codicon } from '../widgets';
+
+// #region Copied from Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/base/browser/formattedTextRenderer.ts
+export interface ContentActionHandler {
+    callback: (content: string, event?: MouseEvent | KeyboardEvent) => void;
+    readonly disposables: DisposableGroup;
+}
+
+export interface FormattedTextRenderOptions {
+    readonly className?: string;
+    readonly inline?: boolean;
+    readonly actionHandler?: ContentActionHandler;
+    readonly renderCodeSegments?: boolean;
+}
+
+// #endregion
+
+// #region Copied from Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/base/browser/markdownRenderer.ts
+
+export interface MarkdownRenderResult extends Disposable {
+    element: HTMLElement;
+}
+
+export interface MarkdownRenderOptions extends FormattedTextRenderOptions {
+    readonly codeBlockRenderer?: (languageId: string, value: string) => Promise<HTMLElement>;
+    readonly asyncRenderCallback?: () => void;
+}
+
+// #endregion
+
+/** Use this directly if you aren't worried about circular dependencies in the Shell */
+export const MarkdownRenderer = Symbol('MarkdownRenderer');
+export interface MarkdownRenderer {
+    render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions): MarkdownRenderResult;
+}
+
+/** Use this to avoid circular dependencies in the Shell */
+export const MarkdownRendererFactory = Symbol('MarkdownRendererFactory');
+export interface MarkdownRendererFactory {
+    (): MarkdownRenderer;
+}
+
+@injectable()
+export class MarkdownRendererImpl implements MarkdownRenderer {
+    @inject(LabelParser) protected readonly labelParser: LabelParser;
+    protected readonly markdownIt = markdownit();
+    protected resetRenderer: Disposable | undefined;
+
+    @postConstruct()
+    protected init(): void {
+        this.markdownItPlugin();
+    }
+
+    render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions): MarkdownRenderResult {
+        const host = document.createElement('div');
+        if (markdown) {
+            const html = this.markdownIt.render(markdown.value);
+            host.innerHTML = DOMPurify.sanitize(html, {
+                ALLOW_UNKNOWN_PROTOCOLS: true // DOMPurify usually strips non http(s) links from hrefs
+            });
+        }
+        return { element: host, dispose: () => { } };
+    }
+
+    protected markdownItPlugin(): void {
+        this.markdownIt.renderer.rules.text = (tokens, idx) => {
+            const content = tokens[idx].content;
+            return this.labelParser.parse(content).map(chunk => {
+                if (typeof chunk === 'string') {
+                    return chunk;
+                }
+                return `<i class="${codicon(chunk.name)} ${chunk.animation ? `fa-${chunk.animation}` : ''} icon-inline"></i>`;
+            }).join('');
+        };
+    }
+}