@theia/plugin-ext 1.42.0 → 1.43.0

package/src/hosted/node/scanners/scanner-theia.ts

@@ -23,6 +23,7 @@ import {
     buildFrontendModuleName,
     DebuggerContribution,
     IconThemeContribution,
+    IconContribution,
     IconUrl,
     Keybinding,
     LanguageConfiguration,
@@ -60,7 +61,8 @@ import {
     PluginPackageTranslation,
     Translation,
     PluginIdentifiers,
-    TerminalProfile
+    TerminalProfile,
+    PluginIconContribution
 } from '../../../common/plugin-protocol';
 import { promises as fs } from 'fs';
 import * as path from 'path';
@@ -74,6 +76,7 @@ import { deepClone } from '@theia/core/lib/common/objects';
 import { PreferenceSchema, PreferenceSchemaProperties } from '@theia/core/lib/common/preferences/preference-schema';
 import { TaskDefinition } from '@theia/task/lib/common/task-protocol';
 import { ColorDefinition } from '@theia/core/lib/common/color';
+import { CSSIcon } from '@theia/core/lib/common/markdown-rendering/icon-utilities';
 import { PluginUriFactory } from './plugin-uri-factory';
 
 namespace nls {
@@ -89,6 +92,12 @@ const INTERNAL_CONSOLE_OPTIONS_SCHEMA = {
 };
 
 const colorIdPattern = '^\\w+[.\\w+]*$';
+const iconIdPattern = `^${CSSIcon.iconNameSegment}(-${CSSIcon.iconNameSegment})+$`;
+
+function getFileExtension(filePath: string): string {
+    const index = filePath.lastIndexOf('.');
+    return index === -1 ? '' : filePath.substring(index + 1);
+}
 
 @injectable()
 export class TheiaPluginScanner implements PluginScanner {
@@ -331,6 +340,12 @@ export class TheiaPluginScanner implements PluginScanner {
             console.error(`Could not read '${rawPlugin.name}' contribution 'themes'.`, rawPlugin.contributes.themes, err);
         }
 
+        try {
+            contributions.icons = this.readIcons(rawPlugin);
+        } catch (err) {
+            console.error(`Could not read '${rawPlugin.name}' contribution 'icons'.`, rawPlugin.contributes.icons, err);
+        }
+
         try {
             contributions.iconThemes = this.readIconThemes(rawPlugin);
         } catch (err) {
@@ -349,18 +364,17 @@ export class TheiaPluginScanner implements PluginScanner {
             console.error(`Could not read '${rawPlugin.name}' contribution 'terminals'.`, rawPlugin.contributes.terminal, err);
         }
 
-        const [localizationsResult, languagesResult, grammarsResult] = await Promise.allSettled([
-            this.readLocalizations(rawPlugin),
+        try {
+            contributions.localizations = this.readLocalizations(rawPlugin);
+        } catch (err) {
+            console.error(`Could not read '${rawPlugin.name}' contribution 'localizations'.`, rawPlugin.contributes.localizations, err);
+        }
+
+        const [languagesResult, grammarsResult] = await Promise.allSettled([
             rawPlugin.contributes.languages ? this.readLanguages(rawPlugin.contributes.languages, rawPlugin.packagePath) : undefined,
             rawPlugin.contributes.grammars ? this.grammarsReader.readGrammars(rawPlugin.contributes.grammars, rawPlugin.packagePath) : undefined
         ]);
 
-        if (localizationsResult.status === 'fulfilled') {
-            contributions.localizations = localizationsResult.value;
-        } else {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'localizations'.`, rawPlugin.contributes.localizations, localizationsResult.reason);
-        }
-
         if (rawPlugin.contributes.languages) {
             if (languagesResult.status === 'fulfilled') {
                 contributions.languages = languagesResult.value;
@@ -387,31 +401,29 @@ export class TheiaPluginScanner implements PluginScanner {
         return pck.contributes.terminal.profiles.filter(profile => profile.id && profile.title);
     }
 
-    protected async readLocalizations(pck: PluginPackage): Promise<Localization[] | undefined> {
+    protected readLocalizations(pck: PluginPackage): Localization[] | undefined {
         if (!pck.contributes || !pck.contributes.localizations) {
             return undefined;
         }
-        return Promise.all(pck.contributes.localizations.map(e => this.readLocalization(e, pck.packagePath)));
+        return pck.contributes.localizations.map(e => this.readLocalization(e, pck.packagePath));
     }
 
-    protected async readLocalization({ languageId, languageName, localizedLanguageName, translations }: PluginPackageLocalization, pluginPath: string): Promise<Localization> {
+    protected readLocalization({ languageId, languageName, localizedLanguageName, translations }: PluginPackageLocalization, pluginPath: string): Localization {
         const local: Localization = {
             languageId,
             languageName,
             localizedLanguageName,
             translations: []
         };
-        local.translations = await Promise.all(translations.map(e => this.readTranslation(e, pluginPath)));
+        local.translations = translations.map(e => this.readTranslation(e, pluginPath));
         return local;
     }
 
-    protected async readTranslation(packageTranslation: PluginPackageTranslation, pluginPath: string): Promise<Translation> {
-        const translation = await this.readJson<Translation>(path.resolve(pluginPath, packageTranslation.path));
-        if (!translation) {
-            throw new Error(`Could not read json file '${packageTranslation.path}'.`);
-        }
-        translation.id = packageTranslation.id;
-        translation.path = packageTranslation.path;
+    protected readTranslation(packageTranslation: PluginPackageTranslation, pluginPath: string): Translation {
+        const translation: Translation = {
+            id: packageTranslation.id,
+            path: packageTranslation.path
+        };
         return translation;
     }
 
@@ -523,6 +535,59 @@ export class TheiaPluginScanner implements PluginScanner {
         return result;
     }
 
+    protected readIcons(pck: PluginPackage): IconContribution[] | undefined {
+        if (!pck.contributes || !pck.contributes.icons) {
+            return undefined;
+        }
+        const result: IconContribution[] = [];
+        const iconEntries = <PluginIconContribution>(<unknown>pck.contributes.icons);
+        for (const id in iconEntries) {
+            if (pck.contributes.icons.hasOwnProperty(id)) {
+                if (!id.match(iconIdPattern)) {
+                    console.error("'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. " +
+                        'They need to consist of at least two segments in the form `component-iconname`.', 'extension: ', pck.name, 'icon id: ', id);
+                    return;
+                }
+                const iconContribution = iconEntries[id];
+                if (typeof iconContribution.description !== 'string' || iconContribution.description['length'] === 0) {
+                    console.error('configuration.icons.description must be defined and can not be empty, ', 'extension: ', pck.name, 'icon id: ', id);
+                    return;
+                }
+
+                const defaultIcon = iconContribution.default;
+                if (typeof defaultIcon === 'string') {
+                    result.push({
+                        id,
+                        extensionId: pck.publisher + '.' + pck.name,
+                        description: iconContribution.description,
+                        defaults: { id: defaultIcon }
+                    });
+                } else if (typeof defaultIcon === 'object' && typeof defaultIcon.fontPath === 'string' && typeof defaultIcon.fontCharacter === 'string') {
+                    const format = getFileExtension(defaultIcon.fontPath);
+                    if (['woff', 'woff2', 'ttf'].indexOf(format) === -1) {
+                        console.warn("Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.", format);
+                        return;
+                    }
+
+                    const iconFontLocation = this.pluginUriFactory.createUri(pck, defaultIcon.fontPath).toString();
+                    result.push({
+                        id,
+                        extensionId: pck.publisher + '.' + pck.name,
+                        description: iconContribution.description,
+                        defaults: {
+                            fontCharacter: defaultIcon.fontCharacter,
+                            location: iconFontLocation
+                        }
+                    });
+                } else {
+                    console.error("'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with ",
+                        'properties `fontPath` and `fontCharacter`.');
+                }
+            }
+        }
+        return result;
+    }
+
     protected readSnippets(pck: PluginPackage): SnippetContribution[] | undefined {
         if (!pck.contributes || !pck.contributes.snippets) {
             return undefined;

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

@@ -22,6 +22,7 @@ import { CommandRegistryMain, CommandRegistryExt, MAIN_RPC_CONTEXT } from '../..
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { KeybindingRegistry } from '@theia/core/lib/browser';
 import { PluginContributionHandler } from './plugin-contribution-handler';
+import { ArgumentProcessor } from '../../common/commands';
 
 export class CommandRegistryMainImpl implements CommandRegistryMain, Disposable {
     private readonly proxy: CommandRegistryExt;
@@ -31,6 +32,8 @@ export class CommandRegistryMainImpl implements CommandRegistryMain, Disposable
     private readonly keyBinding: KeybindingRegistry;
     private readonly contributions: PluginContributionHandler;
 
+    private readonly argumentProcessors: ArgumentProcessor[] = [];
+
     protected readonly toDispose = new DisposableCollection();
 
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
@@ -44,6 +47,16 @@ export class CommandRegistryMainImpl implements CommandRegistryMain, Disposable
         this.toDispose.dispose();
     }
 
+    registerArgumentProcessor(processor: ArgumentProcessor): Disposable {
+        this.argumentProcessors.push(processor);
+        return Disposable.create(() => {
+            const index = this.argumentProcessors.lastIndexOf(processor);
+            if (index >= 0) {
+                this.argumentProcessors.splice(index, 1);
+            }
+        });
+    }
+
     $registerCommand(command: theia.CommandDescription): void {
         const id = command.id;
         this.commands.set(id, this.contributions.registerCommand(command));
@@ -59,7 +72,7 @@ export class CommandRegistryMainImpl implements CommandRegistryMain, Disposable
 
     $registerHandler(id: string): void {
         this.handlers.set(id, this.contributions.registerCommandHandler(id, (...args) =>
-            this.proxy.$executeCommand(id, ...args)
+            this.proxy.$executeCommand(id, ...args.map(arg => this.argumentProcessors.reduce((currentValue, processor) => processor.processArgument(currentValue), arg)))
         ));
         this.toDispose.push(Disposable.create(() => this.$unregisterHandler(id)));
     }

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

@@ -740,7 +740,8 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
 
     createDocumentDropEditProvider(handle: number, _metadata?: DocumentDropEditProviderMetadata): DocumentOnDropEditProvider {
         return {
-            // @monaco-uplift dropMimeTypes should be supported by the monaco drop editor provider after 1.79.0
+            // @monaco-uplift id and dropMimeTypes should be supported by the monaco drop editor provider after 1.82.0
+            // id?: string;
             // dropMimeTypes: metadata?.dropMimeTypes ?? ['*/*'],
             provideDocumentOnDropEdits: async (model, position, dataTransfer, token) => this.provideDocumentDropEdits(handle, model, position, dataTransfer, token)
         };
@@ -752,10 +753,11 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         const edit = await this.proxy.$provideDocumentDropEdits(handle, model.uri, position, await DataTransfer.toDataTransferDTO(dataTransfer), token);
         if (edit) {
             return {
-                // @monaco-uplift id, priority and label should be supported by monaco after 1.79.0. The implementation relies on a copy of the plugin data
-                // id: edit.id ? plugin.identifier.value + '.' + edit.id : plugin.identifier.value,
-                // label: edit.label ?? nls.localizeByDefault("Drop using '{0}' extension", plugin.displayName || plugin.name),
-                // priority: edit.priority ?? 0,
+                // @monaco-uplift label and yieldTo should be supported by monaco after 1.82.0. The implementation relies on a copy of the plugin data
+                // label: label: edit.label ?? localize('defaultDropLabel', "Drop using '{0}' extension", this._extension.displayName || this._extension.name),,
+                // yieldTo: edit.yieldTo?.map(yTo => {
+                //      return 'mimeType' in yTo ? yTo : { providerId: DocumentOnDropEditAdapter.toInternalProviderId(yTo.extensionId, yTo.providerId) };
+                // }),
                 insertText: edit.insertText instanceof SnippetString ? { snippet: edit.insertText.value } : edit.insertText,
                 additionalEdit: toMonacoWorkspaceEdit(edit?.additionalEdit)
             };

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

@@ -68,6 +68,7 @@ import { NotebookEditorsMainImpl } from './notebooks/notebook-editors-main';
 import { NotebookDocumentsMainImpl } from './notebooks/notebook-documents-main';
 import { NotebookKernelsMainImpl } from './notebooks/notebook-kernels-main';
 import { NotebooksAndEditorsMain } from './notebooks/notebook-documents-and-editors-main';
+import { TestingMainImpl } from './test-main';
 
 export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container): void {
     const authenticationMain = new AuthenticationMainImpl(rpc, container);
@@ -130,6 +131,9 @@ export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container
     const notificationMain = new NotificationMainImpl(rpc, container);
     rpc.set(PLUGIN_RPC_CONTEXT.NOTIFICATION_MAIN, notificationMain);
 
+    const testingMain = new TestingMainImpl(rpc, container, commandRegistryMain);
+    rpc.set(PLUGIN_RPC_CONTEXT.TESTING_MAIN, testingMain);
+
     const terminalMain = new TerminalServiceMainImpl(rpc, container);
     rpc.set(PLUGIN_RPC_CONTEXT.TERMINAL_MAIN, terminalMain);
 

package/src/main/browser/menus/vscode-theia-menu-mappings.ts

@@ -31,6 +31,7 @@ import { COMMENT_CONTEXT, COMMENT_THREAD_CONTEXT, COMMENT_TITLE } from '../comme
 import { VIEW_ITEM_CONTEXT_MENU } from '../view/tree-view-widget';
 import { WebviewWidget } from '../webview/webview';
 import { EDITOR_LINENUMBER_CONTEXT_MENU } from '@theia/editor/lib/browser/editor-linenumber-contribution';
+import { TEST_VIEW_CONTEXT_MENU } from '@theia/test/lib/browser/view/test-view-contribution';
 
 export const PLUGIN_EDITOR_TITLE_MENU = ['plugin_editor/title'];
 export const PLUGIN_EDITOR_TITLE_RUN_MENU = ['plugin_editor/title/run'];
@@ -55,6 +56,7 @@ export const implementedVSCodeContributionPoints = [
     'scm/resourceState/context',
     'scm/title',
     'timeline/item/context',
+    'testing/item/context',
     'view/item/context',
     'view/title'
 ] as const;
@@ -79,6 +81,7 @@ export const codeToTheiaMappings = new Map<ContributionPoint, MenuPath[]>([
     ['scm/resourceGroup/context', [ScmTreeWidget.RESOURCE_GROUP_CONTEXT_MENU]],
     ['scm/resourceState/context', [ScmTreeWidget.RESOURCE_CONTEXT_MENU]],
     ['scm/title', [PLUGIN_SCM_TITLE_MENU]],
+    ['testing/item/context', [TEST_VIEW_CONTEXT_MENU]],
     ['timeline/item/context', [TIMELINE_ITEM_CONTEXT_MENU]],
     ['view/item/context', [VIEW_ITEM_CONTEXT_MENU]],
     ['view/title', [PLUGIN_VIEW_TITLE_MENU]],

package/src/main/browser/notebooks/notebook-documents-and-editors-main.ts

@@ -111,7 +111,7 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         // this.WidgetManager.onActiveEditorChanged(() => this.updateState(), this, this.disposables);
         this.notebookEditorService.onDidAddNotebookEditor(async editor => this.handleEditorAdd(editor), this, this.disposables);
         this.notebookEditorService.onDidRemoveNotebookEditor(async editor => this.handleEditorRemove(editor), this, this.disposables);
-        this.notebookEditorService.onFocusedEditorChanged(async editor => this.updateState(editor), this, this.disposables);
+        this.notebookEditorService.onDidChangeFocusedEditor(async editor => this.updateState(editor), this, this.disposables);
     }
 
     dispose(): void {
@@ -154,7 +154,7 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
             }
         }
 
-        const activeNotebookEditor = this.notebookEditorService.currentFocusedEditor;
+        const activeNotebookEditor = this.notebookEditorService.focusedEditor;
         let activeEditor: string | null = null;
         if (activeNotebookEditor) {
             activeEditor = activeNotebookEditor.id;

package/src/main/browser/notebooks/notebook-documents-main.ts

@@ -131,7 +131,7 @@ export class NotebookDocumentsMainImpl implements NotebookDocumentsMain {
     }
 
     async $tryCreateNotebook(options: { viewType: string; content?: NotebookDataDto }): Promise<UriComponents> {
-        const ref = await this.notebookModelResolverService.resolve({ untitledResource: undefined }, options.viewType);
+        const ref = await this.notebookModelResolverService.resolveUntitledResource({ untitledResource: undefined }, options.viewType);
 
         // untitled notebooks are disposed when they get saved. we should not hold a reference
         // to such a disposed notebook and therefore dispose the reference as well

package/src/main/browser/notebooks/notebook-dto.ts

@@ -88,11 +88,11 @@ export namespace NotebookDto {
     }
 
     export function toNotebookCellDto(cell: NotebookCellModel): rpc.NotebookCellDto {
-        const eol = OS.backend.isWindows ? '\r\n' : '\n';
+        const eol = OS.backend.EOL;
         return {
             handle: cell.handle,
             uri: cell.uri.toComponents(),
-            source: cell.textBuffer.split(eol),
+            source: cell.text.split(eol),
             eol,
             language: cell.language,
             cellKind: cell.cellKind,

package/src/main/browser/notebooks/notebook-kernels-main.ts

@@ -36,7 +36,7 @@ abstract class NotebookKernel {
 
     readonly id: string;
     readonly viewType: string;
-    readonly extension: string;
+    readonly extensionId: string;
 
     implementsInterrupt: boolean;
     label: string;
@@ -57,7 +57,7 @@ abstract class NotebookKernel {
     constructor(data: NotebookKernelDto, private languageService: LanguageService) {
         this.id = data.id;
         this.viewType = data.notebookType;
-        this.extension = data.extensionId;
+        this.extensionId = data.extensionId;
 
         this.implementsInterrupt = data.supportsInterrupt ?? false;
         this.label = data.label;
@@ -104,10 +104,6 @@ abstract class NotebookKernel {
     abstract cancelNotebookCellExecution(uri: URI, cellHandles: number[]): Promise<void>;
 }
 
-class KernelDetectionTask {
-    constructor(readonly notebookType: string) { }
-}
-
 export interface KernelSourceActionProvider {
     readonly viewType: string;
     onDidChangeSourceActions?: Event<void>;
@@ -120,7 +116,7 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
 
     private readonly kernels = new Map<number, [kernel: NotebookKernel, registration: Disposable]>();
 
-    private readonly kernelDetectionTasks = new Map<number, [task: KernelDetectionTask, registration: Disposable]>();
+    private readonly kernelDetectionTasks = new Map<number, [task: string, registration: Disposable]>();
 
     private readonly kernelSourceActionProviders = new Map<number, [provider: KernelSourceActionProvider, registration: Disposable]>();
     private readonly kernelSourceActionProvidersEventRegistrations = new Map<number, Disposable>();
@@ -202,7 +198,7 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
         if (!kernel.selected || kernel.selected.id !== controllerId) {
             throw new Error(`Kernel is not selected: ${kernel.selected?.id} !== ${controllerId}`);
         }
-        const execution = this.notebookExecutionStateService.createCellExecution(uri, cellHandle);
+        const execution = this.notebookExecutionStateService.getOrCreateCellExecution(uri, cellHandle);
         execution.confirm();
         this.executions.set(handle, execution);
     }
@@ -234,9 +230,8 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
     }
 
     async $addKernelDetectionTask(handle: number, notebookType: string): Promise<void> {
-        const kernelDetectionTask = new KernelDetectionTask(notebookType);
-        const registration = this.notebookKernelService.registerNotebookKernelDetectionTask(kernelDetectionTask);
-        this.kernelDetectionTasks.set(handle, [kernelDetectionTask, registration]);
+        const registration = this.notebookKernelService.registerNotebookKernelDetectionTask(notebookType);
+        this.kernelDetectionTasks.set(handle, [notebookType, registration]);
     }
     $removeKernelDetectionTask(handle: number): void {
         const tuple = this.kernelDetectionTasks.get(handle);

package/src/main/browser/notebooks/notebook-renderers-main.ts

@@ -32,7 +32,7 @@ export class NotebookRenderersMainImpl implements NotebookRenderersMain {
     ) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.NOTEBOOK_RENDERERS_EXT);
         this.rendererMessagingService = container.get(NotebookRendererMessagingService);
-        this.rendererMessagingService.onShouldPostMessage(e => {
+        this.rendererMessagingService.onPostMessage(e => {
             this.proxy.$postRendererMessage(e.editorId, e.rendererId, e.message);
         });
     }

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

@@ -16,7 +16,7 @@
 
 import { CancellationToken, DisposableCollection, Emitter } from '@theia/core';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
-import { NotebookCellStatusBarItemList, NotebookCellStatusBarItemProvider, NotebookData, NotebookExtensionDescription, TransientOptions } from '@theia/notebook/lib/common';
+import { NotebookCellStatusBarItemList, NotebookCellStatusBarItemProvider, NotebookData, TransientOptions } from '@theia/notebook/lib/common';
 import { NotebookService } from '@theia/notebook/lib/browser';
 import { Disposable } from '@theia/plugin';
 import { MAIN_RPC_CONTEXT, NotebooksExt, NotebooksMain } from '../../../common';
@@ -39,7 +39,7 @@ export class NotebooksMainImpl implements NotebooksMain {
         plugins: HostedPluginSupport
     ) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.NOTEBOOKS_EXT);
-        notebookService.onNotebookSerializer(async event => plugins.activateByEvent(event));
+        notebookService.onWillUseNotebookSerializer(async event => plugins.activateByNotebookSerializer(event));
         notebookService.markReady();
     }
 
@@ -50,16 +50,16 @@ export class NotebooksMainImpl implements NotebooksMain {
         }
     }
 
-    $registerNotebookSerializer(handle: number, extension: NotebookExtensionDescription, viewType: string, options: TransientOptions): void {
+    $registerNotebookSerializer(handle: number, viewType: string, options: TransientOptions): void {
         const disposables = new DisposableCollection();
 
-        disposables.push(this.notebookService.registerNotebookSerializer(viewType, extension, {
+        disposables.push(this.notebookService.registerNotebookSerializer(viewType, {
             options,
-            dataToNotebook: async (data: BinaryBuffer): Promise<NotebookData> => {
+            toNotebook: async (data: BinaryBuffer): Promise<NotebookData> => {
                 const dto = await this.proxy.$dataToNotebook(handle, data, CancellationToken.None);
                 return NotebookDto.fromNotebookDataDto(dto);
             },
-            notebookToData: (data: NotebookData): Promise<BinaryBuffer> =>
+            fromNotebook: (data: NotebookData): Promise<BinaryBuffer> =>
                 this.proxy.$notebookToData(handle, NotebookDto.toNotebookDataDto(data), CancellationToken.None)
 
         }));

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

@@ -75,6 +75,9 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
     @postConstruct()
     protected async init(): Promise<void> {
         this.cell.onDidChangeOutputs(outputChange => this.updateOutput(outputChange));
+        this.cell.onDidChangeOutputItems(output => {
+            this.updateOutput({start: this.cell.outputs.findIndex(o => o.getData().outputId === o.outputId), deleteCount: 1, newOutputs: [output]});
+        });
 
         this.webviewWidget = await this.widgetManager.getOrCreateWidget(WebviewWidget.FACTORY_ID, { id: this.id });
         this.webviewWidget.setContentOptions({ allowScripts: true });

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

@@ -160,8 +160,8 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
             if (this.rendererApi) {
                 return this.rendererApi;
             }
-
-            const rendererModule = await __import(this.data.entrypoint.uri) as { activate: rendererApi.ActivationFunction };
+            const baseUri = window.location.href.replace(/\/webview\/index\.html.*/, '');
+            const rendererModule = await __import(`${baseUri}/${this.data.entrypoint.uri}`) as { activate: rendererApi.ActivationFunction };
             this.rendererApi = await rendererModule.activate(this.createRendererContext());
             return this.rendererApi;
         }
@@ -381,6 +381,7 @@ 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 outputsChanged(changedEvent: webviewCommunication.OutputChangedMessage): void {

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

@@ -23,7 +23,7 @@ import { PluginViewRegistry } from './view/plugin-view-registry';
 import { PluginCustomEditorRegistry } from './custom-editors/plugin-custom-editor-registry';
 import {
     PluginContribution, IndentationRules, FoldingRules, ScopeMap, DeployedPlugin,
-    GrammarsContribution, EnterAction, OnEnterRule, RegExpOptions, getPluginId
+    GrammarsContribution, EnterAction, OnEnterRule, RegExpOptions, IconContribution, PluginPackage
 } from '../../common';
 import {
     DefaultUriLabelProviderContribution,
@@ -43,6 +43,7 @@ import { PluginDebugService } from './debug/plugin-debug-service';
 import { DebugSchemaUpdater } from '@theia/debug/lib/browser/debug-schema-updater';
 import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { PluginIconService } from './plugin-icon-service';
 import { PluginIconThemeService } from './plugin-icon-theme-service';
 import { ContributionProvider } from '@theia/core/lib/common';
 import * as monaco from '@theia/monaco-editor-core';
@@ -112,6 +113,9 @@ export class PluginContributionHandler {
     @inject(ColorRegistry)
     protected readonly colors: ColorRegistry;
 
+    @inject(PluginIconService)
+    protected readonly iconService: PluginIconService;
+
     @inject(PluginIconThemeService)
     protected readonly iconThemeService: PluginIconThemeService;
 
@@ -332,6 +336,19 @@ export class PluginContributionHandler {
             }
         }
 
+        if (contributions.icons && contributions.icons.length) {
+            for (const icon of contributions.icons) {
+                const defaultIcon = icon.defaults;
+                let key: string;
+                if (IconContribution.isIconDefinition(defaultIcon)) {
+                    key = defaultIcon.location;
+                } else {
+                    key = defaultIcon.id;
+                }
+                pushContribution(`icons.${key}`, () => this.iconService.register(icon, plugin));
+            }
+        }
+
         const colors = contributions.colors;
         if (colors) {
             pushContribution('colors', () => this.colors.register(...colors));
@@ -416,7 +433,7 @@ export class PluginContributionHandler {
         if (contributions.notebookRenderer) {
             for (const renderer of contributions.notebookRenderer) {
                 pushContribution(`notebookRenderer.${renderer.id}`,
-                    () => this.notebookRendererRegistry.registerNotebookRenderer(renderer, `/hostedPlugin/${getPluginId(plugin.metadata.model)}`)
+                    () => this.notebookRendererRegistry.registerNotebookRenderer(renderer, PluginPackage.toPluginUrl(plugin.metadata.model, ''))
                 );
             }
         }

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

@@ -79,6 +79,7 @@ import { bindTreeViewDecoratorUtilities, TreeViewDecoratorService } from './view
 import { CodeEditorWidgetUtil } from './menus/vscode-theia-menu-mappings';
 import { PluginMenuCommandAdapter } from './menus/plugin-menu-command-adapter';
 import './theme-icon-override';
+import { PluginIconService } from './plugin-icon-service';
 import { PluginTerminalRegistry } from './plugin-terminal-registry';
 import { DnDFileContentStore } from './view/dnd-file-content-store';
 import { WebviewContextKeys } from './webview/webview-context-keys';
@@ -248,6 +249,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(WebviewFrontendSecurityWarnings).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(WebviewFrontendSecurityWarnings);
 
+    bind(PluginIconService).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(PluginIconService);
+
     bind(PluginAuthenticationServiceImpl).toSelf().inSingletonScope();
     rebind(AuthenticationService).toService(PluginAuthenticationServiceImpl);