@theia/plugin-ext 1.45.1 → 1.46.1

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

@@ -14,35 +14,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { interfaces } from '@theia/core/shared/inversify';
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { RPCProtocol } from '../../common/rpc-protocol';
-import { EnvMain } from '../../common/plugin-api-rpc';
 import { QueryParameters } from '../../common/env';
-import { isWindows, isOSX } from '@theia/core';
-import { OperatingSystem } from '../../plugin/types-impl';
-
-export class EnvMainImpl implements EnvMain {
-    private envVariableServer: EnvVariablesServer;
-
-    constructor(rpc: RPCProtocol, container: interfaces.Container) {
-        this.envVariableServer = container.get(EnvVariablesServer);
-    }
-
-    $getEnvVariable(envVarName: string): Promise<string | undefined> {
-        return this.envVariableServer.getValue(envVarName).then(result => result ? result.value : undefined);
-    }
-
-    async $getClientOperatingSystem(): Promise<OperatingSystem> {
-        if (isWindows) {
-            return OperatingSystem.Windows;
-        }
-        if (isOSX) {
-            return OperatingSystem.OSX;
-        }
-        return OperatingSystem.Linux;
-    }
-}
+export { EnvMainImpl } from '../common/env-main';
 
 /**
  * Returns query parameters from current page.

package/src/main/browser/menus/menus-contribution-handler.ts

@@ -99,9 +99,12 @@ export class MenusContributionPointHandler {
                         const targets = this.getMatchingMenu(contributionPoint as ContributionPoint) ?? [contributionPoint];
                         const { group, order } = this.parseGroup(item.group);
                         const { submenu, command } = item;
-                        if (submenu) {
-                            targets.forEach(target => toDispose.push(this.menuRegistry.linkSubmenu(target, submenu!, { order, when: item.when }, group)));
-                        } else if (command) {
+                        if (submenu && command) {
+                            console.warn(
+                                `Menu item ${command} from plugin ${plugin.metadata.model.id} contributed both submenu and command. Only command will be registered.`
+                            );
+                        }
+                        if (command) {
                             toDispose.push(this.commandAdapter.addCommand(command));
                             targets.forEach(target => {
                                 const node = new ActionMenuNode({
@@ -112,6 +115,8 @@ export class MenusContributionPointHandler {
                                 const parent = this.menuRegistry.getMenuNode(target, group);
                                 toDispose.push(parent.addNode(node));
                             });
+                        } else if (submenu) {
+                            targets.forEach(target => toDispose.push(this.menuRegistry.linkSubmenu(target, submenu!, { order, when: item.when }, group)));
                         }
                     }
                 } catch (error) {

package/src/main/browser/menus/plugin-menu-command-adapter.ts

@@ -108,7 +108,7 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
             ['timeline/item/context', (...args) => this.toTimelineArgs(...args)],
             ['view/item/context', (...args) => this.toTreeArgs(...args)],
             ['view/title', noArgs],
-            ['webview/context', noArgs]
+            ['webview/context', firstArgOnly]
         ]).forEach(([contributionPoint, adapter]) => {
             if (adapter) {
                 const paths = codeToTheiaMappings.get(contributionPoint);

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

@@ -15,26 +15,21 @@
 // *****************************************************************************
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { MessageRegistryMain, MainMessageType, MainMessageOptions, MainMessageItem } from '../../common/plugin-api-rpc';
+import { MainMessageType, MainMessageOptions, MainMessageItem } from '../../common/plugin-api-rpc';
 import { ModalNotification, MessageType } from './dialogs/modal-notification';
+import { BasicMessageRegistryMainImpl } from '../common/basic-message-registry-main';
 
-export class MessageRegistryMainImpl implements MessageRegistryMain {
-    private readonly messageService: MessageService;
-
+/**
+ * Message registry implementation that adds support for the model option via dialog in the browser.
+ */
+export class MessageRegistryMainImpl extends BasicMessageRegistryMainImpl {
     constructor(container: interfaces.Container) {
-        this.messageService = container.get(MessageService);
+        super(container);
     }
 
-    async $showMessage(type: MainMessageType, message: string, options: MainMessageOptions, actions: MainMessageItem[]): Promise<number | undefined> {
-        const action = await this.doShowMessage(type, message, options, actions);
-        const handle = action
-            ? actions.map(a => a.title).indexOf(action)
-            : undefined;
-        return handle === undefined && options.modal ? options.onCloseActionHandle : handle;
-    }
+    protected override async doShowMessage(type: MainMessageType, message: string,
+        options: MainMessageOptions, actions: MainMessageItem[]): Promise<string | undefined> {
 
-    protected async doShowMessage(type: MainMessageType, message: string, options: MainMessageOptions, actions: MainMessageItem[]): Promise<string | undefined> {
         if (options.modal) {
             const messageType = type === MainMessageType.Error ? MessageType.Error :
                 type === MainMessageType.Warning ? MessageType.Warning :
@@ -42,15 +37,7 @@ export class MessageRegistryMainImpl implements MessageRegistryMain {
             const modalNotification = new ModalNotification();
             return modalNotification.showDialog(messageType, message, options, actions);
         }
-        switch (type) {
-            case MainMessageType.Info:
-                return this.messageService.info(message, ...actions.map(a => a.title));
-            case MainMessageType.Warning:
-                return this.messageService.warn(message, ...actions.map(a => a.title));
-            case MainMessageType.Error:
-                return this.messageService.error(message, ...actions.map(a => a.title));
-        }
-        throw new Error(`Message type '${type}' is not supported yet!`);
+        return super.doShowMessage(type, message, options, actions);
     }
 
 }

package/src/main/browser/notebooks/renderers/cell-output-webview.tsx

@@ -72,12 +72,14 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
 
     protected webviewWidget: WebviewWidget;
 
+    protected toDispose = new DisposableCollection();
+
     @postConstruct()
     protected async init(): Promise<void> {
-        this.cell.onDidChangeOutputs(outputChange => this.updateOutput(outputChange));
-        this.cell.onDidChangeOutputItems(output => {
+        this.toDispose.push(this.cell.onDidChangeOutputs(outputChange => this.updateOutput(outputChange)));
+        this.toDispose.push(this.cell.onDidChangeOutputItems(output => {
             this.updateOutput({start: this.cell.outputs.findIndex(o => o.outputId === output.outputId), deleteCount: 1, newOutputs: [output]});
-        });
+        }));
 
         this.webviewWidget = await this.widgetManager.getOrCreateWidget(WebviewWidget.FACTORY_ID, { id: this.id });
         this.webviewWidget.setContentOptions({ allowScripts: true });
@@ -106,29 +108,28 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
     }
 
     updateOutput(update: NotebookCellOutputsSplice): void {
-        if (this.cell.outputs.length > 0) {
-            if (this.webviewWidget.isHidden) {
-                this.webviewWidget.show();
-            }
-
-            this.outputPresentationListeners.dispose();
-            this.outputPresentationListeners = new DisposableCollection();
-            for (const output of this.cell.outputs) {
-                this.outputPresentationListeners.push(output.onRequestOutputPresentationChange(() => this.requestOutputPresentationUpdate(output)));
-            }
+        if (this.webviewWidget.isHidden) {
+            this.webviewWidget.show();
+        }
 
-            const updateOutputMessage: OutputChangedMessage = {
-                type: 'outputChanged',
-                newOutputs: update.newOutputs.map(output => ({
-                    id: output.outputId,
-                    items: output.outputs.map(item => ({ mime: item.mime, data: item.data.buffer })),
-                    metadata: output.metadata
-                })),
-                deletedOutputIds: this.cell.outputs.slice(update.start, update.start + update.deleteCount).map(output => output.outputId)
-            };
-
-            this.webviewWidget.sendMessage(updateOutputMessage);
+        this.outputPresentationListeners.dispose();
+        this.outputPresentationListeners = new DisposableCollection();
+        for (const output of this.cell.outputs) {
+            this.outputPresentationListeners.push(output.onRequestOutputPresentationChange(() => this.requestOutputPresentationUpdate(output)));
         }
+
+        const updateOutputMessage: OutputChangedMessage = {
+            type: 'outputChanged',
+            newOutputs: update.newOutputs.map(output => ({
+                id: output.outputId,
+                items: output.outputs.map(item => ({ mime: item.mime, data: item.data.buffer })),
+                metadata: output.metadata
+            })),
+            deleteStart: update.start,
+            deleteCount: update.deleteCount
+        };
+
+        this.webviewWidget.sendMessage(updateOutputMessage);
     }
 
     private async requestOutputPresentationUpdate(output: NotebookCellOutputModel): Promise<void> {
@@ -195,6 +196,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
     }
 
     dispose(): void {
+        this.toDispose.dispose();
         this.outputPresentationListeners.dispose();
         this.webviewWidget.dispose();
     }

package/src/main/browser/notebooks/renderers/output-webview-internal.ts

@@ -114,7 +114,7 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
             this.element.style.paddingRight = '10px';
             this.element.id = output.id;
             document.body.appendChild(this.element);
-
+            this.outputId = output.id;
             this.allItems = items;
         }
 
@@ -134,7 +134,7 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
         }
     }
 
