@theia/plugin-ext 1.53.0-next.5 → 1.53.0-next.55

package/src/main/browser/notebooks/renderers/webview-communication.ts

@@ -1,107 +1,107 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export interface RendererMetadata {
-    readonly id: string;
-    readonly entrypoint: { readonly uri: string, readonly extends?: string; };
-    readonly mimeTypes: readonly string[];
-    readonly requiresMessaging: boolean;
-}
-
-export interface CustomRendererMessage {
-    readonly type: 'customRendererMessage';
-    readonly rendererId: string;
-    readonly message: unknown;
-}
-
-export interface UpdateRenderersMessage {
-    readonly type: 'updateRenderers';
-    readonly rendererData: readonly RendererMetadata[];
-}
-
-export interface OutputChangedMessage {
-    readonly type: 'outputChanged';
-    readonly newOutputs?: Output[];
-    readonly deleteStart?: number;
-    readonly deleteCount?: number;
-}
-
-export interface ChangePreferredMimetypeMessage {
-    readonly type: 'changePreferredMimetype';
-    readonly outputId: string;
-    readonly mimeType: string;
-}
-
-export interface KernelMessage {
-    readonly type: 'customKernelMessage';
-    readonly message: unknown;
-}
-
-export interface PreloadMessage {
-    readonly type: 'preload';
-    readonly resources: string[];
-}
-
-export interface notebookStylesMessage {
-    readonly type: 'notebookStyles';
-    styles: Record<string, string>;
-}
-
-export type ToWebviewMessage = UpdateRenderersMessage
-    | OutputChangedMessage
-    | ChangePreferredMimetypeMessage
-    | CustomRendererMessage
-    | KernelMessage
-    | PreloadMessage
-    | notebookStylesMessage;
-
-export interface WebviewInitialized {
-    readonly type: 'initialized';
-}
-
-export interface OnDidRenderOutput {
-    readonly type: 'didRenderOutput';
-    contentHeight: number;
-}
-
-export interface WheelMessage {
-    readonly type: 'did-scroll-wheel';
-    readonly deltaY: number;
-    readonly deltaX: number;
-}
-
-export interface InputFocusChange {
-    readonly type: 'inputFocusChanged';
-    readonly focused: boolean;
-}
-
-export type FromWebviewMessage = WebviewInitialized | OnDidRenderOutput | WheelMessage | CustomRendererMessage | KernelMessage | InputFocusChange;
-
-export interface Output {
-    id: string
-    metadata?: Record<string, unknown>;
-    items: OutputItem[];
-}
-
-export interface OutputItem {
-    readonly mime: string;
-    readonly data: Uint8Array;
-}
-
+// *****************************************************************************
+// 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
+// *****************************************************************************
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export interface RendererMetadata {
+    readonly id: string;
+    readonly entrypoint: { readonly uri: string, readonly extends?: string; };
+    readonly mimeTypes: readonly string[];
+    readonly requiresMessaging: boolean;
+}
+
+export interface CustomRendererMessage {
+    readonly type: 'customRendererMessage';
+    readonly rendererId: string;
+    readonly message: unknown;
+}
+
+export interface UpdateRenderersMessage {
+    readonly type: 'updateRenderers';
+    readonly rendererData: readonly RendererMetadata[];
+}
+
+export interface OutputChangedMessage {
+    readonly type: 'outputChanged';
+    readonly newOutputs?: Output[];
+    readonly deleteStart?: number;
+    readonly deleteCount?: number;
+}
+
+export interface ChangePreferredMimetypeMessage {
+    readonly type: 'changePreferredMimetype';
+    readonly outputId: string;
+    readonly mimeType: string;
+}
+
+export interface KernelMessage {
+    readonly type: 'customKernelMessage';
+    readonly message: unknown;
+}
+
+export interface PreloadMessage {
+    readonly type: 'preload';
+    readonly resources: string[];
+}
+
+export interface notebookStylesMessage {
+    readonly type: 'notebookStyles';
+    styles: Record<string, string>;
+}
+
+export type ToWebviewMessage = UpdateRenderersMessage
+    | OutputChangedMessage
+    | ChangePreferredMimetypeMessage
+    | CustomRendererMessage
+    | KernelMessage
+    | PreloadMessage
+    | notebookStylesMessage;
+
+export interface WebviewInitialized {
+    readonly type: 'initialized';
+}
+
+export interface OnDidRenderOutput {
+    readonly type: 'didRenderOutput';
+    contentHeight: number;
+}
+
+export interface WheelMessage {
+    readonly type: 'did-scroll-wheel';
+    readonly deltaY: number;
+    readonly deltaX: number;
+}
+
+export interface InputFocusChange {
+    readonly type: 'inputFocusChanged';
+    readonly focused: boolean;
+}
+
+export type FromWebviewMessage = WebviewInitialized | OnDidRenderOutput | WheelMessage | CustomRendererMessage | KernelMessage | InputFocusChange;
+
+export interface Output {
+    id: string
+    metadata?: Record<string, unknown>;
+    items: OutputItem[];
+}
+
+export interface OutputItem {
+    readonly mime: string;
+    readonly data: Uint8Array;
+}
+

