@theia/plugin-ext 1.29.0-next.6 → 1.29.0

package/src/main/browser/theme-icon-override.ts

@@ -0,0 +1,221 @@
+// *****************************************************************************
+// Copyright (C) 2022 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+
+// @monaco-uplift
+// Keep this up-to-date with the table at https://code.visualstudio.com/api/references/icons-in-labels#icon-listing
+const codeIconMap: Record<string, string> = {
+    'accounts-view-bar-icon': 'account',
+    'breakpoints-activate': 'activate-breakpoints',
+    'breakpoints-remove-all': 'close-all',
+    'breakpoints-view-icon': 'debug-alt',
+    'callhierarchy-incoming': 'call-incoming',
+    'callhierarchy-outgoing': 'call-outgoing',
+    'callstack-view-icon': 'debug-alt',
+    'callstack-view-session': 'bug',
+    'comments-view-icon': 'comment-discussion',
+    'debug-collapse-all': 'collapse-all',
+    'debug-configure': 'gear',
+    'debug-console-clear-all': 'clear-all',
+    'debug-console-evaluation-input': 'arrow-small-right',
+    'debug-console-evaluation-prompt': 'chevron-right',
+    'debug-console-view-icon': 'debug-console',
+    'debug-gripper': 'gripper',
+    'default-view-icon': 'window',
+    'diff-editor-next-change': 'arrow-down',
+    'diff-editor-previous-change': 'arrow-up',
+    'diff-editor-toggle-whitespace': 'whitespace',
+    'diff-insert': 'add',
+    'diff-remove': 'remove',
+    'diff-review-close': 'close',
+    'diff-review-insert': 'add',
+    'diff-review-remove': 'remove',
+    'explorer-view-icon': 'files',
+    'extensions-clear-search-results': 'clear-all',
+    'extensions-configure-recommended': 'pencil',
+    'extensions-filter': 'filter',
+    'extensions-info-message': 'info',
+    'extensions-install-count': 'cloud-download',
+    'extensions-install-local-in-remote': 'cloud-download',
+    'extensions-install-workspace-recommended': 'cloud-download',
+    'extensions-manage': 'gear',
+    'extensions-rating': 'star',
+    'extensions-refresh': 'refresh',
+    'extensions-remote': 'remote',
+    'extensions-star-empty': 'star-empty',
+    'extensions-star-full': 'star-full',
+    'extensions-star-half': 'star-half',
+    'extensions-sync-enabled': 'sync',
+    'extensions-sync-ignored': 'sync-ignored',
+    'extensions-view-icon': 'extensions',
+    'extensions-warning-message': 'warning',
+    'find-collapsed': 'chevron-right',
+    'find-expanded': 'chevron-down',
+    'find-next-match': 'arrow-down',
+    'find-previous-match': 'arrow-up',
+    'find-replace': 'replace',
+    'find-replace-all': 'replace-all',
+    'find-selection': 'selection',
+    'folding-collapsed': 'chevron-right',
+    'folding-expanded': 'chevron-down',
+    'getting-started-beginner': 'lightbulb',
+    'getting-started-codespaces': 'github',
+    'getting-started-item-checked': 'pass-filled',
+    'getting-started-item-unchecked': 'circle-large-outline',
+    'getting-started-setup': 'heart',
+    'goto-next-location': 'arrow-down',
+    'goto-previous-location': 'arrow-up',
+    'keybindings-add': 'add',
+    'keybindings-edit': 'edit',
+    'keybindings-record-keys': 'record-keys',
+    'keybindings-sort': 'sort-precedence',
+    'loaded-scripts-view-icon': 'debug-alt',
+    'marker-navigation-next': 'chevron-down',
+    'marker-navigation-previous': 'chevron-up',
+    'markers-view-filter': 'filter',
+    'markers-view-icon': 'warning',
+    'markers-view-multi-line-collapsed': 'chevron-down',
+    'markers-view-multi-line-expanded': 'chevron-up',
+    'notebook-clear': 'clear-all',
+    'notebook-collapsed': 'chevron-right',
+    'notebook-delete-cell': 'trash',
+    'notebook-edit': 'pencil',
+    'notebook-execute': 'play',
+    'notebook-execute-all': 'run-all',
+    'notebook-expanded': 'chevron-down',
+    'notebook-kernel-configure': 'settings-gear',
+    'notebook-kernel-select': 'server-environment',
+    'notebook-mimetype': 'code',
+    'notebook-move-down': 'arrow-down',
+    'notebook-move-up': 'arrow-up',
+    'notebook-open-as-text': 'file-code',
+    'notebook-render-output': 'preview',
+    'notebook-revert': 'discard',
+    'notebook-split-cell': 'split-vertical',
+    'notebook-state-error': 'error',
+    'notebook-state-success': 'check',
+    'notebook-stop': 'primitive-square',
+    'notebook-stop-edit': 'check',
+    'notebook-unfold': 'unfold',
+    'notifications-clear': 'close',
+    'notifications-clear-all': 'clear-all',
+    'notifications-collapse': 'chevron-down',
+    'notifications-configure': 'gear',
+    'notifications-expand': 'chevron-up',
+    'notifications-hide': 'chevron-down',
+    'open-editors-view-icon': 'book',
+    'outline-view-icon': 'symbol-class',
+    'output-view-icon': 'output',
+    'panel-close': 'close',
+    'panel-maximize': 'chevron-up',
+    'panel-restore': 'chevron-down',
+    'parameter-hints-next': 'chevron-down',
+    'parameter-hints-previous': 'chevron-up',
+    'ports-forward-icon': 'plus',
+    'ports-open-browser-icon': 'globe',
+    'ports-stop-forward-icon': 'x',
+    'ports-view-icon': 'plug',
+    'preferences-clear-input': 'clear-all',
+    'preferences-open-settings': 'go-to-file',
+    'private-ports-view-icon': 'lock',
+    'public-ports-view-icon': 'eye',
+    'refactor-preview-view-icon': 'lightbulb',
+    'remote-explorer-documentation': 'book',
+    'remote-explorer-feedback': 'twitter',
+    'remote-explorer-get-started': 'star',
+    'remote-explorer-report-issues': 'comment',
+    'remote-explorer-review-issues': 'issues',
+    'remote-explorer-view-icon': 'remote-explorer',
+    'review-comment-collapse': 'chevron-up',
+    'run-view-icon': 'debug-alt',
+    'search-clear-results': 'clear-all',
+    'search-collapse-results': 'collapse-all',
+    'search-details': 'ellipsis',
+    'search-expand-results': 'expand-all',
+    'search-hide-replace': 'chevron-right',
+    'search-new-editor': 'new-file',
+    'search-refresh': 'refresh',
+    'search-remove': 'close',
+    'search-replace': 'replace',
+    'search-replace-all': 'replace-all',
+    'search-show-context': 'list-selection',
+    'search-show-replace': 'chevron-down',
+    'search-stop': 'search-stop',
+    'search-view-icon': 'search',
+    'settings-add': 'add',
+    'settings-discard': 'discard',
+    'settings-edit': 'edit',
+    'settings-folder-dropdown': 'triangle-down',
+    'settings-group-collapsed': 'chevron-right',
+    'settings-group-expanded': 'chevron-down',
+    'settings-more-action': 'gear',
+    'settings-remove': 'close',
+    'settings-sync-view-icon': 'sync',
+    'settings-view-bar-icon': 'settings-gear',
+    'source-control-view-icon': 'source-control',
+    'suggest-more-info': 'chevron-right',
+    'tasks-list-configure': 'gear',
+    'tasks-remove': 'close',
+    'terminal-kill': 'trash',
+    'terminal-new': 'add',
+    'terminal-rename': 'gear',
+    'terminal-view-icon': 'terminal',
+    'test-view-icon': 'beaker',
+    'testing-cancel-icon': 'close',
+    'testing-debug-icon': 'debug-alt',
+    'testing-error-icon': 'warning',
+    'testing-failed-icon': 'close',
+    'testing-passed-icon': 'pass',
+    'testing-queued-icon': 'watch',
+    'testing-run-all-icon': 'run-all',
+    'testing-run-icon': 'run',
+    'testing-show-as-list-icon': 'list-tree',
+    'testing-skipped-icon': 'debug-step-over',
+    'testing-unset-icon': 'circle-outline',
+    'timeline-open': 'history',
+    'timeline-pin': 'pin',
+    'timeline-refresh': 'refresh',
+    'timeline-unpin': 'pinned',
+    'timeline-view-icon': 'history',
+    'variables-view-icon': 'debug-alt',
+    'view-pane-container-collapsed': 'chevron-right',
+    'view-pane-container-expanded': 'chevron-down',
+    'watch-expressions-add': 'add',
+    'watch-expressions-add-function-breakpoint': 'add',
+    'watch-expressions-remove-all': 'close-all',
+    'watch-view-icon': 'debug-alt',
+    'widget-close': 'close'
+};
+
+const originalAsCSSSelector = ThemeIcon.asCSSSelector;
+const originalAsClassName = ThemeIcon.asClassName;
+const originalAsClassNameArray = ThemeIcon.asClassNameArray;
+
+function buildMappedIcon(icon: ThemeIcon): ThemeIcon {
+    const id = codeIconMap[icon.id] ?? icon.id;
+    const newIcon: ThemeIcon = {
+        ...icon,
+        id
+    };
+    return newIcon;
+}
+
+Object.assign(ThemeIcon, {
+    asCSSSelector: (icon: ThemeIcon) => originalAsCSSSelector(buildMappedIcon(icon)),
+    asClassName: (icon: ThemeIcon) => originalAsClassName(buildMappedIcon(icon)),
+    asClassNameArray: (icon: ThemeIcon) => originalAsClassNameArray(buildMappedIcon(icon))
+});

