@theia/plugin-ext 1.53.0-next.6 → 1.53.0-next.64

package/src/plugin/notebook/notebooks.ts

@@ -97,6 +97,13 @@ export class NotebooksExtImpl implements NotebooksExt {
                 }
             }
         });
+
+        textDocumentsAndEditors.onDidChangeActiveTextEditor(e => {
+            if (e && e?.document.uri.scheme !== CellUri.cellUriScheme && this.activeNotebookEditor) {
+                this.activeNotebookEditor = undefined;
+                this.onDidChangeActiveNotebookEditorEmitter.fire(undefined);
+            }
+        });
     }
 
     async $provideNotebookCellStatusBarItems(handle: number, uri: UriComponents, index: number, token: CancellationToken): Promise<NotebookCellStatusBarListDto | undefined> {
@@ -131,6 +138,15 @@ export class NotebooksExtImpl implements NotebooksExt {
         this.statusBarRegistry.delete(cacheId);
     }
 
+    $acceptActiveCellEditorChange(newActiveEditor: string | null): void {
+        const newActiveEditorId = this.textDocumentsAndEditors.allEditors().find(editor => editor.document.uri.toString() === newActiveEditor)?.id;
+        if (newActiveEditorId || newActiveEditor === null) {
+            this.textDocumentsAndEditors.acceptEditorsAndDocumentsDelta({
+                newActiveEditor: newActiveEditorId ?? null
+            });
+        }
+    }
+
     // --- serialize/deserialize
 
     private currentSerializerHandle = 0;
@@ -319,6 +335,11 @@ export class NotebooksExtImpl implements NotebooksExt {
                 console.error(`FAILED to find active notebook editor ${delta.newActiveEditor}`);
             }
             this.activeNotebookEditor = this.editors.get(delta.newActiveEditor);
+            if (this.textDocumentsAndEditors.activeEditor()?.document.uri.path !== this.activeNotebookEditor?.notebookData.uri.path) {
+                this.textDocumentsAndEditors.acceptEditorsAndDocumentsDelta({
+                    newActiveEditor: null
+                });
+            }
         }
         if (delta.newActiveEditor !== undefined) {
             this.onDidChangeActiveNotebookEditorEmitter.fire(this.activeNotebookEditor?.apiEditor);

package/src/plugin/plugin-context.ts

@@ -228,7 +228,8 @@ import {
     LanguageModelError,
     PortAutoForwardAction,
     PortAttributes,
-    DebugVisualization
+    DebugVisualization,
+    TerminalShellExecutionCommandLineConfidence
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -275,6 +276,7 @@ import { NotebookKernelsExtImpl } from './notebook/notebook-kernels';
 import { NotebookDocumentsExtImpl } from './notebook/notebook-documents';
 import { NotebookEditorsExtImpl } from './notebook/notebook-editors';
 import { TestingExtImpl } from './tests';
+import { UriExtImpl } from './uri-ext';
 
 export function createAPIFactory(
     rpc: RPCProtocol,
@@ -319,10 +321,11 @@ export function createAPIFactory(
     const themingExt = rpc.set(MAIN_RPC_CONTEXT.THEMING_EXT, new ThemingExtImpl(rpc));
     const commentsExt = rpc.set(MAIN_RPC_CONTEXT.COMMENTS_EXT, new CommentsExtImpl(rpc, commandRegistry, documents));
     const tabsExt = rpc.set(MAIN_RPC_CONTEXT.TABS_EXT, new TabsExtImpl(rpc));
-    const customEditorExt = rpc.set(MAIN_RPC_CONTEXT.CUSTOM_EDITORS_EXT, new CustomEditorsExtImpl(rpc, documents, webviewExt, workspaceExt));
+    const customEditorExt = rpc.set(MAIN_RPC_CONTEXT.CUSTOM_EDITORS_EXT, new CustomEditorsExtImpl(rpc, documents, webviewExt));
     const webviewViewsExt = rpc.set(MAIN_RPC_CONTEXT.WEBVIEW_VIEWS_EXT, new WebviewViewsExtImpl(rpc, webviewExt));
     const telemetryExt = rpc.set(MAIN_RPC_CONTEXT.TELEMETRY_EXT, new TelemetryExtImpl());
     const testingExt = rpc.set(MAIN_RPC_CONTEXT.TESTING_EXT, new TestingExtImpl(rpc, commandRegistry));
+    const uriExt = rpc.set(MAIN_RPC_CONTEXT.URI_EXT, new UriExtImpl(rpc));
     rpc.set(MAIN_RPC_CONTEXT.DEBUG_EXT, debugExt);
 
     return function (plugin: InternalPlugin): typeof theia {
@@ -335,6 +338,9 @@ export function createAPIFactory(
             },
             get onDidChangeSessions(): theia.Event<theia.AuthenticationSessionsChangeEvent> {
                 return authenticationExt.onDidChangeSessions;
+            },
+            getAccounts(providerId: string): Thenable<readonly theia.AuthenticationSessionAccountInformation[]> {
+                return authenticationExt.getAccounts(providerId);
             }
         };
         function commandIsDeclaredInPackage(id: string, model: PluginPackage): boolean {
@@ -595,8 +601,7 @@ export function createAPIFactory(
                 return decorationsExt.registerFileDecorationProvider(provider, pluginToPluginInfo(plugin));
             },
             registerUriHandler(handler: theia.UriHandler): theia.Disposable {
-                // TODO ?
-                return new Disposable(() => { });
+                return uriExt.registerUriHandler(handler, pluginToPluginInfo(plugin));
             },
             createInputBox(): theia.InputBox {
                 return quickOpenExt.createInputBox(plugin);
@@ -636,6 +641,12 @@ export function createAPIFactory(
 
             /** @stubbed ShareProvider */
             registerShareProvider: () => Disposable.NULL,
+            /** @stubbed Terminal Shell Ingration */
+            onDidChangeTerminalShellIntegration: Event.None,
+            /** @stubbed Terminal Shell Ingration */
+            onDidEndTerminalShellExecution: Event.None,
+            /** @stubbed Terminal Shell Ingration */
+            onDidStartTerminalShellExecution: Event.None
         };
 
         const workspace: typeof theia.workspace = {
@@ -740,9 +751,8 @@ export function createAPIFactory(
                 } else {
                     throw new Error('Invalid arguments');
                 }
-                const result = await notebooksExt.waitForNotebookDocument(uri);
-                return result.apiNotebook;
-
+                // Notebook extension will create a document in openNotebookDocument() or create openNotebookDocument()
+                return notebooksExt.getNotebookDocument(uri).apiNotebook;
             },
             createFileSystemWatcher: (pattern, ignoreCreate, ignoreChange, ignoreDelete): theia.FileSystemWatcher =>
                 extHostFileSystemEvent.createFileSystemWatcher(fromGlobPattern(pattern), ignoreCreate, ignoreChange, ignoreDelete),
@@ -1495,7 +1505,8 @@ export function createAPIFactory(
             LanguageModelError,
             PortAutoForwardAction,
             PortAttributes,
-            DebugVisualization
+            DebugVisualization,
+            TerminalShellExecutionCommandLineConfidence
         };
     };
 }

package/src/plugin/plugin-manager.ts

@@ -252,7 +252,7 @@ export abstract class AbstractPluginManagerExtImpl<P extends Record<string, any>
             }
             for (let activationEvent of activationEvents) {
                 if (activationEvent === 'onUri') {
-                    activationEvent = `onUri:theia://${plugin.model.id}`;
+                    activationEvent = `onUri:${this.envExt.uriScheme}://${plugin.model.id}`;
                 }
                 this.setActivation(activationEvent, activation);
             }
@@ -481,6 +481,7 @@ export class PluginManagerExtImpl extends AbstractPluginManagerExtImpl<PluginMan
         this.envExt.setApplicationName(params.env.appName);
         this.envExt.setAppHost(params.env.appHost);
         this.envExt.setAppRoot(params.env.appRoot);
+        this.envExt.setAppUriScheme(params.env.appUriScheme);
 
         this.preferencesManager.init(params.preferences);
 

package/src/plugin/terminal-ext.ts

@@ -478,6 +478,9 @@ export class TerminalExtImpl implements theia.Terminal {
         this.creationOptions = this.options;
     }
 
+    /** @stubbed Terminal Shell Ingration */
+    shellIntegration: theia.TerminalShellIntegration | undefined = undefined;
+
     sendText(text: string, shouldExecute: boolean = true): void {
         this.id.promise.then(id => this.proxy.$sendText(id, text, shouldExecute));
     }

package/src/plugin/text-editor.ts

@@ -30,7 +30,7 @@ export class TextEditorExt implements theia.TextEditor {
     private disposed = false;
     constructor(
         private readonly proxy: TextEditorsMain,
-        private readonly id: string,
+        readonly id: string,
         document: DocumentDataExt,
         private _selections: Selection[],
         options: TextEditorConfiguration,

package/src/plugin/type-converters.ts

@@ -731,6 +731,26 @@ export function toSymbolTag(kind: model.SymbolTag): types.SymbolTag {
     }
 }
 
+/**
+ * Creates a merged symbol of type theia.SymbolInformation & theia.DocumentSymbol.
+ * Is only used as the result type of the `vscode.executeDocumentSymbolProvider` command.
+ */
+export function toMergedSymbol(uri: UriComponents, symbol: model.DocumentSymbol): theia.SymbolInformation & theia.DocumentSymbol {
+    const uriValue = URI.revive(uri);
+    const location = new types.Location(uriValue, toRange(symbol.range));
+    return {
+        name: symbol.name,
+        containerName: symbol.containerName ?? '',
+        kind: SymbolKind.toSymbolKind(symbol.kind),
+        tags: [],
+        location,
+        detail: symbol.detail,
+        range: location.range,
+        selectionRange: toRange(symbol.selectionRange),
+        children: symbol.children?.map(child => toMergedSymbol(uri, child)) ?? []
+    };
+}
+
 export function isModelLocation(arg: unknown): arg is model.Location {
     return isObject<model.Location>(arg) &&
         isModelRange(arg.range) &&

package/src/plugin/types-impl.ts

@@ -3999,3 +3999,13 @@ export class DebugVisualization {
 }
 
 // #endregion
+
+// #region Terminal Shell Integration
+
+export enum TerminalShellExecutionCommandLineConfidence {
+    Low = 0,
+    Medium = 1,
+    High = 2
+}
+
+// #endregion

package/src/plugin/uri-ext.ts

@@ -0,0 +1,60 @@
+// *****************************************************************************
+// Copyright (C) 2024 STMicroelectronics.
+//
+// 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 theia from '@theia/plugin';
+import {
+    UriExt,
+    PLUGIN_RPC_CONTEXT, PluginInfo, UriMain
+} from '../common/plugin-api-rpc';
+import { RPCProtocol } from '../common/rpc-protocol';
+import { Disposable, URI } from './types-impl';
+import { UriComponents } from '../common/uri-components';
+
+export class UriExtImpl implements UriExt {
+
+    private handlers = new Map<string, theia.UriHandler>();
+
+    private readonly proxy: UriMain;
+
+    constructor(readonly rpc: RPCProtocol) {
+        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.URI_MAIN);
+        console.log(this.proxy);
+    }
+
+    registerUriHandler(handler: theia.UriHandler, plugin: PluginInfo): theia.Disposable {
+        const pluginId = plugin.id;
+        if (this.handlers.has(pluginId)) {
+            throw new Error(`URI handler already registered for plugin ${pluginId}`);
+        }
+
+        this.handlers.set(pluginId, handler);
+        this.proxy.$registerUriHandler(pluginId, plugin.displayName || plugin.name);
+
+        return new Disposable(() => {
+            this.proxy.$unregisterUriHandler(pluginId);
+            this.handlers.delete(pluginId);
+        });
+    }
+
+    $handleExternalUri(uri: UriComponents): Promise<void> {
+        const handler = this.handlers.get(uri.authority);
+        if (!handler) {
+            return Promise.resolve();
+        }
+        handler.handleUri(URI.revive(uri));
+        return Promise.resolve();
+    }
+}

package/src/plugin/webviews.ts

@@ -255,7 +255,7 @@ export class WebviewImpl implements theia.Webview {
             .replace('{{authority}}', resource.authority)
             .replace('{{path}}', resource.path.replace(/^\//, ''))
             .replace('{{uuid}}', this.origin ?? this.viewId);
-        return URI.parse(uri);
+        return URI.parse(uri).with({ query: resource.query });
     }
 
     get cspSource(): string {

package/lib/common/proxy-handler.d.ts

@@ -1,73 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2022 STMicroelectronics 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 { Channel } from '@theia/core/';
-import { RpcMessageDecoder, RpcMessageEncoder } from '@theia/core/lib/common/message-rpc/rpc-message-encoder';
-export interface RpcHandlerOptions {
-    id: string;
-    encoder: RpcMessageEncoder;
-    decoder: RpcMessageDecoder;
-}
-export interface ProxyHandlerOptions extends RpcHandlerOptions {
-    channelProvider: () => Promise<Channel>;
-    proxySynchronizer: ProxySynchronizer;
-}
-export interface InvocationHandlerOptions extends RpcHandlerOptions {
-    target: any;
-}
-export interface ProxySynchronizer {
-    startProxyInitialization(id: string, init: Promise<void>): void;
-    pendingProxyInitializations(): Promise<void>;
-}
-/**
- * A proxy handler that will send any method invocation on the proxied object
- * as a rcp protocol message over a channel.
- */
-export declare class ClientProxyHandler<T extends object> implements ProxyHandler<T> {
-    private rpcDeferred;
-    private isRpcInitialized;
-    readonly id: string;
-    private readonly channelProvider;
-    private readonly proxySynchronizer;
-    private readonly encoder;
-    private readonly decoder;
-    constructor(options: ProxyHandlerOptions);
-    private initializeRpc;
-    get(target: any, name: string, receiver: any): any;
-    private sendWhenNoInit;
-    /**
-     * Return whether the given property represents a notification. If true,
-     * the promise returned from the invocation will resolve immediately to `undefined`
-     *
-     * A property leads to a notification rather than a method call if its name
-     * begins with `notify` or `on`.
-     *
-     * @param p - The property being called on the proxy.
-     * @return Whether `p` represents a notification.
-     */
-    protected isNotification(p: PropertyKey): boolean;
-}
-export declare class RpcInvocationHandler {
-    readonly id: string;
-    readonly target: any;
-    private rpcDeferred;
-    private readonly encoder;
-    private readonly decoder;
-    constructor(options: InvocationHandlerOptions);
-    listen(channel: Channel): void;
-    protected handleRequest(method: string, args: any[]): Promise<any>;
-    protected onNotification(method: string, args: any[]): void;
-}
-//# sourceMappingURL=proxy-handler.d.ts.map

package/lib/common/proxy-handler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"proxy-handler.d.ts","sourceRoot":"","sources":["../../src/common/proxy-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,OAAO,EAAmC,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAG9G,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,iBAAiB,CAAA;CAC7B;AACD,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC1D,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,iBAAiB,EAAE,iBAAiB,CAAC;CACxC;AAED,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IAC/D,MAAM,EAAE,GAAG,CAAA;CACd;AAED,MAAM,WAAW,iBAAiB;IAC9B,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAC/D,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAC/C;AAED;;;GAGG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,gBAAgB,CAAS;IAEjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,EAAE,mBAAmB;IAIxC,OAAO,CAAC,aAAa;IAYrB,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;IAqBlD,OAAO,CAAC,cAAc;IAItB;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAOpD;AAED,qBAAa,oBAAoB;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC;IAErB,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,EAAE,wBAAwB;IAI7C,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO9B,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAIlE,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;CAK9D"}

package/lib/common/proxy-handler.js

@@ -1,106 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcInvocationHandler = exports.ClientProxyHandler = void 0;
-/********************************************************************************
- * Copyright (C) 2022 STMicroelectronics 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
- ********************************************************************************/
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const core_1 = require("@theia/core/");
-const promise_util_1 = require("@theia/core/lib/common/promise-util");
-/**
- * A proxy handler that will send any method invocation on the proxied object
- * as a rcp protocol message over a channel.
- */
-class ClientProxyHandler {
-    constructor(options) {
-        this.rpcDeferred = new promise_util_1.Deferred();
-        this.isRpcInitialized = false;
-        Object.assign(this, options);
-    }
-    initializeRpc() {
-        // we need to set the flag to true before waiting for the channel provider. Otherwise `get` might
-        // get called again and we'll try to open a channel more than once
-        this.proxySynchronizer.startProxyInitialization(this.id, this.rpcDeferred.promise.then(() => { }));
-        this.isRpcInitialized = true;
-        const clientOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'clientOnly' };
-        this.channelProvider().then(channel => {
-            const rpc = new core_1.RpcProtocol(channel, undefined, clientOptions);
-            this.rpcDeferred.resolve(rpc);
-        });
-    }
-    get(target, name, receiver) {
-        if (!this.isRpcInitialized) {
-            this.initializeRpc();
-        }
-        if (target[name] || name.charCodeAt(0) !== 36 /* CharCode.DollarSign */) {
-            return target[name];
-        }
-        const isNotify = this.isNotification(name);
-        return (...args) => {
-            const method = name.toString();
-            return this.sendWhenNoInit(async (connection) => {
-                if (isNotify) {
-                    connection.sendNotification(method, args);
-                }
-                else {
-                    return await connection.sendRequest(method, args);
-                }
-            });
-        };
-    }
-    sendWhenNoInit(send) {
-        return this.proxySynchronizer.pendingProxyInitializations().then(() => this.rpcDeferred.promise.then(send));
-    }
-    /**
-     * Return whether the given property represents a notification. If true,
-     * the promise returned from the invocation will resolve immediately to `undefined`
-     *
-     * A property leads to a notification rather than a method call if its name
-     * begins with `notify` or `on`.
-     *
-     * @param p - The property being called on the proxy.
-     * @return Whether `p` represents a notification.
-     */
-    isNotification(p) {
-        let propertyString = p.toString();
-        if (propertyString.charCodeAt(0) === 36 /* CharCode.DollarSign */) {
-            propertyString = propertyString.substring(1);
-        }
-        return propertyString.startsWith('notify') || propertyString.startsWith('on');
-    }
-}
-exports.ClientProxyHandler = ClientProxyHandler;
-class RpcInvocationHandler {
-    constructor(options) {
-        this.rpcDeferred = new promise_util_1.Deferred();
-        Object.assign(this, options);
-    }
-    listen(channel) {
-        const serverOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'serverOnly' };
-        const server = new core_1.RpcProtocol(channel, (method, args) => this.handleRequest(method, args), serverOptions);
-        server.onNotification((e) => this.onNotification(e.method, e.args));
-        this.rpcDeferred.resolve(server);
-    }
-    handleRequest(method, args) {
-        return this.rpcDeferred.promise.then(() => this.target[method](...args));
-    }
-    onNotification(method, args) {
-        this.rpcDeferred.promise.then(() => {
-            this.target[method](...args);
-        });
-    }
-}
-exports.RpcInvocationHandler = RpcInvocationHandler;
-//# sourceMappingURL=proxy-handler.js.map

package/lib/common/proxy-handler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"proxy-handler.js","sourceRoot":"","sources":["../../src/common/proxy-handler.ts"],"names":[],"mappings":"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"}

package/src/common/proxy-handler.ts

@@ -1,143 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2022 STMicroelectronics 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
- ********************************************************************************/
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Channel, RpcProtocol, RpcProtocolOptions } from '@theia/core/';
-import { RpcMessageDecoder, RpcMessageEncoder } from '@theia/core/lib/common/message-rpc/rpc-message-encoder';
-import { Deferred } from '@theia/core/lib/common/promise-util';
-
-export interface RpcHandlerOptions {
-    id: string
-    encoder: RpcMessageEncoder,
-    decoder: RpcMessageDecoder
-}
-export interface ProxyHandlerOptions extends RpcHandlerOptions {
-    channelProvider: () => Promise<Channel>,
-    proxySynchronizer: ProxySynchronizer,
-}
-
-export interface InvocationHandlerOptions extends RpcHandlerOptions {
-    target: any
-}
-
-export interface ProxySynchronizer {
-    startProxyInitialization(id: string, init: Promise<void>): void
-    pendingProxyInitializations(): Promise<void>
-}
-
-/**
- * A proxy handler that will send any method invocation on the proxied object
- * as a rcp protocol message over a channel.
- */
-export class ClientProxyHandler<T extends object> implements ProxyHandler<T> {
-    private rpcDeferred: Deferred<RpcProtocol> = new Deferred();
-    private isRpcInitialized = false;
-
-    readonly id: string;
-    private readonly channelProvider: () => Promise<Channel>;
-    private readonly proxySynchronizer: ProxySynchronizer;
-    private readonly encoder: RpcMessageEncoder;
-    private readonly decoder: RpcMessageDecoder;
-
-    constructor(options: ProxyHandlerOptions) {
-        Object.assign(this, options);
-    }
-
-    private initializeRpc(): void {
-        // we need to set the flag to true before waiting for the channel provider. Otherwise `get` might
-        // get called again and we'll try to open a channel more than once
-        this.proxySynchronizer.startProxyInitialization(this.id, this.rpcDeferred.promise.then(() => { }));
-        this.isRpcInitialized = true;
-        const clientOptions: RpcProtocolOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'clientOnly' };
-        this.channelProvider().then(channel => {
-            const rpc = new RpcProtocol(channel, undefined, clientOptions);
-            this.rpcDeferred.resolve(rpc);
-        });
-    }
-
-    get(target: any, name: string, receiver: any): any {
-        if (!this.isRpcInitialized) {
-            this.initializeRpc();
-        }
-
-        if (target[name] || name.charCodeAt(0) !== 36 /* CharCode.DollarSign */) {
-            return target[name];
-        }
-        const isNotify = this.isNotification(name);
-        return (...args: any[]) => {
-            const method = name.toString();
-            return this.sendWhenNoInit(async (connection: RpcProtocol) => {
-                if (isNotify) {
-                    connection.sendNotification(method, args);
-                } else {
-                    return await connection.sendRequest(method, args) as Promise<any>;
-                }
-            });
-        };
-    }
-
-    private sendWhenNoInit(send: (connection: RpcProtocol) => Promise<any>): Promise<any> {
-        return this.proxySynchronizer.pendingProxyInitializations().then(() => this.rpcDeferred.promise.then(send));
-    }
-
-    /**
-     * Return whether the given property represents a notification. If true,
-     * the promise returned from the invocation will resolve immediately to `undefined`
-     *
-     * A property leads to a notification rather than a method call if its name
-     * begins with `notify` or `on`.
-     *
-     * @param p - The property being called on the proxy.
-     * @return Whether `p` represents a notification.
-     */
-    protected isNotification(p: PropertyKey): boolean {
-        let propertyString = p.toString();
-        if (propertyString.charCodeAt(0) === 36/* CharCode.DollarSign */) {
-            propertyString = propertyString.substring(1);
-        }
-        return propertyString.startsWith('notify') || propertyString.startsWith('on');
-    }
-}
-
-export class RpcInvocationHandler {
-    readonly id: string;
-    readonly target: any;
-
-    private rpcDeferred: Deferred<RpcProtocol> = new Deferred();
-    private readonly encoder: RpcMessageEncoder;
-    private readonly decoder: RpcMessageDecoder;
-
-    constructor(options: InvocationHandlerOptions) {
-        Object.assign(this, options);
-    }
-
-    listen(channel: Channel): void {
-        const serverOptions: RpcProtocolOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'serverOnly' };
-        const server = new RpcProtocol(channel, (method: string, args: any[]) => this.handleRequest(method, args), serverOptions);
-        server.onNotification((e: { method: string, args: any }) => this.onNotification(e.method, e.args));
-        this.rpcDeferred.resolve(server);
-    }
-
-    protected handleRequest(method: string, args: any[]): Promise<any> {
-        return this.rpcDeferred.promise.then(() => this.target[method](...args));
-    }
-
-    protected onNotification(method: string, args: any[]): void {
-        this.rpcDeferred.promise.then(() => {
-            this.target[method](...args);
-        });
-    }
-}
-