-    const outputs = new Map</* outputId */string, Output>();
+    const outputs: Output[] = [];
 
     class Renderer {
 
@@ -314,10 +314,17 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
             // we need to check for all images are loaded. Otherwise we can't determine the correct height of the output
             const images = Array.from(document.images);
             if (images.length > 0) {
-                Promise.all(images.filter(img => !img.complete).map(img => new Promise(resolve => { img.onload = img.onerror = resolve; }))).then(() =>
-                    theia.postMessage(<webviewCommunication.OnDidRenderOutput>{ type: 'didRenderOutput', contentHeight: document.body.clientHeight }));
+                Promise.all(images.filter(img => !img.complete).map(img => new Promise(resolve => { img.onload = img.onerror = resolve; }))).then(() => {
+                    theia.postMessage(<webviewCommunication.OnDidRenderOutput>{ type: 'didRenderOutput', contentHeight: document.body.clientHeight });
+                    new ResizeObserver(() =>
+                        theia.postMessage(<webviewCommunication.OnDidRenderOutput>{ type: 'didRenderOutput', contentHeight: document.body.clientHeight }))
+                        .observe(document.body);
+                });
             } else {
                 theia.postMessage(<webviewCommunication.OnDidRenderOutput>{ type: 'didRenderOutput', contentHeight: document.body.clientHeight });
+                new ResizeObserver(() =>
+                    theia.postMessage(<webviewCommunication.OnDidRenderOutput>{ type: 'didRenderOutput', contentHeight: document.body.clientHeight }))
+                    .observe(document.body);
             }
 
         }
