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

package/src/plugin/languages.ts

@@ -62,11 +62,13 @@ import {
     CallHierarchyIncomingCall,
     CallHierarchyOutgoingCall,
     LinkedEditingRanges,
+    EvaluatableExpression
 } from '../common/plugin-api-rpc-model';
 import { CompletionAdapter } from './languages/completion';
 import { Diagnostics } from './languages/diagnostics';
 import { SignatureHelpAdapter } from './languages/signature';
 import { HoverAdapter } from './languages/hover';
+import { EvaluatableExpressionAdapter } from './languages/evaluatable-expression';
 import { DocumentHighlightAdapter } from './languages/document-highlight';
 import { DocumentFormattingAdapter } from './languages/document-formatting';
 import { RangeFormattingAdapter } from './languages/range-formatting';
@@ -100,6 +102,7 @@ import { serializeEnterRules, serializeIndentation, serializeRegExp } from './la
 type Adapter = CompletionAdapter |
     SignatureHelpAdapter |
     HoverAdapter |
+    EvaluatableExpressionAdapter |
     DocumentHighlightAdapter |
     DocumentFormattingAdapter |
     RangeFormattingAdapter |
@@ -350,6 +353,18 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
     // ### Hover Provider end
 
+    // ### EvaluatableExpression Provider begin
+    registerEvaluatableExpressionProvider(selector: theia.DocumentSelector, provider: theia.EvaluatableExpressionProvider, pluginInfo: PluginInfo): theia.Disposable {
+        const callId = this.addNewAdapter(new EvaluatableExpressionAdapter(provider, this.documents));
+        this.proxy.$registerEvaluatableExpressionProvider(callId, pluginInfo, this.transformDocumentSelector(selector));
+        return this.createDisposable(callId);
+    }
+
+    $provideEvaluatableExpression(handle: number, resource: UriComponents, position: Position, token: theia.CancellationToken): Promise<EvaluatableExpression | undefined> {
+        return this.withAdapter(handle, EvaluatableExpressionAdapter, adapter => adapter.provideEvaluatableExpression(URI.revive(resource), position, token), undefined);
+    }
+    // ### EvaluatableExpression Provider end
+
     // ### Document Highlight Provider begin
     registerDocumentHighlightProvider(selector: theia.DocumentSelector, provider: theia.DocumentHighlightProvider, pluginInfo: PluginInfo): theia.Disposable {
         const callId = this.addNewAdapter(new DocumentHighlightAdapter(provider, this.documents));

package/src/plugin/plugin-context.ts

@@ -78,6 +78,7 @@ import {
     SignatureHelp,
     SignatureHelpTriggerKind,
     Hover,
+    EvaluatableExpression,
     DocumentHighlightKind,
     DocumentHighlight,
     DocumentLink,
@@ -143,7 +144,8 @@ import {
     ExtensionMode,
     LinkedEditingRanges,
     LanguageStatusSeverity,
-    TextDocumentChangeReason
+    TextDocumentChangeReason,
+    InputBoxValidationSeverity
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -223,50 +225,14 @@ export function createAPIFactory(
 
     return function (plugin: InternalPlugin): typeof theia {
         const authentication: typeof theia.authentication = {
-            // support older (< 1.53.0) and newer version of authentication provider registration
-            registerAuthenticationProvider(
-                id: string | theia.AuthenticationProvider, label?: string, provider?: theia.AuthenticationProvider, options?: theia.AuthenticationProviderOptions):
-                theia.Disposable {
-                // collect registration data based on registration type: new (all parameters given) vs old (data stored in provider)
-                const isNewRegistration = typeof id === 'string';
-                const regProvider = isNewRegistration ? provider! : id;
-                const regId = isNewRegistration ? id : regProvider.id;
-                const regLabel = isNewRegistration ? label! : regProvider.label;
-                const regOptions = isNewRegistration ? options : { supportsMultipleAccounts: regProvider.supportsMultipleAccounts };
-
-                // ensure that all methods of the new AuthenticationProvider are available or delegate otherwise
-                if (!regProvider['createSession']) {
-                    regProvider['createSession'] = (scopes: string[]) => regProvider.login(scopes);
-                }
-                if (!regProvider['removeSession']) {
-                    regProvider['removeSession'] = (sessionId: string) => regProvider.logout(sessionId);
-                }
-                return authenticationExt.registerAuthenticationProvider(regId, regLabel, regProvider, regOptions);
-            },
-            get onDidChangeAuthenticationProviders(): theia.Event<theia.AuthenticationProvidersChangeEvent> {
-                return authenticationExt.onDidChangeAuthenticationProviders;
-            },
-            getProviderIds(): Thenable<ReadonlyArray<string>> {
-                return Promise.resolve(authenticationExt.providerIds);
-            },
-            get providerIds(): string[] {
-                return authenticationExt.providerIds;
-            },
-            get providers(): ReadonlyArray<theia.AuthenticationProviderInformation> {
-                return authenticationExt.providers;
+            registerAuthenticationProvider(id: string, label: string, provider: theia.AuthenticationProvider, options?: theia.AuthenticationProviderOptions): theia.Disposable {
+                return authenticationExt.registerAuthenticationProvider(id, label, provider, options);
             },
             getSession(providerId: string, scopes: string[], options: theia.AuthenticationGetSessionOptions) {
                 return authenticationExt.getSession(plugin, providerId, scopes, options as any);
             },
-            logout(providerId: string, sessionId: string): Thenable<void> {
-                return authenticationExt.logout(providerId, sessionId);
-            },
             get onDidChangeSessions(): theia.Event<theia.AuthenticationSessionsChangeEvent> {
                 return authenticationExt.onDidChangeSessions;
-            },
-            async hasSession(providerId: string, scopes: readonly string[]): Promise<boolean> {
-                const session = await authenticationExt.getSession(plugin, providerId, scopes, { silent: true });
-                return !!session;
             }
         };
         const commands: typeof theia.commands = {
@@ -391,7 +357,7 @@ export function createAPIFactory(
                 }
             },
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            showQuickPick(items: any, options: theia.QuickPickOptions, token?: theia.CancellationToken): any {
+            showQuickPick(items: any, options?: theia.QuickPickOptions, token?: theia.CancellationToken): any {
                 return quickOpenExt.showQuickPick(items, options, token);
             },
             createQuickPick<T extends QuickPickItem>(): QuickPick<T> {
@@ -731,6 +697,9 @@ export function createAPIFactory(
             registerHoverProvider(selector: theia.DocumentSelector, provider: theia.HoverProvider): theia.Disposable {
                 return languagesExt.registerHoverProvider(selector, provider, pluginToPluginInfo(plugin));
             },
+            registerEvaluatableExpressionProvider(selector: theia.DocumentSelector, provider: theia.EvaluatableExpressionProvider): theia.Disposable {
+                return languagesExt.registerEvaluatableExpressionProvider(selector, provider, pluginToPluginInfo(plugin));
+            },
             registerDocumentHighlightProvider(selector: theia.DocumentSelector, provider: theia.DocumentHighlightProvider): theia.Disposable {
                 return languagesExt.registerDocumentHighlightProvider(selector, provider, pluginToPluginInfo(plugin));
             },
@@ -991,6 +960,7 @@ export function createAPIFactory(
             SignatureHelp,
             SignatureHelpTriggerKind,
             Hover,
+            EvaluatableExpression,
             DocumentHighlightKind,
             DocumentHighlight,
             DocumentLink,
@@ -1056,7 +1026,8 @@ export function createAPIFactory(
             FileDecoration,
             CancellationError,
             ExtensionMode,
-            LinkedEditingRanges
+            LinkedEditingRanges,
+            InputBoxValidationSeverity
         };
     };
 }

package/src/plugin/plugin-storage.ts

@@ -38,6 +38,10 @@ export class Memento implements theia.Memento {
         }
     }
 
+    keys(): string[] {
+        return Object.entries(this.cache).filter(([, value]) => value !== undefined).map(([key]) => key);
+    }
+
     get<T>(key: string): T | undefined;
     get<T>(key: string, defaultValue: T): T;
     get<T>(key: string, defaultValue?: T): T | undefined {

package/src/plugin/preference-registry.spec.ts

@@ -112,7 +112,6 @@ describe('PreferenceRegistryExtImpl:', () => {
         });
     });
 
-    /* eslint-disable no-unused-expressions */
     describe('toConfigurationChangeEvent', () => {
         // E.g. deletion of a `tasks.json`.
         it('Handles deletion of a section', () => {
@@ -252,4 +251,49 @@ describe('PreferenceRegistryExtImpl:', () => {
             expect(valuesRetrieved.tabSize).equal(4);
         });
     });
+
+    describe('Proxy Behavior', () => {
+        const deepConfig = {
+            'python.linting.enabled': true,
+            'python.linting.flake8Args': [],
+            'python.linting.flake8CategorySeverity.E': 'Error',
+            'python.linting.flake8CategorySeverity.F': 'Error',
+            'python.linting.flake8CategorySeverity.W': 'Warning',
+            'python.linting.flake8Enabled': false,
+            'python.linting.flake8Path': 'flake8',
+            'python.linting.ignorePatterns': ['.vscode/*.py', '**/site-packages/**/*.py'],
+            'python.linting.lintOnSave': true,
+            'python.linting.maxNumberOfProblems': 100,
+            'python.linting.banditArgs': [],
+            'python.linting.banditEnabled': false,
+            'python.linting.banditPath': 'bandit',
+            'python.linting.mypyArgs': [
+                '--ignore-missing-imports',
+                '--follow-imports=silent',
+                '--show-column-numbers'
+            ],
+            'python.linting.mypyCategorySeverity.error': 'Error',
+            'python.linting.mypyCategorySeverity.note': 'Information',
+            'python.linting.mypyEnabled': false,
+            'python.linting.mypyPath': 'mypy',
+        };
+        // https://github.com/eclipse-theia/theia/issues/11501
+        it("Doesn't violate proxy rules and return a proxy when the underlying object is expected.", () => {
+            preferenceRegistryExtImpl.init({
+                [PreferenceScope.Default]: deepConfig,
+                [PreferenceScope.User]: {},
+                [PreferenceScope.Workspace]: {},
+                [PreferenceScope.Folder]: {
+                    [workspaceRoot.toString()]: {},
+                }
+            });
+            const pythonConfig = preferenceRegistryExtImpl.getConfiguration('python', workspaceRoot);
+            const lintConfig = pythonConfig.get<Record<string, unknown>>('linting')!;
+            const stringDictionary = Object.create(null);
+            Object.keys(lintConfig).forEach(key => {
+                stringDictionary[key] = lintConfig[key];
+            });
+            expect(Boolean('Made it this far without throwing an error')).to.be.true;
+        });
+    });
 });

package/src/plugin/preference-registry.ts

@@ -129,6 +129,11 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
                         }
                         return new Proxy(target, {
                             get: (targ: any, prop: string) => {
+                                const config = Object.getOwnPropertyDescriptor(targ, prop);
+                                // This check ensures that https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/Proxy/get#invariants are satisfied
+                                if (config?.configurable === false && config?.writable === false) {
+                                    return targ[prop];
+                                }
                                 if (typeof prop === 'string' && prop.toLowerCase() === 'tojson') {
                                     cloneTarget();
                                     return () => clonedTarget;

package/src/plugin/quick-open.ts

@@ -24,13 +24,14 @@ import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { QuickInputButtons, QuickPickItemKind, ThemeIcon } from './types-impl';
+import { InputBoxValidationSeverity, QuickInputButtons, QuickPickItemKind, ThemeIcon } from './types-impl';
 import { URI } from '@theia/core/shared/vscode-uri';
 import * as path from 'path';
 import { convertToTransferQuickPickItems } from './type-converters';
 import { PluginPackage } from '../common/plugin-protocol';
 import { QuickInputButtonHandle } from '@theia/core/lib/browser';
 import { MaybePromise } from '@theia/core/lib/common/types';
+import Severity from '@theia/monaco-editor-core/esm/vs/base/common/severity';
 
 const canceledName = 'Canceled';
 /**
@@ -65,7 +66,7 @@ export function getDarkIconUri(iconPath: URI | { light: URI; dark: URI; }): URI
 export class QuickOpenExtImpl implements QuickOpenExt {
     private proxy: QuickOpenMain;
     private onDidSelectItem: undefined | ((handle: number) => void);
-    private validateInputHandler?: (input: string) => MaybePromise<string | null | undefined>;
+    private validateInputHandler?: (input: string) => MaybePromise<string | theia.InputBoxValidationMessage | null | undefined>;
     private _sessions = new Map<number, QuickInputExt>(); // Each quickinput will have a number so that we know where to fire events
     private _instances = 0;
 
@@ -155,11 +156,36 @@ export class QuickOpenExtImpl implements QuickOpenExt {
         return this.proxy.$showInputBox(options, typeof this.validateInputHandler === 'function');
     }
 
-    $validateInput(input: string): Promise<string | null | undefined> | undefined {
-        if (this.validateInputHandler) {
-            return Promise.resolve(this.validateInputHandler(input));
+    async $validateInput(input: string): Promise<string | { content: string; severity: Severity; } | null | undefined> {
+        if (!this.validateInputHandler) {
+            return;
+        }
+
+        const result = await this.validateInputHandler(input);
+        if (!result || typeof result === 'string') {
+            return result;
         }
-        return undefined;
+
+        let severity: Severity;
+        switch (result.severity) {
+            case InputBoxValidationSeverity.Info:
+                severity = Severity.Info;
+                break;
+            case InputBoxValidationSeverity.Warning:
+                severity = Severity.Warning;
+                break;
+            case InputBoxValidationSeverity.Error:
+                severity = Severity.Error;
+                break;
+            default:
+                severity = result.message ? Severity.Error : Severity.Ignore;
+                break;
+        }
+
+        return {
+            content: result.message,
+            severity
+        };
     }
 
     // ---- QuickInput

package/src/plugin/type-converters.ts

@@ -137,9 +137,8 @@ export function toPosition(position: Position): types.Position {
     return new types.Position(position.lineNumber - 1, position.column - 1);
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isDecorationOptions(something: any): something is theia.DecorationOptions {
-    return (typeof something.range !== 'undefined');
+function isDecorationOptions(arg: unknown): arg is theia.DecorationOptions {
+    return !!arg && typeof arg === 'object' && typeof (arg as theia.DecorationOptions).range !== 'undefined';
 }
 
 export function isDecorationOptionsArr(something: theia.Range[] | theia.DecorationOptions[]): something is theia.DecorationOptions[] {
@@ -182,11 +181,10 @@ interface Codeblock {
     value: string;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isCodeblock(thing: any): thing is Codeblock {
-    return thing && typeof thing === 'object'
-        && typeof (<Codeblock>thing).language === 'string'
-        && typeof (<Codeblock>thing).value === 'string';
+function isCodeblock(arg: unknown): arg is Codeblock {
+    return !!arg && typeof arg === 'object'
+        && typeof (arg as Codeblock).language === 'string'
+        && typeof (arg as Codeblock).value === 'string';
 }
 
 export function fromMarkdown(markup: theia.MarkdownString | theia.MarkedString): MarkdownStringDTO {
@@ -396,6 +394,13 @@ export function fromHover(hover: theia.Hover): model.Hover {
     };
 }
 
+export function fromEvaluatableExpression(evaluatableExpression: theia.EvaluatableExpression): model.EvaluatableExpression {
+    return <model.EvaluatableExpression>{
+        range: fromRange(evaluatableExpression.range),
+        expression: evaluatableExpression.expression
+    };
+}
+
 export function fromLocation(location: theia.Location): model.Location {
     return <model.Location>{
         uri: location.uri,
@@ -618,64 +623,58 @@ export function toSymbolTag(kind: model.SymbolTag): types.SymbolTag {
     }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelLocation(thing: any): thing is model.Location {
-    if (!thing) {
-        return false;
-    }
-    return isModelRange((<model.Location>thing).range) &&
-        isUriComponents((<model.Location>thing).uri);
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelRange(thing: any): thing is model.Range {
-    if (!thing) {
-        return false;
-    }
-    return (('startLineNumber' in thing) && typeof thing.startLineNumber === 'number') &&
-        (('startColumn' in thing) && typeof thing.startColumn === 'number') &&
-        (('endLineNumber' in thing) && typeof thing.endLineNumber === 'number') &&
-        (('endColumn' in thing) && typeof thing.endColumn === 'number');
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isUriComponents(thing: any): thing is UriComponents {
-    if (!thing) {
+export function isModelLocation(arg: unknown): arg is model.Location {
+    if (!arg) {
         return false;
     }
-    return (('scheme' in thing) && typeof thing.scheme === 'string') &&
-        (('path' in thing) && typeof thing.path === 'string') &&
-        (('query' in thing) && typeof thing.query === 'string') &&
-        (('fragment' in thing) && typeof thing.fragment === 'string');
+    return !!arg &&
+        typeof arg === 'object' &&
+        isModelRange((arg as model.Location).range) &&
+        isUriComponents((arg as model.Location).uri);
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelCallHierarchyItem(thing: any): thing is model.CallHierarchyItem {
-    if (!thing) {
-        return false;
-    }
-    return isModelRange(thing.range)
-        && isModelRange(thing.selectionRange)
-        && isUriComponents(thing.uri)
-        && !!thing.name;
+export function isModelRange(arg: unknown): arg is model.Range {
+    const range = arg as model.Range;
+    return !!arg && typeof arg === 'object' &&
+        typeof range.startLineNumber === 'number' &&
+        typeof range.startColumn === 'number' &&
+        typeof range.endLineNumber === 'number' &&
+        typeof range.endColumn === 'number';
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelCallHierarchyIncomingCall(thing: any): thing is model.CallHierarchyIncomingCall {
-    if (!thing) {
-        return false;
-    }
-    const maybeIncomingCall = thing as model.CallHierarchyIncomingCall;
-    return 'from' in maybeIncomingCall && 'fromRanges' in maybeIncomingCall && isModelCallHierarchyItem(maybeIncomingCall.from);
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isModelCallHierarchyOutgoingCall(thing: any): thing is model.CallHierarchyOutgoingCall {
-    if (!thing) {
-        return false;
-    }
-    const maybeOutgoingCall = thing as model.CallHierarchyOutgoingCall;
-    return 'to' in maybeOutgoingCall && 'fromRanges' in maybeOutgoingCall && isModelCallHierarchyItem(maybeOutgoingCall.to);
+export function isUriComponents(arg: unknown): arg is UriComponents {
+    const uriComponents = arg as UriComponents;
+    return !!arg && typeof arg === 'object' &&
+        typeof uriComponents.scheme === 'string' &&
+        typeof uriComponents.path === 'string' &&
+        typeof uriComponents.query === 'string' &&
+        typeof uriComponents.fragment === 'string';
+}
+
+export function isModelCallHierarchyItem(arg: unknown): arg is model.CallHierarchyItem {
+    const item = arg as model.CallHierarchyItem;
+    return !!item && typeof item === 'object'
+        && isModelRange(item.range)
+        && isModelRange(item.selectionRange)
+        && isUriComponents(item.uri)
+        && !!item.name;
+}
+
+export function isModelCallHierarchyIncomingCall(arg: unknown): arg is model.CallHierarchyIncomingCall {
+    const maybeIncomingCall = arg as model.CallHierarchyIncomingCall;
+    return !!arg && typeof arg === 'object' &&
+        'from' in maybeIncomingCall &&
+        'fromRanges' in maybeIncomingCall &&
+        isModelCallHierarchyItem(maybeIncomingCall.from);
+}
+
+export function isModelCallHierarchyOutgoingCall(arg: unknown): arg is model.CallHierarchyOutgoingCall {
+    const maybeOutgoingCall = arg as model.CallHierarchyOutgoingCall;
+    return !!arg && typeof arg === 'object' &&
+        'to' in maybeOutgoingCall &&
+        'fromRanges' in maybeOutgoingCall &&
+        isModelCallHierarchyItem(maybeOutgoingCall.to);
 }
 
 export function toLocation(value: model.Location): types.Location {

package/src/plugin/types-impl.ts

@@ -20,7 +20,6 @@
 *--------------------------------------------------------------------------------------------*/
 
 /* eslint-disable no-null/no-null */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { UUID } from '@theia/core/shared/@phosphor/coreutils';
 import { illegalArgument } from '../common/errors';
@@ -38,6 +37,7 @@ import { es5ClassCompat } from '../common/types';
  * A reviver that takes URI's transferred via JSON.stringify() and makes
  * instances of our local plugin API URI class (below)
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function reviver(key: string | undefined, value: any): any {
     const revived = ObjectsTransferrer.reviver(key, value);
     if (CodeURI.isUri(revived)) {
@@ -423,7 +423,7 @@ export class Position {
         return false;
     }
 
-    toJSON(): any {
+    toJSON(): unknown {
         return { line: this.line, character: this.character };
     }
 }
@@ -546,19 +546,17 @@ export class Range {
         return new Range(start, end);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    static isRange(thing: any): thing is theia.Range {
+    static isRange(thing: unknown): thing is theia.Range {
         if (thing instanceof Range) {
             return true;
         }
-        if (!thing) {
-            return false;
-        }
-        return Position.isPosition((<Range>thing).start)
-            && Position.isPosition((<Range>thing).end);
+        const range = thing as theia.Range;
+        return !!thing && typeof thing === 'object'
+            && Position.isPosition(range.start)
+            && Position.isPosition(range.end);
     }
 
-    toJSON(): any {
+    toJSON(): unknown {
         return [this.start, this.end];
     }
 }
@@ -1119,6 +1117,24 @@ export class Hover {
     }
 }
 
+@es5ClassCompat
+export class EvaluatableExpression {
+
+    public range: Range;
+    public expression?: string;
+
+    constructor(
+        range: Range,
+        expression?: string
+    ) {
+        if (!range) {
+            illegalArgument('range must be defined');
+        }
+        this.range = range;
+        this.expression = expression;
+    }
+}
+
 export enum DocumentHighlightKind {
     Text = 0,
     Read = 1,
@@ -1618,8 +1634,8 @@ export class FileSystemError extends Error {
 
         // workaround when extending builtin objects and when compiling to ES5, see:
         // https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        if (typeof (<any>Object).setPrototypeOf === 'function') {
-            (<any>Object).setPrototypeOf(this, FileSystemError.prototype);
+        if (typeof Object.setPrototypeOf === 'function') {
+            Object.setPrototypeOf(this, FileSystemError.prototype);
         }
 
         if (typeof Error.captureStackTrace === 'function' && typeof terminator === 'function') {
@@ -2537,7 +2553,7 @@ export class SemanticTokensLegend {
     }
 }
 
-function isStrArrayOrUndefined(arg: any): arg is string[] | undefined {
+function isStrArrayOrUndefined(arg: unknown): arg is string[] | undefined {
     return ((typeof arg === 'undefined') || (Array.isArray(arg) && arg.every(e => typeof e === 'string')));
 }
 
@@ -2575,7 +2591,7 @@ export class SemanticTokensBuilder {
 
     public push(line: number, char: number, length: number, tokenType: number, tokenModifiers?: number): void;
     public push(range: Range, tokenType: string, tokenModifiers?: string[]): void;
-    public push(arg0: any, arg1: any, arg2: any, arg3?: any, arg4?: any): void {
+    public push(arg0: number | Range, arg1: number | string, arg2?: number | string[], arg3?: number, arg4?: number): void {
         if (typeof arg0 === 'number' && typeof arg1 === 'number' && typeof arg2 === 'number' && typeof arg3 === 'number' &&
             (typeof arg4 === 'number' || typeof arg4 === 'undefined')) {
             if (typeof arg4 === 'undefined') {
@@ -2756,4 +2772,10 @@ export class SemanticTokensEdits {
     }
 }
 
+export enum InputBoxValidationSeverity {
+    Info = 1,
+    Warning = 2,
+    Error = 3
+}
+
 // #endregion

package/src/plugin/workspace.ts

@@ -243,8 +243,12 @@ export class WorkspaceExtImpl implements WorkspaceExt {
         // `file` and `untitled` schemas are reserved by `workspace.openTextDocument` API:
         // `file`-scheme for opening a file
         // `untitled`-scheme for opening a new file that should be saved
-        if (scheme === Schemes.file || scheme === Schemes.untitled || this.documentContentProviders.has(scheme)) {
+        if (scheme === Schemes.file || scheme === Schemes.untitled) {
             throw new Error(`Text Content Document Provider for scheme '${scheme}' is already registered`);
+        } else if (this.documentContentProviders.has(scheme)) {
+            // TODO: we should be able to handle multiple registrations, but for now we should ensure that it doesn't crash plugin activation.
+            console.warn(`Repeat registration of TextContentDocumentProvider for scheme '${scheme}'. This registration will be ignored.`);
+            return { dispose: () => { } };
         }
 
         this.documentContentProviders.set(scheme, provider);

package/src/plugin-ext-backend-electron-module.ts

@@ -18,7 +18,7 @@ import { ContainerModule } from '@theia/core/shared/inversify';
 import { bindElectronBackend } from './hosted/node-electron/plugin-ext-hosted-electron-backend-module';
 import { bindMainBackend } from './main/node/plugin-ext-backend-module';
 
-export default new ContainerModule(bind => {
-    bindMainBackend(bind);
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+    bindMainBackend(bind, unbind, isBound, rebind);
     bindElectronBackend(bind);
 });

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

@@ -18,7 +18,7 @@ import { ContainerModule } from '@theia/core/shared/inversify';
 import { bindHostedBackend } from './hosted/node/plugin-ext-hosted-backend-module';
 import { bindMainBackend } from './main/node/plugin-ext-backend-module';
 
-export default new ContainerModule(bind => {
-    bindMainBackend(bind);
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+    bindMainBackend(bind, unbind, isBound, rebind);
     bindHostedBackend(bind);
 });