package/src/main/browser/view/plugin-view-registry.ts

@@ -490,7 +490,6 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         const currentDataWidget = widget.widgets[0];
         const viewDataWidget = await this.createViewDataWidget(view.id, webviewId);
         if (widget.isDisposed) {
-            // eslint-disable-next-line no-unused-expressions
             viewDataWidget?.dispose();
             return;
         }

package/src/main/browser/view/plugin-view-widget.ts

@@ -22,7 +22,7 @@ import { StatefulWidget } from '@theia/core/lib/browser/shell/shell-layout-resto
 import { Message } from '@theia/core/shared/@phosphor/messaging';
 import { TreeViewWidget } from './tree-view-widget';
 import { DescriptionWidget } from '@theia/core/lib/browser/view-container';
-import { DisposableCollection, Emitter } from '@theia/core/lib/common';
+import { DisposableCollection, Emitter, Event } from '@theia/core/lib/common';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 
 @injectable()
@@ -34,7 +34,14 @@ export class PluginViewWidgetIdentifier {
 @injectable()
 export class PluginViewWidget extends Panel implements StatefulWidget, DescriptionWidget {
 
-    protected readonly toDispose = new DisposableCollection();
+    currentViewContainerId?: string;
+
+    protected _message?: string;
+    protected _description: string = '';
+    protected _suppressUpdateViewVisibility = false;
+    protected updatingViewVisibility = false;
+    protected onDidChangeDescriptionEmitter = new Emitter<void>();
+    protected toDispose = new DisposableCollection(this.onDidChangeDescriptionEmitter);
 
     @inject(MenuModelRegistry)
     protected readonly menus: MenuModelRegistry;
@@ -48,16 +55,12 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
     @inject(PluginViewWidgetIdentifier)
     readonly options: PluginViewWidgetIdentifier;
 
-    currentViewContainerId: string | undefined;
-
     constructor() {
         super();
         this.node.tabIndex = -1;
         this.node.style.height = '100%';
     }
 
-    public onDidChangeDescription: Emitter<void> = new Emitter<void>();
-
     @postConstruct()
     protected init(): void {
         this.id = this.options.id;
@@ -66,6 +69,10 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         this.toDispose.push(localContext);
     }
 
+    get onDidChangeDescription(): Event<void> {
+        return this.onDidChangeDescriptionEmitter.event;
+    }
+
     protected override onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
         const widget = this.widgets[0];
@@ -97,12 +104,10 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         }
     }
 