@@ -378,15 +385,14 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
         }
     }();
 
-    function clearOutput(outputId: string): void {
-        outputs.get(outputId)?.clear();
-        outputs.delete(outputId);
-        document.getElementById(outputId)?.remove();
+    function clearOutput(output: Output): void {
+        output.clear();
+        output.element.remove();
     }
 
     function outputsChanged(changedEvent: webviewCommunication.OutputChangedMessage): void {
-        for (const outputId of changedEvent.deletedOutputIds ?? []) {
-            clearOutput(outputId);
+        for (const output of outputs.splice(changedEvent.deleteStart ?? 0, changedEvent.deleteCount ?? 0)) {
+            clearOutput(output);
         }
 
         for (const outputData of changedEvent.newOutputs ?? []) {
@@ -410,7 +416,7 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
             }));
 
             const output = new Output(outputData, apiItems);
-            outputs.set(outputData.id, output);
+            outputs.push(output);
 
             renderers.render(output, undefined, undefined, new AbortController().signal);
         }
@@ -466,8 +472,11 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
                 renderers.getRenderer(event.data.rendererId)?.receiveMessage(event.data.message);
                 break;
             case 'changePreferredMimetype':
-                clearOutput(event.data.outputId);
-                renderers.render(outputs.get(event.data.outputId)!, event.data.mimeType, undefined, new AbortController().signal);
+                const outputId = event.data.outputId;
+                const index = outputs.findIndex(output => output.outputId === outputId);
+                outputs.splice(index, 1);
+                clearOutput(outputs.splice(index, 1)[0]);
+                renderers.render(outputs[index], event.data.mimeType, undefined, new AbortController().signal);
                 break;
         }
     });

