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

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

@@ -41,6 +41,7 @@ import {
     MarkerData,
     SignatureHelp,
     Hover,
+    EvaluatableExpression,
     DocumentHighlight,
     FormattingOptions,
     ChainedCacheId,
@@ -84,7 +85,7 @@ import {
     ProgressOptions,
 } from '@theia/plugin';
 import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
-import { DebugProtocol } from 'vscode-debugprotocol';
+import { DebugProtocol } from '@vscode/debugprotocol';
 import { SymbolInformation } from '@theia/core/shared/vscode-languageserver-protocol';
 import { ArgumentProcessor } from '../plugin/command-registry';
 import * as files from '@theia/filesystem/lib/common/files';
@@ -424,7 +425,7 @@ export type Item = string | theia.QuickPickItem;
 
 export interface QuickOpenExt {
     $onItemSelected(handle: number): void;
-    $validateInput(input: string): Promise<string | null | undefined> | undefined;
+    $validateInput(input: string): Promise<string | { content: string; severity: Severity; } | null | undefined> | undefined;
 
     $acceptOnDidAccept(sessionId: number): Promise<void>;
     $acceptDidChangeValue(sessionId: number, changedValue: string): Promise<void>;
@@ -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;
     }
 }
@@ -1470,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>;
@@ -1546,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;
@@ -1940,20 +1943,15 @@ export interface AuthenticationExt {
     $getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<theia.AuthenticationSession>>;
     $createSession(id: string, scopes: string[]): Promise<theia.AuthenticationSession>;
     $removeSession(id: string, sessionId: string): Promise<void>;
-    $onDidChangeAuthenticationSessions(id: string, label: string): Promise<void>;
-    $onDidChangeAuthenticationProviders(added: theia.AuthenticationProviderInformation[], removed: theia.AuthenticationProviderInformation[]): Promise<void>;
-    $setProviders(providers: theia.AuthenticationProviderInformation[]): Promise<void>;
+    $onDidChangeAuthenticationSessions(provider: theia.AuthenticationProviderInformation): Promise<void>;
 }
 
 export interface AuthenticationMain {
     $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): void;
     $unregisterAuthenticationProvider(id: string): void;
-    $getProviderIds(): Promise<string[]>;
-    $ensureProvider(id: string): Promise<void>;
-    $sendDidChangeSessions(providerId: string, event: AuthenticationProviderAuthenticationSessionsChangeEvent): void;
+    $onDidChangeSessions(providerId: string, event: AuthenticationProviderAuthenticationSessionsChangeEvent): void;
     $getSession(providerId: string, scopes: readonly string[], extensionId: string, extensionName: string,
         options: theia.AuthenticationGetSessionOptions): Promise<theia.AuthenticationSession | undefined>;