package/src/main/browser/notification-main.ts

@@ -1,26 +1,26 @@
-// *****************************************************************************
-// Copyright (C) 2018 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
-// *****************************************************************************
-
-import { MAIN_RPC_CONTEXT } from '../../common';
-import { interfaces } from '@theia/core/shared/inversify';
-import { RPCProtocol } from '../../common/rpc-protocol';
-import { BasicNotificationMainImpl } from '../common/basic-notification-main';
-
-export class NotificationMainImpl extends BasicNotificationMainImpl {
-    constructor(rpc: RPCProtocol, container: interfaces.Container) {
-        super(rpc, container, MAIN_RPC_CONTEXT.NOTIFICATION_EXT);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 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
+// *****************************************************************************
+
+import { MAIN_RPC_CONTEXT } from '../../common';
+import { interfaces } from '@theia/core/shared/inversify';
+import { RPCProtocol } from '../../common/rpc-protocol';
+import { BasicNotificationMainImpl } from '../common/basic-notification-main';
+
+export class NotificationMainImpl extends BasicNotificationMainImpl {
+    constructor(rpc: RPCProtocol, container: interfaces.Container) {
+        super(rpc, container, MAIN_RPC_CONTEXT.NOTIFICATION_EXT);
+    }
+}

package/src/main/browser/output-channel-registry-main.ts

@@ -1,53 +1,53 @@
-// *****************************************************************************
-// Copyright (C) 2018 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
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { CommandService } from '@theia/core/lib/common/command';
-import { OutputCommands } from '@theia/output/lib/browser/output-commands';
-import { OutputChannelRegistryMain, PluginInfo } from '../../common/plugin-api-rpc';
-
-@injectable()
-export class OutputChannelRegistryMainImpl implements OutputChannelRegistryMain {
-
-    @inject(CommandService)
-    protected readonly commandService: CommandService;
-
-    $append(name: string, text: string, pluginInfo: PluginInfo): PromiseLike<void> {
-        this.commandService.executeCommand(OutputCommands.APPEND.id, { name, text });
-        return Promise.resolve();
-    }
-
-    $clear(name: string): PromiseLike<void> {
-        this.commandService.executeCommand(OutputCommands.CLEAR.id, { name });
-        return Promise.resolve();
-    }
-
-    $dispose(name: string): PromiseLike<void> {
-        this.commandService.executeCommand(OutputCommands.DISPOSE.id, { name });
-        return Promise.resolve();
-    }
-
-    async $reveal(name: string, preserveFocus: boolean): Promise<void> {
-        const options = { preserveFocus };
-        this.commandService.executeCommand(OutputCommands.SHOW.id, { name, options });
-    }
-
-    $close(name: string): PromiseLike<void> {
-        this.commandService.executeCommand(OutputCommands.HIDE.id, { name });
-        return Promise.resolve();
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 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
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { CommandService } from '@theia/core/lib/common/command';
+import { OutputCommands } from '@theia/output/lib/browser/output-commands';
+import { OutputChannelRegistryMain, PluginInfo } from '../../common/plugin-api-rpc';
+
+@injectable()
+export class OutputChannelRegistryMainImpl implements OutputChannelRegistryMain {
+
+    @inject(CommandService)
+    protected readonly commandService: CommandService;
+
+    $append(name: string, text: string, pluginInfo: PluginInfo): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.APPEND.id, { name, text });
+        return Promise.resolve();
+    }
+
+    $clear(name: string): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.CLEAR.id, { name });
+        return Promise.resolve();
+    }
+
+    $dispose(name: string): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.DISPOSE.id, { name });
+        return Promise.resolve();
+    }
+
+    async $reveal(name: string, preserveFocus: boolean): Promise<void> {
+        const options = { preserveFocus };
+        this.commandService.executeCommand(OutputCommands.SHOW.id, { name, options });
+    }
+
+    $close(name: string): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.HIDE.id, { name });
+        return Promise.resolve();
+    }
+
+}

package/src/main/browser/plugin-authentication-service.ts