package/src/main/browser/notebooks/renderers/webview-communication.ts

@@ -39,7 +39,8 @@ export interface UpdateRenderersMessage {
 export interface OutputChangedMessage {
     readonly type: 'outputChanged';
     readonly newOutputs?: Output[];
-    readonly deletedOutputIds?: string[];
+    readonly deleteStart?: number;
+    readonly deleteCount?: number;
 }
 
 export interface ChangePreferredMimetypeMessage {

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

@@ -14,73 +14,13 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { NotificationExt, NotificationMain, MAIN_RPC_CONTEXT } from '../../common';
-import { ProgressService, Progress, ProgressMessage } from '@theia/core/lib/common';
+import { MAIN_RPC_CONTEXT } from '../../common';
 import { interfaces } from '@theia/core/shared/inversify';
 import { RPCProtocol } from '../../common/rpc-protocol';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-
-export class NotificationMainImpl implements NotificationMain, Disposable {
-    private readonly progressService: ProgressService;
-    private readonly progressMap = new Map<string, Progress>();
-    private readonly progress2Work = new Map<string, number>();
-    private readonly proxy: NotificationExt;
-
-    protected readonly toDispose = new DisposableCollection(
-        Disposable.create(() => { /* mark as not disposed */ })
-    );
+import { BasicNotificationMainImpl } from '../common/basic-notification-main';
 
+export class NotificationMainImpl extends BasicNotificationMainImpl {
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
-        this.progressService = container.get(ProgressService);
-        this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.NOTIFICATION_EXT);
-    }
-
-    dispose(): void {
-        this.toDispose.dispose();
-    }
-
-    async $startProgress(options: NotificationMain.StartProgressOptions): Promise<string> {
-        const onDidCancel = () => {
-            // If the map does not contain current id, it has already stopped and should not be cancelled
-            if (this.progressMap.has(id)) {
-                this.proxy.$acceptProgressCanceled(id);
-            }
-        };
-
-        const progressMessage = this.mapOptions(options);
-        const progress = await this.progressService.showProgress(progressMessage, onDidCancel);
-        const id = progress.id;
-        this.progressMap.set(id, progress);
-        this.progress2Work.set(id, 0);
-        if (this.toDispose.disposed) {
-            this.$stopProgress(id);
-        } else {
-            this.toDispose.push(Disposable.create(() => this.$stopProgress(id)));
-        }
-        return id;
-    }
-    protected mapOptions(options: NotificationMain.StartProgressOptions): ProgressMessage {
-        const { title, location, cancellable } = options;
-        return { text: title, options: { location, cancelable: cancellable } };
-    }
-
-    $stopProgress(id: string): void {
-        const progress = this.progressMap.get(id);
-
-        if (progress) {
-            this.progressMap.delete(id);
-            this.progress2Work.delete(id);
-            progress.cancel();
-        }
-    }
-
-    $updateProgress(id: string, item: NotificationMain.ProgressReport): void {
-        const progress = this.progressMap.get(id);
-        if (!progress) {
-            return;
-        }
-        const done = Math.min((this.progress2Work.get(id) || 0) + (item.increment || 0), 100);
-        this.progress2Work.set(id, done);
-        progress.report({ message: item.message, work: done ? { done, total: 100 } : undefined });
+        super(rpc, container, MAIN_RPC_CONTEXT.NOTIFICATION_EXT);
     }
 }

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

@@ -181,11 +181,11 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
         return undefined;
     }
 