-    protected _suppressUpdateViewVisibility = false;
     set suppressUpdateViewVisibility(suppressUpdateViewVisibility: boolean) {
         this._suppressUpdateViewVisibility = !this.updatingViewVisibility && suppressUpdateViewVisibility;
     }
 
-    protected updatingViewVisibility = false;
     updateViewVisibility(cb: () => void): void {
         if (this._suppressUpdateViewVisibility) {
             return;
@@ -115,7 +120,6 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         }
     }
 
-    private _message: string | undefined;
     get message(): string | undefined {
         return this._message;
     }
@@ -125,14 +129,13 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         this.updateWidgetMessage();
     }
 
-    private _description: string = '';
     get description(): string {
         return this._description;
     }
 
     set description(description: string) {
         this._description = description;
-        this.onDidChangeDescription.fire();
+        this.onDidChangeDescriptionEmitter.fire();
     }
 
     private updateWidgetMessage(): void {

package/src/main/browser/view/tree-view-decorator-service.ts

@@ -32,9 +32,9 @@ export class TreeViewDecoratorAdapter extends FileTreeDecoratorAdapter {
         }
     }
 
-    protected isTreeItem(node: object | undefined): node is TreeItem & { resourceUri: Uri } {
+    protected isTreeItem(node: unknown): node is TreeItem & { resourceUri: Uri } {
         const candidate = node as TreeItem;
-        return !!candidate && 'resourceUri' in candidate && !!candidate.resourceUri;
+        return !!candidate && typeof node === 'object' && 'resourceUri' in candidate && !!candidate.resourceUri;
     }
 }
 

