@theia/plugin-ext 1.29.0-next.2 → 1.29.0-next.20

package/src/common/plugin-api-rpc.ts

@@ -41,6 +41,7 @@ import {
     MarkerData,
     SignatureHelp,
     Hover,
+    EvaluatableExpression,
     DocumentHighlight,
     FormattingOptions,
     ChainedCacheId,
@@ -733,7 +734,7 @@ export interface TreeViewSelection {
     treeItemId: string
 }
 export namespace TreeViewSelection {
-    export function is(arg: Object | any): arg is TreeViewSelection {
+    export function is(arg: unknown): arg is TreeViewSelection {
         return !!arg && typeof arg === 'object' && 'treeViewId' in arg && 'treeItemId' in arg;
     }
 }
@@ -779,7 +780,7 @@ export interface ScmCommandArg {
     resourceStateHandle?: number
 }
 export namespace ScmCommandArg {
-    export function is(arg: Object | undefined): arg is ScmCommandArg {
+    export function is(arg: unknown): arg is ScmCommandArg {
         return !!arg && typeof arg === 'object' && 'sourceControlHandle' in arg;
     }
 }
@@ -795,7 +796,7 @@ export interface ScmExt {
 }
 
 export namespace TimelineCommandArg {
-    export function is(arg: Object | undefined): arg is TimelineCommandArg {
+    export function is(arg: unknown): arg is TimelineCommandArg {
         return !!arg && typeof arg === 'object' && 'timelineHandle' in arg;
     }
 }
@@ -814,7 +815,7 @@ export type DecorationData = [boolean, string, string, ThemeColor];
 export interface DecorationReply { [id: number]: DecorationData; }
 
 export namespace CommentsCommandArg {
-    export function is(arg: Object | undefined): arg is CommentsCommandArg {
+    export function is(arg: unknown): arg is CommentsCommandArg {
         return !!arg && typeof arg === 'object' && 'commentControlHandle' in arg && 'commentThreadHandle' in arg && 'text' in arg && !('commentUniqueId' in arg);
     }
 }
@@ -825,7 +826,7 @@ export interface CommentsCommandArg {
 }
 
 export namespace CommentsContextCommandArg {
-    export function is(arg: Object | undefined): arg is CommentsContextCommandArg {
+    export function is(arg: unknown): arg is CommentsContextCommandArg {
         return !!arg && typeof arg === 'object' && 'commentControlHandle' in arg && 'commentThreadHandle' in arg && 'commentUniqueId' in arg && !('text' in arg);
     }
 }
@@ -836,7 +837,7 @@ export interface CommentsContextCommandArg {
 }
 
 export namespace CommentsEditCommandArg {
-    export function is(arg: Object | undefined): arg is CommentsEditCommandArg {
+    export function is(arg: unknown): arg is CommentsEditCommandArg {
         return !!arg && typeof arg === 'object' && 'commentControlHandle' in arg && 'commentThreadHandle' in arg && 'commentUniqueId' in arg && 'text' in arg;
     }
 }
@@ -1263,18 +1264,24 @@ export interface PreferenceRegistryMain {
         target: boolean | ConfigurationTarget | undefined,
         key: string,
         value: any,
-        resource?: string
+        resource?: string,
+        withLanguageOverride?: boolean
     ): PromiseLike<void>;
     $removeConfigurationOption(
         target: boolean | ConfigurationTarget | undefined,
         key: string,
-        resource?: string
+        resource?: string,
+        withLanguageOverride?: boolean,
     ): PromiseLike<void>;
 }
 
 export interface PreferenceChangeExt {
     preferenceName: string,
-    newValue: any
+    newValue: any,
+    /**
+     * The URI the folder affected, or undefined if User scope.
+     */
+    scope?: string;
 }
 
 export interface TerminalOptionsExt {
@@ -1464,6 +1471,7 @@ export interface LanguagesExt {
     ): Promise<SignatureHelp | undefined>;
     $releaseSignatureHelp(handle: number, id: number): void;
     $provideHover(handle: number, resource: UriComponents, position: Position, token: CancellationToken): Promise<Hover | undefined>;
+    $provideEvaluatableExpression(handle: number, resource: UriComponents, position: Position, token: CancellationToken): Promise<EvaluatableExpression | undefined>;
     $provideDocumentHighlights(handle: number, resource: UriComponents, position: Position, token: CancellationToken): Promise<DocumentHighlight[] | undefined>;
     $provideDocumentFormattingEdits(handle: number, resource: UriComponents,
         options: FormattingOptions, token: CancellationToken): Promise<TextEdit[] | undefined>;
@@ -1540,6 +1548,7 @@ export interface LanguagesMain {
     $registerReferenceProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;
     $registerSignatureHelpProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], metadata: theia.SignatureHelpProviderMetadata): void;
     $registerHoverProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;
+    $registerEvaluatableExpressionProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;
     $registerDocumentHighlightProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;
     $registerQuickFixProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], codeActionKinds?: string[], documentation?: CodeActionProviderDocumentation): void;
     $clearDiagnostics(id: string): void;

package/src/common/rpc-protocol.ts

@@ -70,9 +70,8 @@ export namespace ConnectionClosedError {
     export function create(message: string = 'connection is closed'): ConnectionClosedError {
         return Object.assign(new Error(message), { code });
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    export function is(error: any): error is ConnectionClosedError {
-        return !!error && typeof error === 'object' && 'code' in error && error['code'] === code;
+    export function is(error: unknown): error is ConnectionClosedError {
+        return !!error && typeof error === 'object' && 'code' in error && (error as ConnectionClosedError).code === code;
     }
 }
 
@@ -469,8 +468,9 @@ enum SerializedObjectType {
     TEXT_BUFFER
 }
 
-function isSerializedObject(obj: any): obj is SerializedObject {
-    return obj && obj.$type !== undefined && obj.data !== undefined;
+function isSerializedObject(obj: unknown): obj is SerializedObject {
+    const serializedObject = obj as SerializedObject;
+    return !!obj && typeof obj === 'object' && serializedObject.$type !== undefined && serializedObject.data !== undefined;
 }
 
 export const enum MessageType {

package/src/main/browser/comments/comment-thread-widget.tsx

@@ -22,7 +22,6 @@ import {
 } from '../../../common/plugin-api-rpc-model';
 import { CommentGlyphWidget } from './comment-glyph-widget';
 import { BaseWidget, DISABLED_CLASS } from '@theia/core/lib/browser';
-import * as ReactDOM from '@theia/core/shared/react-dom';
 import * as React from '@theia/core/shared/react';
 import { MouseTargetType } from '@theia/editor/lib/browser';
 import { CommentsService } from './comments-service';
@@ -36,6 +35,7 @@ import {
 import { CommentsContextKeyService } from './comments-context-key-service';
 import { RefObject } from '@theia/core/shared/react';
 import * as monaco from '@theia/monaco-editor-core';
+import { createRoot, Root } from '@theia/core/shared/react-dom/client';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -50,6 +50,7 @@ export const COMMENT_TITLE: MenuPath = ['comment-title-menu'];
 export class CommentThreadWidget extends BaseWidget {
 
     protected readonly zoneWidget: MonacoEditorZoneWidget;
+    protected readonly containerNodeRoot: Root;
     protected readonly commentGlyphWidget: CommentGlyphWidget;
     protected readonly contextMenu: CompositeMenuNode;
     protected readonly commentFormRef: RefObject<CommentForm> = React.createRef<CommentForm>();
@@ -67,6 +68,7 @@ export class CommentThreadWidget extends BaseWidget {
     ) {
         super();
         this.toDispose.push(this.zoneWidget = new MonacoEditorZoneWidget(editor));
+        this.containerNodeRoot = createRoot(this.zoneWidget.containerNode);
         this.toDispose.push(this.commentGlyphWidget = new CommentGlyphWidget(editor));
         this.toDispose.push(this._commentThread.onDidChangeCollapsibleState(state => {
             if (state === CommentThreadCollapsibleState.Expanded && !this.isExpanded) {
@@ -255,7 +257,7 @@ export class CommentThreadWidget extends BaseWidget {
 
     protected render(): void {
         const headHeight = Math.ceil(this.zoneWidget.editor.getOption(monaco.editor.EditorOption.lineHeight) * 1.2);
-        ReactDOM.render(<div className={'review-widget'}>
+        this.containerNodeRoot.render(<div className={'review-widget'}>
             <div className={'head'} style={{ height: headHeight, lineHeight: `${headHeight}px` }}>
                 <div className={'review-title'}>
                     <span className={'filename'}>{this.getThreadLabel()}</span>
@@ -295,7 +297,7 @@ export class CommentThreadWidget extends BaseWidget {
                     ref={this.commentFormRef}
                 />
             </div>
-        </div>, this.zoneWidget.containerNode);
+        </div>);
     }
 }
 

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

@@ -66,6 +66,9 @@ import * as MonacoPath from '@theia/monaco-editor-core/esm/vs/base/common/path';
 import { IRelativePattern } from '@theia/monaco-editor-core/esm/vs/base/common/glob';
 import { EditorLanguageStatusService, LanguageStatus as EditorLanguageStatus } from '@theia/editor/lib/browser/language-status/editor-language-status-service';
 import { LanguageSelector, RelativePattern } from '@theia/editor/lib/common/language-selector';
+import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
+import { EvaluatableExpression, EvaluatableExpressionProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
+import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 
 /**
  * @monaco-uplift The public API declares these functions as (languageId: string, service).
@@ -338,7 +341,26 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         return this.proxy.$provideHover(handle, model.uri, position, token);
     }
 
-    $registerDocumentHighlightProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
+    $registerEvaluatableExpressionProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
+        const languageSelector = this.toLanguageSelector(selector);
+        const evaluatableExpressionProvider = this.createEvaluatableExpressionProvider(handle);
+        this.register(handle,
+            (StandaloneServices.get(ILanguageFeaturesService).evaluatableExpressionProvider.register as RegistrationFunction<EvaluatableExpressionProvider>)
+                (languageSelector, evaluatableExpressionProvider));
+    }
+
+    protected createEvaluatableExpressionProvider(handle: number): EvaluatableExpressionProvider {
+        return {
+            provideEvaluatableExpression: (model, position, token) => this.provideEvaluatableExpression(handle, model, position, token)
+        };
+    }
+
+    protected provideEvaluatableExpression(handle: number, model: ITextModel, position: monaco.Position,
+        token: monaco.CancellationToken): monaco.languages.ProviderResult<EvaluatableExpression | undefined> {
+        return this.proxy.$provideEvaluatableExpression(handle, model.uri, position, token);
+    }
+
+    $registerDocumentHighlightProvider(handle: number, _pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const documentHighlightProvider = this.createDocumentHighlightProvider(handle);
         this.register(handle, (monaco.languages.registerDocumentHighlightProvider as RegistrationFunction<monaco.languages.DocumentHighlightProvider>)

package/src/main/browser/plugin-ext-frontend-module.ts

@@ -79,6 +79,7 @@ import { AuthenticationService } from '@theia/core/lib/browser/authentication-se
 import { bindTreeViewDecoratorUtilities, TreeViewDecoratorService } from './view/tree-view-decorator-service';
 import { CodeEditorWidgetUtil } from './menus/vscode-theia-menu-mappings';
 import { PluginMenuCommandAdapter } from './menus/plugin-menu-command-adapter';
+import './theme-icon-override';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 

package/src/main/browser/preference-registry-main.ts

@@ -70,11 +70,10 @@ export class PreferenceRegistryMainImpl implements PreferenceRegistryMain, Dispo
 
             const roots = workspaceService.tryGetRoots();
             const data = getPreferences(preferenceProviderProvider, roots);
-            const eventData: PreferenceChangeExt[] = [];
-            for (const preferenceName of Object.keys(changes)) {
-                const { newValue } = changes[preferenceName];
-                eventData.push({ preferenceName, newValue });
-            }
+            const eventData = Object.values(changes).map<PreferenceChangeExt>(({ scope, newValue, domain, preferenceName }) => {
+                const extScope = scope === PreferenceScope.User ? undefined : domain?.[0];
+                return { preferenceName, newValue, scope: extScope };
+            });
             this.proxy.$acceptConfigurationChanged(data, eventData);
         }));
     }
@@ -84,17 +83,19 @@ export class PreferenceRegistryMainImpl implements PreferenceRegistryMain, Dispo
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async $updateConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, value: any, resource?: string): Promise<void> {
-        const scope = this.parseConfigurationTarget(target);
-        await this.preferenceService.set(key, value, scope, resource);
+    async $updateConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, value: any, resource?: string, withLanguageOverride?: boolean): Promise<void> {
+        const scope = this.parseConfigurationTarget(target, resource);
+        const effectiveKey = this.getEffectiveKey(key, scope, withLanguageOverride, resource);
+        await this.preferenceService.set(effectiveKey, value, scope, resource);
     }
 
-    async $removeConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, resource?: string): Promise<void> {
-        const scope = this.parseConfigurationTarget(target);
-        await this.preferenceService.set(key, undefined, scope, resource);
+    async $removeConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, resource?: string, withLanguageOverride?: boolean): Promise<void> {
+        const scope = this.parseConfigurationTarget(target, resource);
+        const effectiveKey = this.getEffectiveKey(key, scope, withLanguageOverride, resource);
+        await this.preferenceService.set(effectiveKey, undefined, scope, resource);
     }
 
-    private parseConfigurationTarget(target?: boolean | ConfigurationTarget): PreferenceScope | undefined {
+    private parseConfigurationTarget(target?: boolean | ConfigurationTarget, resource?: string): PreferenceScope {
         if (typeof target === 'boolean') {
             return target ? PreferenceScope.User : PreferenceScope.Workspace;
         }
@@ -106,9 +107,17 @@ export class PreferenceRegistryMainImpl implements PreferenceRegistryMain, Dispo
             case ConfigurationTarget.WorkspaceFolder:
                 return PreferenceScope.Folder;
             default:
-                // PreferenceService knows how to deal with undefined in VS Code compatible way
-                return undefined;
+                return resource ? PreferenceScope.Folder : PreferenceScope.Workspace;
         }
     }
 
+    // If the caller does not set `withLanguageOverride = true`, we have to check whether the setting exists with that override already.
+    protected getEffectiveKey(key: string, scope: PreferenceScope, withLanguageOverride?: boolean, resource?: string): string {
+        if (withLanguageOverride) { return key; }
+        const overridden = this.preferenceService.overriddenPreferenceName(key);
+        if (!overridden) { return key; }
+        const value = this.preferenceService.inspectInScope(key, scope, resource, withLanguageOverride);
+        return value === undefined ? overridden.preferenceName : key;
+    }
+
 }

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/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/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');
 }