-    $sendText(id: string, text: string, addNewLine?: boolean): void {
+    $sendText(id: string, text: string, shouldExecute?: boolean): void {
         const terminal = this.terminals.getById(id);
         if (terminal) {
             text = text.replace(/\r?\n/g, '\r');
-            if (addNewLine && text.charAt(text.length - 1) !== '\r') {
+            if (shouldExecute && text.charAt(text.length - 1) !== '\r') {
                 text += '\r';
             }
             terminal.sendText(text);

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

@@ -18,7 +18,7 @@ import { injectable, inject, postConstruct, optional } from '@theia/core/shared/
 import {
     ApplicationShell, ViewContainer as ViewContainerWidget, WidgetManager, QuickViewService,
     ViewContainerIdentifier, ViewContainerTitleOptions, Widget, FrontendApplicationContribution,
-    StatefulWidget, CommonMenus, TreeViewWelcomeWidget, ViewContainerPart, BaseWidget
+    StatefulWidget, CommonMenus, TreeViewWelcomeWidget, ViewContainerPart, BaseWidget,
 } from '@theia/core/lib/browser';
 import { ViewContainer, View, ViewWelcome, PluginViewType } from '../../../common';
 import { PluginSharedStyle } from '../plugin-shared-style';
@@ -424,7 +424,10 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
 
     protected async createNewWebviewView(viewId: string): Promise<WebviewView> {
         const webview = await this.widgetManager.getOrCreateWidget<WebviewWidget>(
-            WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id: v4() });
+            WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{
+                id: v4(),
+                viewId,
+            });
         webview.setContentOptions({ allowScripts: true });
 
         let _description: string | undefined;
@@ -893,7 +896,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             const webviewView = await this.createNewWebviewView(viewId);
             webviewId = webviewView.webview.identifier.id;
         }
-        const webviewWidget = this.widgetManager.getWidget(WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id: webviewId });
+        const webviewWidget = this.widgetManager.getWidget(WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id: webviewId, viewId });
         return webviewWidget;
     }
 

package/src/main/browser/webview/webview-context-keys.ts

@@ -14,9 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { ApplicationShell, FocusTracker, Widget } from '@theia/core/lib/browser';
+import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { CustomEditorWidget } from '../custom-editors/custom-editor-widget';
 import { WebviewWidget } from './webview';
 
 @injectable()