package/src/main/node/plugin-ext-backend-module.ts

@@ -39,8 +39,10 @@ import { PluginTheiaEnvironment } from '../common/plugin-theia-environment';
 import { PluginTheiaDeployerParticipant } from './plugin-theia-deployer-participant';
 import { WebviewBackendSecurityWarnings } from './webview-backend-security-warnings';
 import { PluginUninstallationManager } from './plugin-uninstallation-manager';
+import { LocalizationBackendContribution } from '@theia/core/lib/node/i18n/localization-backend-contribution';
+import { PluginLocalizationBackendContribution } from './plugin-localization-backend-contribution';
 
-export function bindMainBackend(bind: interfaces.Bind): void {
+export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
     bind(PluginApiContribution).toSelf().inSingletonScope();
     bind(BackendApplicationContribution).toService(PluginApiContribution);
     bind(WsRequestValidatorContribution).toService(PluginApiContribution);
@@ -85,4 +87,7 @@ export function bindMainBackend(bind: interfaces.Bind): void {
 
     bind(WebviewBackendSecurityWarnings).toSelf().inSingletonScope();
     bind(BackendApplicationContribution).toService(WebviewBackendSecurityWarnings);
+
+    rebind(LocalizationBackendContribution).to(PluginLocalizationBackendContribution).inSingletonScope();
+
 }

package/src/main/node/plugin-localization-backend-contribution.ts

@@ -0,0 +1,42 @@
+// *****************************************************************************
+// Copyright (C) 2021 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { LocalizationBackendContribution } from '@theia/core/lib/node/i18n/localization-backend-contribution';
+import { PluginDeployer } from '../../common/plugin-protocol';
+import { PluginDeployerImpl } from './plugin-deployer-impl';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+
+@injectable()
+export class PluginLocalizationBackendContribution extends LocalizationBackendContribution {
+    @inject(PluginDeployer)
+    protected readonly pluginDeployer: PluginDeployerImpl;
+    protected readonly pluginsDeployed = new Deferred();
+
+    override async initialize(): Promise<void> {
+        this.pluginDeployer.onDidDeploy(() => {
+            this.pluginsDeployed.resolve();
+        });
+        await super.initialize();
+    }
+
+    override async waitForInitialization(): Promise<void> {
+        await Promise.all([
+            super.waitForInitialization(),
+            this.pluginsDeployed.promise,
+        ]);
+    }
+}

package/src/plugin/authentication-ext.ts

@@ -34,13 +34,6 @@ export class AuthenticationExtImpl implements AuthenticationExt {
     private proxy: AuthenticationMain;
     private authenticationProviders: Map<string, theia.AuthenticationProvider> = new Map<string, theia.AuthenticationProvider>();
 
-    private _providerIds: string[] = [];
-
-    private _providers: theia.AuthenticationProviderInformation[] = [];
-
-    private onDidChangeAuthenticationProvidersEmitter = new Emitter<theia.AuthenticationProvidersChangeEvent>();
-    readonly onDidChangeAuthenticationProviders: Event<theia.AuthenticationProvidersChangeEvent> = this.onDidChangeAuthenticationProvidersEmitter.event;
-
     private onDidChangeSessionsEmitter = new Emitter<theia.AuthenticationSessionsChangeEvent>();
     readonly onDidChangeSessions: Event<theia.AuthenticationSessionsChangeEvent> = this.onDidChangeSessionsEmitter.event;
 
@@ -48,18 +41,6 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.AUTHENTICATION_MAIN);
     }
 
