@theia/plugin-ext 1.34.2 → 1.34.3

package/src/main/browser/custom-editors/custom-editor-opener.tsx

@@ -1,105 +1,105 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { inject } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { ApplicationShell, OpenHandler, Widget, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
-import { CustomEditor, CustomEditorPriority, CustomEditorSelector } from '../../../common';
-import { CustomEditorWidget } from './custom-editor-widget';
-import { v4 } from 'uuid';
-import { Emitter } from '@theia/core';
-import { match } from '@theia/core/lib/common/glob';
-
-export class CustomEditorOpener implements OpenHandler {
-
-    readonly id: string;
-    readonly label: string;
-
-    private readonly onDidOpenCustomEditorEmitter = new Emitter<[CustomEditorWidget, WidgetOpenerOptions?]>();
-    readonly onDidOpenCustomEditor = this.onDidOpenCustomEditorEmitter.event;
-
-    constructor(
-        private readonly editor: CustomEditor,
-        @inject(ApplicationShell) protected readonly shell: ApplicationShell,
-        @inject(WidgetManager) protected readonly widgetManager: WidgetManager
-    ) {
-        this.id = CustomEditorOpener.toCustomEditorId(this.editor.viewType);
-        this.label = this.editor.displayName;
-    }
-
-    static toCustomEditorId(editorViewType: string): string {
-        return `custom-editor-${editorViewType}`;
-    }
-
-    canHandle(uri: URI): number {
-        if (this.matches(this.editor.selector, uri)) {
-            return this.getPriority();
-        }
-        return 0;
-    }
-
-    getPriority(): number {
-        switch (this.editor.priority) {
-            case CustomEditorPriority.default: return 500;
-            case CustomEditorPriority.builtin: return 400;
-            /** `option` should not open the custom-editor by default. */
-            case CustomEditorPriority.option: return 1;
-            default: return 200;
-        }
-    }
-
-    protected readonly pendingWidgetPromises = new Map<string, Promise<CustomEditorWidget>>();
-    async open(uri: URI, options?: WidgetOpenerOptions): Promise<Widget | undefined> {
-        let widget: CustomEditorWidget | undefined;
-        const widgets = this.widgetManager.getWidgets(CustomEditorWidget.FACTORY_ID) as CustomEditorWidget[];
-        widget = widgets.find(w => w.viewType === this.editor.viewType && w.resource.toString() === uri.toString());
-
-        if (widget?.isVisible) {
-            return this.shell.revealWidget(widget.id);
-        }
-        if (widget?.isAttached) {
-            return this.shell.activateWidget(widget.id);
-        }
-        if (!widget) {
-            const uriString = uri.toString();
-            let widgetPromise = this.pendingWidgetPromises.get(uriString);
-            if (!widgetPromise) {
-                const id = v4();
-                widgetPromise = this.widgetManager.getOrCreateWidget<CustomEditorWidget>(CustomEditorWidget.FACTORY_ID, { id });
-                this.pendingWidgetPromises.set(uriString, widgetPromise);
-                widget = await widgetPromise;
-                this.pendingWidgetPromises.delete(uriString);
-                widget.viewType = this.editor.viewType;
-                widget.resource = uri;
-                this.onDidOpenCustomEditorEmitter.fire([widget, options]);
-            }
-        }
-        return widget;
-    }
-
-    matches(selectors: CustomEditorSelector[], resource: URI): boolean {
-        return selectors.some(selector => this.selectorMatches(selector, resource));
-    }
-
-    selectorMatches(selector: CustomEditorSelector, resource: URI): boolean {
-        if (selector.filenamePattern) {
-            if (match(selector.filenamePattern.toLowerCase(), resource.path.name.toLowerCase() + resource.path.ext.toLowerCase())) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { ApplicationShell, OpenHandler, Widget, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
+import { CustomEditor, CustomEditorPriority, CustomEditorSelector } from '../../../common';
+import { CustomEditorWidget } from './custom-editor-widget';
+import { v4 } from 'uuid';
+import { Emitter } from '@theia/core';
+import { match } from '@theia/core/lib/common/glob';
+
+export class CustomEditorOpener implements OpenHandler {
+
+    readonly id: string;
+    readonly label: string;
+
+    private readonly onDidOpenCustomEditorEmitter = new Emitter<[CustomEditorWidget, WidgetOpenerOptions?]>();
+    readonly onDidOpenCustomEditor = this.onDidOpenCustomEditorEmitter.event;
+
+    constructor(
+        private readonly editor: CustomEditor,
+        @inject(ApplicationShell) protected readonly shell: ApplicationShell,
+        @inject(WidgetManager) protected readonly widgetManager: WidgetManager
+    ) {
+        this.id = CustomEditorOpener.toCustomEditorId(this.editor.viewType);
+        this.label = this.editor.displayName;
+    }
+
+    static toCustomEditorId(editorViewType: string): string {
+        return `custom-editor-${editorViewType}`;
+    }
+
+    canHandle(uri: URI): number {
+        if (this.matches(this.editor.selector, uri)) {
+            return this.getPriority();
+        }
+        return 0;
+    }
+
+    getPriority(): number {
+        switch (this.editor.priority) {
+            case CustomEditorPriority.default: return 500;
+            case CustomEditorPriority.builtin: return 400;
+            /** `option` should not open the custom-editor by default. */
+            case CustomEditorPriority.option: return 1;
+            default: return 200;
+        }
+    }
+
+    protected readonly pendingWidgetPromises = new Map<string, Promise<CustomEditorWidget>>();
+    async open(uri: URI, options?: WidgetOpenerOptions): Promise<Widget | undefined> {
+        let widget: CustomEditorWidget | undefined;
+        const widgets = this.widgetManager.getWidgets(CustomEditorWidget.FACTORY_ID) as CustomEditorWidget[];
+        widget = widgets.find(w => w.viewType === this.editor.viewType && w.resource.toString() === uri.toString());
+
+        if (widget?.isVisible) {
+            return this.shell.revealWidget(widget.id);
+        }
+        if (widget?.isAttached) {
+            return this.shell.activateWidget(widget.id);
+        }
+        if (!widget) {
+            const uriString = uri.toString();
+            let widgetPromise = this.pendingWidgetPromises.get(uriString);
+            if (!widgetPromise) {
+                const id = v4();
+                widgetPromise = this.widgetManager.getOrCreateWidget<CustomEditorWidget>(CustomEditorWidget.FACTORY_ID, { id });
+                this.pendingWidgetPromises.set(uriString, widgetPromise);
+                widget = await widgetPromise;
+                this.pendingWidgetPromises.delete(uriString);
+                widget.viewType = this.editor.viewType;
+                widget.resource = uri;
+                this.onDidOpenCustomEditorEmitter.fire([widget, options]);
+            }
+        }
+        return widget;
+    }
+
+    matches(selectors: CustomEditorSelector[], resource: URI): boolean {
+        return selectors.some(selector => this.selectorMatches(selector, resource));
+    }
+
+    selectorMatches(selector: CustomEditorSelector, resource: URI): boolean {
+        if (selector.filenamePattern) {
+            if (match(selector.filenamePattern.toLowerCase(), resource.path.name.toLowerCase() + resource.path.ext.toLowerCase())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

package/src/main/browser/custom-editors/custom-editor-service.ts

@@ -1,108 +1,108 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
-
-import { injectable } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { Reference } from '@theia/core/lib/common/reference';
-import { CustomEditorModel } from './custom-editors-main';
-
-@injectable()
-export class CustomEditorService {
-    protected _models = new CustomEditorModelManager();
-    get models(): CustomEditorModelManager { return this._models; }
-}
-
-export class CustomEditorModelManager {
-
-    private readonly references = new Map<string, {
-        readonly viewType: string,
-        readonly model: Promise<CustomEditorModel>,
-        counter: number
-    }>();
-
-    add(resource: URI, viewType: string, model: Promise<CustomEditorModel>): Promise<Reference<CustomEditorModel>> {
-        const key = this.key(resource, viewType);
-        const existing = this.references.get(key);
-        if (existing) {
-            throw new Error('Model already exists');
-        }
-
-        this.references.set(key, { viewType, model, counter: 0 });
-        return this.tryRetain(resource, viewType)!;
-    }
-
-    async get(resource: URI, viewType: string): Promise<CustomEditorModel | undefined> {
-        const key = this.key(resource, viewType);
-        const entry = this.references.get(key);
-        return entry?.model;
-    }
-
-    tryRetain(resource: URI, viewType: string): Promise<Reference<CustomEditorModel>> | undefined {
-        const key = this.key(resource, viewType);
-
-        const entry = this.references.get(key);
-        if (!entry) {
-            return undefined;
-        }
-
-        entry.counter++;
-
-        return entry.model.then(model => ({
-            object: model,
-            dispose: once(() => {
-                if (--entry!.counter <= 0) {
-                    entry.model.then(x => x.dispose());
-                    this.references.delete(key);
-                }
-            }),
-        }));
-    }
-
-    disposeAllModelsForView(viewType: string): void {
-        for (const [key, value] of this.references) {
-            if (value.viewType === viewType) {
-                value.model.then(x => x.dispose());
-                this.references.delete(key);
-            }
-        }
-    }
-
-    private key(resource: URI, viewType: string): string {
-        return `${resource.toString()}@@@${viewType}`;
-    }
-}
-
-export function once<T extends Function>(this: unknown, fn: T): T {
-    const _this = this;
-    let didCall = false;
-    let result: unknown;
-
-    return function (): unknown {
-        if (didCall) {
-            return result;
-        }
-
-        didCall = true;
-        result = fn.apply(_this, arguments);
-
-        return result;
-    } as unknown as T;
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
+
+import { injectable } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { Reference } from '@theia/core/lib/common/reference';
+import { CustomEditorModel } from './custom-editors-main';
+
+@injectable()
+export class CustomEditorService {
+    protected _models = new CustomEditorModelManager();
+    get models(): CustomEditorModelManager { return this._models; }
+}
+
+export class CustomEditorModelManager {
+
+    private readonly references = new Map<string, {
+        readonly viewType: string,
+        readonly model: Promise<CustomEditorModel>,
+        counter: number
+    }>();
+
+    add(resource: URI, viewType: string, model: Promise<CustomEditorModel>): Promise<Reference<CustomEditorModel>> {
+        const key = this.key(resource, viewType);
+        const existing = this.references.get(key);
+        if (existing) {
+            throw new Error('Model already exists');
+        }
+
+        this.references.set(key, { viewType, model, counter: 0 });
+        return this.tryRetain(resource, viewType)!;
+    }
+
+    async get(resource: URI, viewType: string): Promise<CustomEditorModel | undefined> {
+        const key = this.key(resource, viewType);
+        const entry = this.references.get(key);
+        return entry?.model;
+    }
+
+    tryRetain(resource: URI, viewType: string): Promise<Reference<CustomEditorModel>> | undefined {
+        const key = this.key(resource, viewType);
+
+        const entry = this.references.get(key);
+        if (!entry) {
+            return undefined;
+        }
+
+        entry.counter++;
+
+        return entry.model.then(model => ({
+            object: model,
+            dispose: once(() => {
+                if (--entry!.counter <= 0) {
+                    entry.model.then(x => x.dispose());
+                    this.references.delete(key);
+                }
+            }),
+        }));
+    }
+
+    disposeAllModelsForView(viewType: string): void {
+        for (const [key, value] of this.references) {
+            if (value.viewType === viewType) {
+                value.model.then(x => x.dispose());
+                this.references.delete(key);
+            }
+        }
+    }
+
+    private key(resource: URI, viewType: string): string {
+        return `${resource.toString()}@@@${viewType}`;
+    }
+}
+
+export function once<T extends Function>(this: unknown, fn: T): T {
+    const _this = this;
+    let didCall = false;
+    let result: unknown;
+
+    return function (): unknown {
+        if (didCall) {
+            return result;
+        }
+
+        didCall = true;
+        result = fn.apply(_this, arguments);
+
+        return result;
+    } as unknown as T;
+}

package/src/main/browser/custom-editors/custom-editor-widget-factory.ts

@@ -1,44 +1,44 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { CustomEditorWidget } from '../custom-editors/custom-editor-widget';
-import { interfaces } from '@theia/core/shared/inversify';
-import { WebviewWidgetIdentifier, WebviewWidgetExternalEndpoint } from '../webview/webview';
-import { WebviewEnvironment } from '../webview/webview-environment';
-
-export class CustomEditorWidgetFactory {
-
-    readonly id = CustomEditorWidget.FACTORY_ID;
-
-    protected readonly container: interfaces.Container;
-
-    constructor(container: interfaces.Container) {
-        this.container = container;
-    }
-
-    async createWidget(identifier: WebviewWidgetIdentifier): Promise<CustomEditorWidget> {
-        const externalEndpoint = await this.container.get(WebviewEnvironment).externalEndpoint();
-        let endpoint = externalEndpoint.replace('{{uuid}}', identifier.id);
-        if (endpoint[endpoint.length - 1] === '/') {
-            endpoint = endpoint.slice(0, endpoint.length - 1);
-        }
-        const child = this.container.createChild();
-        child.bind(WebviewWidgetIdentifier).toConstantValue(identifier);
-        child.bind(WebviewWidgetExternalEndpoint).toConstantValue(endpoint);
-        return child.get(CustomEditorWidget);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { CustomEditorWidget } from '../custom-editors/custom-editor-widget';
+import { interfaces } from '@theia/core/shared/inversify';
+import { WebviewWidgetIdentifier, WebviewWidgetExternalEndpoint } from '../webview/webview';
+import { WebviewEnvironment } from '../webview/webview-environment';
+
+export class CustomEditorWidgetFactory {
+
+    readonly id = CustomEditorWidget.FACTORY_ID;
+
+    protected readonly container: interfaces.Container;
+
+    constructor(container: interfaces.Container) {
+        this.container = container;
+    }
+
+    async createWidget(identifier: WebviewWidgetIdentifier): Promise<CustomEditorWidget> {
+        const externalEndpoint = await this.container.get(WebviewEnvironment).externalEndpoint();
+        let endpoint = externalEndpoint.replace('{{uuid}}', identifier.id);
+        if (endpoint[endpoint.length - 1] === '/') {
+            endpoint = endpoint.slice(0, endpoint.length - 1);
+        }
+        const child = this.container.createChild();
+        child.bind(WebviewWidgetIdentifier).toConstantValue(identifier);
+        child.bind(WebviewWidgetExternalEndpoint).toConstantValue(endpoint);
+        return child.get(CustomEditorWidget);
+    }
+
+}