@@ -27,6 +28,11 @@ export class WebviewContextKeys {
      */
     activeWebviewPanelId: ContextKey<string>;
 
+    /**
+     * Context key representing the `viewType` of the active `CustomEditorWidget`, if any.
+     */
+    activeCustomEditorId: ContextKey<string>;
+
     @inject(ApplicationShell)
     protected applicationShell: ApplicationShell;
 
@@ -36,12 +42,19 @@ export class WebviewContextKeys {
     @postConstruct()
     protected init(): void {
         this.activeWebviewPanelId = this.contextKeyService.createKey('activeWebviewPanelId', '');
+        this.activeCustomEditorId = this.contextKeyService.createKey('activeCustomEditorId', '');
         this.applicationShell.onDidChangeCurrentWidget(this.handleDidChangeCurrentWidget, this);
     }
 
     protected handleDidChangeCurrentWidget(change: FocusTracker.IChangedArgs<Widget>): void {
-        if (change.newValue instanceof WebviewWidget) {
-            this.activeWebviewPanelId.set(change.newValue.viewType);
+        const { newValue } = change;
+        if (newValue instanceof CustomEditorWidget) {
+            this.activeCustomEditorId.set(newValue.viewType);
+        } else {
+            this.activeCustomEditorId.set('');
+        }
+        if (newValue instanceof WebviewWidget) {
+            this.activeWebviewPanelId.set(newValue.viewType);
         } else {
             this.activeWebviewPanelId.set('');
         }

package/src/main/browser/webview/webview-widget-factory.ts

@@ -17,6 +17,7 @@
 import { interfaces } from '@theia/core/shared/inversify';
 import { WebviewWidget, WebviewWidgetIdentifier, WebviewWidgetExternalEndpoint } from './webview';
 import { WebviewEnvironment } from './webview-environment';
+import { hashValue } from '@theia/core/lib/common/uuid';
 
 export class WebviewWidgetFactory {
 
@@ -30,7 +31,7 @@ export class WebviewWidgetFactory {
 
     async createWidget(identifier: WebviewWidgetIdentifier): Promise<WebviewWidget> {
         const externalEndpoint = await this.container.get(WebviewEnvironment).externalEndpoint();
-        let endpoint = externalEndpoint.replace('{{uuid}}', identifier.id);
+        let endpoint = externalEndpoint.replace('{{uuid}}', identifier.viewId ? hashValue(identifier.viewId) : identifier.id);
         if (endpoint[endpoint.length - 1] === '/') {
             endpoint = endpoint.slice(0, endpoint.length - 1);
         }

package/src/main/browser/webview/webview.ts

@@ -97,6 +97,7 @@ export interface WebviewConsoleLog {
 @injectable()
 export class WebviewWidgetIdentifier {
     id: string;
+    viewId?: string;
 }
 
 export const WebviewWidgetExternalEndpoint = Symbol('WebviewWidgetExternalEndpoint');
@@ -404,6 +405,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
             () => {
                 this.contextMenuRenderer.render({
                     menuPath: WEBVIEW_CONTEXT_MENU,
+                    args: [event.context],
                     anchor: {
                         x: domRect.x + event.clientX, y: domRect.y + event.clientY
                     }

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

@@ -63,7 +63,7 @@ export class WebviewsMainImpl implements WebviewsMain, Disposable {
         showOptions: WebviewPanelShowOptions,
         options: WebviewPanelOptions & WebviewOptions
     ): Promise<void> {
-        const view = await this.widgetManager.getOrCreateWidget<WebviewWidget>(WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id: panelId });
+        const view = await this.widgetManager.getOrCreateWidget<WebviewWidget>(WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id: panelId, viewId: viewType });
         this.hookWebview(view);
         view.viewType = viewType;
         view.title.label = title;
@@ -269,7 +269,12 @@ export class WebviewsMainImpl implements WebviewsMain, Disposable {
     }
 
     private async tryGetWebview(id: string): Promise<WebviewWidget | undefined> {
-        const webview = await this.widgetManager.getWidget<WebviewWidget>(WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id })
+        const webview = await this.widgetManager.findWidget<WebviewWidget>(WebviewWidget.FACTORY_ID, options => {
+            if (options) {
+                return options.id === id;
+            }
+            return false;
+        })
             || await this.widgetManager.getWidget<CustomEditorWidget>(CustomEditorWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id });
         return webview;
     }

package/src/main/common/basic-message-registry-main.ts

@@ -0,0 +1,53 @@
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { interfaces } from '@theia/core/shared/inversify';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { MessageRegistryMain, MainMessageType, MainMessageOptions, MainMessageItem } from '../../common/plugin-api-rpc';
+
+/**
+ * A basic implementation of the message registry that does not support the modal option
+ * as that requires an UI.
+ */
+export class BasicMessageRegistryMainImpl implements MessageRegistryMain {
+    protected readonly messageService: MessageService;
+
+    constructor(container: interfaces.Container) {
+        this.messageService = container.get(MessageService);
+    }
+
+    async $showMessage(type: MainMessageType, message: string, options: MainMessageOptions, actions: MainMessageItem[]): Promise<number | undefined> {
+        const action = await this.doShowMessage(type, message, options, actions);
+        const handle = action
+            ? actions.map(a => a.title).indexOf(action)
+            : undefined;
+        return handle === undefined && options.modal ? options.onCloseActionHandle : handle;
+    }
+
+    protected async doShowMessage(type: MainMessageType, message: string, options: MainMessageOptions, actions: MainMessageItem[]): Promise<string | undefined> {
+        // Modal notifications are not supported in this context
+        switch (type) {
+            case MainMessageType.Info:
+                return this.messageService.info(message, ...actions.map(a => a.title));
+            case MainMessageType.Warning:
+                return this.messageService.warn(message, ...actions.map(a => a.title));
+            case MainMessageType.Error:
+                return this.messageService.error(message, ...actions.map(a => a.title));
+        }
+        throw new Error(`Message type '${type}' is not supported yet!`);
+    }
+
+}