-    getProviderIds(): Promise<ReadonlyArray<string>> {
-        return this.proxy.$getProviderIds();
-    }
-
-    get providerIds(): string[] {
-        return this._providerIds;
-    }
-
-    get providers(): ReadonlyArray<theia.AuthenticationProviderInformation> {
-        return Object.freeze(this._providers.slice());
-    }
-
     async getSession(requestingExtension: InternalPlugin, providerId: string, scopes: readonly string[],
         options: theia.AuthenticationGetSessionOptions & ({ createIfNone: true } | { forceNewSession: true } | { forceNewSession: { detail: string } })):
         Promise<theia.AuthenticationSession>;
@@ -76,29 +57,14 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         return this.proxy.$getSession(providerId, scopes, extensionId, extensionName, options);
     }
 
-    async logout(providerId: string, sessionId: string): Promise<void> {
-        return this.proxy.$removeSession(providerId, sessionId);
-    }
-
     registerAuthenticationProvider(id: string, label: string, provider: theia.AuthenticationProvider, options?: theia.AuthenticationProviderOptions): theia.Disposable {
         if (this.authenticationProviders.get(id)) {
             throw new Error(`An authentication provider with id '${id}' is already registered.`);
         }
 
         this.authenticationProviders.set(id, provider);
-        if (this._providerIds.indexOf(id) === -1) {
-            this._providerIds.push(id);
-        }
-
-        if (!this._providers.find(p => p.id === id)) {
-            this._providers.push({
-                id,
-                label
-            });
-        }
-
         const listener = provider.onDidChangeSessions(e => {
-            this.proxy.$sendDidChangeSessions(id, e);
+            this.proxy.$onDidChangeSessions(id, e);
         });
 
         this.proxy.$registerAuthenticationProvider(id, label, !!options?.supportsMultipleAccounts);
@@ -106,16 +72,6 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         return new Disposable(() => {
             listener.dispose();
             this.authenticationProviders.delete(id);
-            const index = this._providerIds.findIndex(pid => id === pid);
-            if (index > -1) {
-                this._providerIds.splice(index);
-            }
-
-            const i = this._providers.findIndex(p => p.id === id);
-            if (i > -1) {
-                this._providers.splice(i);
-            }
-
             this.proxy.$unregisterAuthenticationProvider(id);
         });
     }
@@ -163,30 +119,7 @@ export class AuthenticationExtImpl implements AuthenticationExt {
         throw new Error(`Unable to find authentication provider with handle: ${providerId}`);
     }
 
-    $onDidChangeAuthenticationSessions(id: string, label: string): Promise<void> {
-        this.onDidChangeSessionsEmitter.fire({ provider: { id, label } });
-        return Promise.resolve();
-    }
-
-    async $onDidChangeAuthenticationProviders(added: theia.AuthenticationProviderInformation[], removed: theia.AuthenticationProviderInformation[]): Promise<void> {
-        added.forEach(id => {
-            if (this._providers.indexOf(id) === -1) {
-                this._providers.push(id);
-            }
-        });
-
-        removed.forEach(p => {
-            const index = this._providers.findIndex(provider => provider.id === p.id);
-            if (index > -1) {
-                this._providers.splice(index);
-            }
-        });
-
-        this.onDidChangeAuthenticationProvidersEmitter.fire({ added, removed });
-    }
-
-    $setProviders(providers: theia.AuthenticationProviderInformation[]): Promise<void> {
-        this._providers.push(...providers);
-        return Promise.resolve(undefined);
+    async $onDidChangeAuthenticationSessions(provider: theia.AuthenticationProviderInformation): Promise<void> {
+        this.onDidChangeSessionsEmitter.fire({ provider });
     }
 }