@@ -1,71 +1,71 @@
-// *****************************************************************************
-// Copyright (C) 2022 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 { AuthenticationProvider, AuthenticationService, AuthenticationServiceImpl, AuthenticationSession } from '@theia/core/lib/browser/authentication-service';
-import { inject } from '@theia/core/shared/inversify';
-import { Deferred, timeoutReject } from '@theia/core/lib/common/promise-util';
-import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
-
-export function getAuthenticationProviderActivationEvent(id: string): string { return `onAuthenticationRequest:${id}`; }
-
-/**
- * Plugin authentication service that aims to activate additional plugins if sessions are created or queried.
- */
-export class PluginAuthenticationServiceImpl extends AuthenticationServiceImpl implements AuthenticationService {
-    @inject(HostedPluginSupport) protected readonly pluginService: HostedPluginSupport;
-
-    override async getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<AuthenticationSession>> {
-        await this.tryActivateProvider(id);
-        return super.getSessions(id, scopes);
-    }
-
-    override async login(id: string, scopes: string[]): Promise<AuthenticationSession> {
-        await this.tryActivateProvider(id);
-        return super.login(id, scopes);
-    }
-
-    protected async tryActivateProvider(providerId: string): Promise<AuthenticationProvider> {
-        this.pluginService.activateByEvent(getAuthenticationProviderActivationEvent(providerId));
-
-        const provider = this.authenticationProviders.get(providerId);
-        if (provider) {
-            return provider;
-        }
-
-        // When activate has completed, the extension has made the call to `registerAuthenticationProvider`.
-        // However, activate cannot block on this, so the renderer may not have gotten the event yet.
-        return Promise.race([
-            this.waitForProviderRegistration(providerId),
-            timeoutReject<AuthenticationProvider>(5000, 'Timed out waiting for authentication provider to register')
-        ]);
-    }
-
-    protected async waitForProviderRegistration(providerId: string): Promise<AuthenticationProvider> {
-        const waitForRegistration = new Deferred<AuthenticationProvider>();
-        const registration = this.onDidRegisterAuthenticationProvider(info => {
-            if (info.id === providerId) {
-                registration.dispose();
-                const provider = this.authenticationProviders.get(providerId);
-                if (provider) {
-                    waitForRegistration.resolve(provider);
-                } else {
-                    waitForRegistration.reject(new Error(`No authentication provider '${providerId}' is currently registered.`));
-                }
-            }
-        });
-        return waitForRegistration.promise;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 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 { AuthenticationProvider, AuthenticationService, AuthenticationServiceImpl, AuthenticationSession } from '@theia/core/lib/browser/authentication-service';
+import { inject } from '@theia/core/shared/inversify';
+import { Deferred, timeoutReject } from '@theia/core/lib/common/promise-util';
+import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
+
+export function getAuthenticationProviderActivationEvent(id: string): string { return `onAuthenticationRequest:${id}`; }
+
+/**
+ * Plugin authentication service that aims to activate additional plugins if sessions are created or queried.
+ */
+export class PluginAuthenticationServiceImpl extends AuthenticationServiceImpl implements AuthenticationService {
+    @inject(HostedPluginSupport) protected readonly pluginService: HostedPluginSupport;
+
+    override async getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<AuthenticationSession>> {
+        await this.tryActivateProvider(id);
+        return super.getSessions(id, scopes);
+    }
+
+    override async login(id: string, scopes: string[]): Promise<AuthenticationSession> {
+        await this.tryActivateProvider(id);
+        return super.login(id, scopes);
+    }
+
+    protected async tryActivateProvider(providerId: string): Promise<AuthenticationProvider> {
+        this.pluginService.activateByEvent(getAuthenticationProviderActivationEvent(providerId));
+
+        const provider = this.authenticationProviders.get(providerId);
+        if (provider) {
+            return provider;
+        }
+
+        // When activate has completed, the extension has made the call to `registerAuthenticationProvider`.
+        // However, activate cannot block on this, so the renderer may not have gotten the event yet.
+        return Promise.race([
+            this.waitForProviderRegistration(providerId),
+            timeoutReject<AuthenticationProvider>(5000, 'Timed out waiting for authentication provider to register')
+        ]);
+    }
+
+    protected async waitForProviderRegistration(providerId: string): Promise<AuthenticationProvider> {
+        const waitForRegistration = new Deferred<AuthenticationProvider>();
+        const registration = this.onDidRegisterAuthenticationProvider(info => {
+            if (info.id === providerId) {
+                registration.dispose();
+                const provider = this.authenticationProviders.get(providerId);
+                if (provider) {
+                    waitForRegistration.resolve(provider);
+                } else {
+                    waitForRegistration.reject(new Error(`No authentication provider '${providerId}' is currently registered.`));
+                }
+            }
+        });
+        return waitForRegistration.promise;
+    }
+}