-    $removeSession(providerId: string, sessionId: string): Promise<void>;
 }
 
 export interface RawColorInfo {

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/authentication-main.ts

@@ -21,7 +21,7 @@
 // code copied and modified from https://github.com/microsoft/vscode/blob/1.47.3/src/vs/workbench/api/browser/mainThreadAuthentication.ts
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { AuthenticationExt, AuthenticationMain, PluginManagerExt, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
+import { AuthenticationExt, AuthenticationMain, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { Dialog, StorageService } from '@theia/core/lib/browser';
@@ -43,28 +43,17 @@ export class AuthenticationMainImpl implements AuthenticationMain {
     private readonly storageService: StorageService;
     private readonly authenticationService: AuthenticationService;
     private readonly quickPickService: QuickPickService;
-    private readonly extensionService: PluginManagerExt;
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.AUTHENTICATION_EXT);
         this.messageService = container.get(MessageService);
         this.storageService = container.get(StorageService);
         this.authenticationService = container.get(AuthenticationService);
         this.quickPickService = container.get(QuickPickService);
-        this.extensionService = rpc.getProxy(MAIN_RPC_CONTEXT.HOSTED_PLUGIN_MANAGER_EXT);
 
         this.authenticationService.onDidChangeSessions(e => {
-            this.proxy.$onDidChangeAuthenticationSessions(e.providerId, e.label);
-        });
-        this.authenticationService.onDidRegisterAuthenticationProvider(info => {
-            this.proxy.$onDidChangeAuthenticationProviders([info], []);
-        });
-        this.authenticationService.onDidUnregisterAuthenticationProvider(providerId => {
-            this.proxy.$onDidChangeAuthenticationProviders([], [providerId]);
+            this.proxy.$onDidChangeAuthenticationSessions({ id: e.providerId, label: e.label });
         });
     }
-    $getProviderIds(): Promise<string[]> {
-        return Promise.resolve(this.authenticationService.getProviderIds());
-    }
 
     async $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): Promise<void> {
         const provider = new AuthenticationProviderImpl(this.proxy, id, label, supportsMultipleAccounts, this.storageService, this.messageService);
@@ -230,15 +219,7 @@ export class AuthenticationMainImpl implements AuthenticationMain {
         this.storageService.setData(`authentication-session-${extensionName}-${providerId}`, sessionId);
     }
 
-    $ensureProvider(id: string): Promise<void> {
-        return this.extensionService.$activateByEvent(getAuthenticationProviderActivationEvent(id));
-    }
-
-    $removeSession(providerId: string, sessionId: string): Promise<void> {
-        return this.authenticationService.logout(providerId, sessionId);
-    }
-
-    $sendDidChangeSessions(providerId: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
+    $onDidChangeSessions(providerId: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
         this.authenticationService.updateSessions(providerId, event);
     }
 }
@@ -272,8 +253,10 @@ interface AccountUsage {
 }
 
 export class AuthenticationProviderImpl implements AuthenticationProvider {
-    private accounts = new Map<string, string[]>(); // Map account name to session ids
-    private sessions = new Map<string, string>(); // Map account id to name
+    /** map from account name to session ids */
+    private accounts = new Map<string, string[]>();
+    /** map from session id to account name */
+    private sessions = new Map<string, string>();
 
     readonly onDidChangeSessions: theia.Event<theia.AuthenticationProviderAuthenticationSessionsChangeEvent>;
 
@@ -313,7 +296,7 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
             Dialog.CANCEL);
 
         if (result && result === nls.localizeByDefault('Sign Out') && sessionsForAccount) {
-            sessionsForAccount.forEach(sessionId => this.logout(sessionId));
+            sessionsForAccount.forEach(sessionId => this.removeSession(sessionId));
             removeAccountUsage(this.storageService, this.id, accountName);
         }
     }
@@ -325,10 +308,10 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
     async updateSessionItems(event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): Promise<void> {
         const { added, removed } = event;
         const session = await this.proxy.$getSessions(this.id);
-        const addedSessions = session.filter(s => added.some(addedSession => this.getSessionId(addedSession) === s.id));
+        const addedSessions = added ? session.filter(s => added.some(addedSession => addedSession.id === s.id)) : [];
 
-        removed.forEach(removedSession => {
-            const sessionId = this.getSessionId(removedSession);
+        removed?.forEach(removedSession => {
+            const sessionId = removedSession.id;
             if (sessionId) {
                 const accountName = this.sessions.get(sessionId);
                 if (accountName) {
@@ -347,29 +330,21 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
         addedSessions.forEach(s => this.registerSession(s));
     }
 
-    login(scopes: string[]): Promise<theia.AuthenticationSession> {
-        return this.proxy.$createSession(this.id, scopes);
+    async login(scopes: string[]): Promise<theia.AuthenticationSession> {
+        return this.createSession(scopes);
     }
 
     async logout(sessionId: string): Promise<void> {
-        await this.proxy.$removeSession(this.id, sessionId);
-        this.messageService.info('Successfully signed out.');
+        return this.removeSession(sessionId);
     }
 
     createSession(scopes: string[]): Thenable<theia.AuthenticationSession> {
-        return this.login(scopes);
+        return this.proxy.$createSession(this.id, scopes);
     }
 
     removeSession(sessionId: string): Thenable<void> {
-        return this.logout(sessionId);
-    }
-
-    // utility method to be backwards compatible with the old AuthenticationProviderAuthenticationSessionsChangeEvent containing only the session id string
-    private getSessionId(obj: string | theia.AuthenticationSession | undefined): string | undefined {
-        if (!obj || typeof obj === 'string') {
-            return obj;
-        }
-        return obj.id;
+        return this.proxy.$removeSession(this.id, sessionId)
+            .then(() => { this.messageService.info('Successfully signed out.'); });
     }
 }
 

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/debug/debug-main.ts

@@ -34,7 +34,7 @@ import { URI as Uri } from '@theia/core/shared/vscode-uri';
 import { SourceBreakpoint, FunctionBreakpoint } from '@theia/debug/lib/browser/breakpoint/breakpoint-marker';
 import { DebugConfiguration, DebugSessionOptions } from '@theia/debug/lib/common/debug-configuration';
 import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
-import { DebugProtocol } from 'vscode-debugprotocol';
+import { DebugProtocol } from '@vscode/debugprotocol';
 import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
@@ -55,6 +55,7 @@ import { ContributionProvider } from '@theia/core/lib/common';
 import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
 import { ConnectionImpl } from '../../../common/connection';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { DebugSessionOptions as TheiaDebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
 
 export class DebugMainImpl implements DebugMain, Disposable {
     private readonly debugExt: DebugExt;
@@ -294,29 +295,36 @@ export class DebugMainImpl implements DebugMain, Disposable {
     }
 
     async $startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration, options: DebugSessionOptions): Promise<boolean> {
-        let configuration: DebugConfiguration | undefined;
-
+        // search for matching options
+        let sessionOptions: TheiaDebugSessionOptions | undefined;
         if (typeof nameOrConfiguration === 'string') {
             for (const configOptions of this.configurationManager.all) {
-                if (configOptions.configuration.name === nameOrConfiguration) {
-                    configuration = configOptions.configuration;
+                if (configOptions.name === nameOrConfiguration) {
+                    sessionOptions = configOptions;
                 }
             }
         } else {
-            configuration = nameOrConfiguration;
+            sessionOptions = {
+                name: nameOrConfiguration.name,
+                configuration: nameOrConfiguration
+            };
         }
 
-        if (!configuration) {
+        if (!sessionOptions) {
             console.error(`There is no debug configuration for ${nameOrConfiguration}`);
             return false;
         }
 
-        const debugConfiguration = { ...configuration, ...options };
-        const session = await this.sessionManager.start({
-            configuration: debugConfiguration,
-            workspaceFolderUri: folder && Uri.revive(folder.uri).toString()
-        });
+        // translate given extra data
+        const workspaceFolderUri = folder && Uri.revive(folder.uri).toString();
+        if (TheiaDebugSessionOptions.isConfiguration(sessionOptions)) {
+            sessionOptions = { ...sessionOptions, configuration: { ...sessionOptions.configuration, ...options }, workspaceFolderUri };
+        } else {
+            sessionOptions = { ...sessionOptions, ...options, workspaceFolderUri };
+        }
 
+        // start options
+        const session = await this.sessionManager.start(sessionOptions);
         return !!session;
     }
 

package/src/main/browser/debug/plugin-debug-session-factory.ts

@@ -22,7 +22,7 @@ import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
 import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences';
-import { DebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
+import { DebugConfigurationSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
 import { DebugSession } from '@theia/debug/lib/browser/debug-session';
 import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
 import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
@@ -36,7 +36,7 @@ import { PluginChannel } from '../../../common/connection';
 export class PluginDebugSession extends DebugSession {
     constructor(
         override readonly id: string,
-        override readonly options: DebugSessionOptions,
+        override readonly options: DebugConfigurationSessionOptions,
         override readonly parentSession: DebugSession | undefined,
         protected override readonly connection: DebugSessionConnection,
         protected override readonly terminalServer: TerminalService,
@@ -80,7 +80,7 @@ export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
         super();
     }
 
-    override get(sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession {
+    override get(sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
         const connection = new DebugSessionConnection(
             sessionId,
             this.connectionFactory,

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/style/tree.css

@@ -18,6 +18,8 @@
     padding-right: var(--theia-ui-padding);
     -webkit-font-smoothing: antialiased;
     flex-shrink: 0;
+    padding-left: 6px;
+    margin-left: -6px;
 }
 
 .theia-tree-view-inline-action {