package/src/plugin/debug/debug-ext.ts

@@ -31,7 +31,7 @@ import uuid = require('uuid');
 import { DebugAdapter } from '@theia/debug/lib/common/debug-model';
 import { PluginDebugAdapterCreator } from './plugin-debug-adapter-creator';
 import { NodeDebugAdapterCreator } from '../node/debug/plugin-node-debug-adapter-creator';
-import { DebugProtocol } from 'vscode-debugprotocol';
+import { DebugProtocol } from '@vscode/debugprotocol';
 
 interface ConfigurationProviderRecord {
     handle: number;

package/src/plugin/languages/code-action.ts

@@ -145,20 +145,17 @@ export class CodeActionAdapter {
         return this.cacheId++;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    private static _isCommand(smth: any): smth is theia.Command {
-        return typeof (<theia.Command>smth).command === 'string';
+    private static _isCommand(arg: unknown): arg is theia.Command {
+        return !!arg && typeof arg === 'object' && typeof (arg as theia.Command).command === 'string';
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    private static _isSelection(obj: any): obj is Selection {
-        return (
-            obj
-            && (typeof obj.selectionStartLineNumber === 'number')
-            && (typeof obj.selectionStartColumn === 'number')
-            && (typeof obj.positionLineNumber === 'number')
-            && (typeof obj.positionColumn === 'number')
-        );
+    private static _isSelection(obj: unknown): obj is Selection {
+        const selection = obj as Selection;
+        return !!obj && typeof obj === 'object'
+            && typeof selection.selectionStartLineNumber === 'number'
+            && typeof selection.selectionStartColumn === 'number'
+            && typeof selection.positionLineNumber === 'number'
+            && typeof selection.positionColumn === 'number';
     }
 
 }

package/src/plugin/languages/document-highlight.ts

@@ -55,8 +55,7 @@ export class DocumentHighlightAdapter {
         });
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    private isDocumentHighlightArray(array: any): array is types.DocumentHighlight[] {
+    private isDocumentHighlightArray(array: unknown): array is types.DocumentHighlight[] {
         return Array.isArray(array) && array.length > 0 && array[0] instanceof types.DocumentHighlight;
     }
 }

package/src/plugin/languages/evaluatable-expression.ts

@@ -0,0 +1,47 @@
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { URI } from '@theia/core/shared/vscode-uri';
+import * as theia from '@theia/plugin';
+import { Position } from '../../common/plugin-api-rpc';
+import { EvaluatableExpression } from '../../common/plugin-api-rpc-model';
+import { DocumentsExtImpl } from '../documents';
+import * as Converter from '../type-converters';
+
+export class EvaluatableExpressionAdapter {
+
+    constructor(
+        private readonly provider: theia.EvaluatableExpressionProvider,
+        private readonly documents: DocumentsExtImpl
+    ) { }
+
+    async provideEvaluatableExpression(resource: URI, position: Position, token: theia.CancellationToken): Promise<EvaluatableExpression | undefined> {
+        const documentData = this.documents.getDocumentData(resource);
+        if (!documentData) {
+            return Promise.reject(new Error(`There is no document data for ${resource}`));
+        }
+
+        const document = documentData.document;
+        const pos = Converter.toPosition(position);
+
+        return Promise.resolve(this.provider.provideEvaluatableExpression(document, pos, token)).then(expression => {
+            if (!expression) {
+                return undefined;
+            }
+            return Converter.fromEvaluatableExpression(expression);
+        });
+    }
+}

package/src/plugin/languages/util.ts

@@ -17,12 +17,10 @@
 import * as theia from '@theia/plugin';
 import * as types from '../types-impl';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isLocationArray(array: any): array is types.Location[] {
+export function isLocationArray(array: unknown): array is types.Location[] {
     return Array.isArray(array) && array.length > 0 && array[0] instanceof types.Location;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isDefinitionLinkArray(array: any): array is theia.DefinitionLink[] {
+export function isDefinitionLinkArray(array: unknown): array is theia.DefinitionLink[] {
     return Array.isArray(array) && array.length > 0 && array[0].hasOwnProperty('targetUri') && array[0].hasOwnProperty('targetRange');
 }