@theia/plugin-ext 1.48.2 → 1.49.0

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

@@ -21,6 +21,9 @@ import { URI as CodeUri } from '@theia/core/shared/vscode-uri';
 import { TreeWidgetSelection } from '@theia/core/lib/browser/tree/tree-widget-selection';
 import { ScmRepository } from '@theia/scm/lib/browser/scm-repository';
 import { ScmService } from '@theia/scm/lib/browser/scm-service';
+import { DirtyDiffWidget } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-widget';
+import { Change, LineRange } from '@theia/scm/lib/browser/dirty-diff/diff-computer';
+import { IChange } from '@theia/monaco-editor-core/esm/vs/editor/common/diff/legacyLinesDiffComputer';
 import { TimelineItem } from '@theia/timeline/lib/common/timeline-model';
 import { ScmCommandArg, TimelineCommandArg, TreeViewItemReference } from '../../../common';
 import { TestItemReference, TestMessageArg } from '../../../common/test-types';
@@ -105,6 +108,7 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
             ['scm/resourceState/context', toScmArgs],
             ['scm/title', () => [this.toScmArg(this.scmService.selectedRepository)]],
             ['testing/message/context', toTestMessageArgs],
+            ['scm/change/title', (...args) => this.toScmChangeArgs(...args)],
             ['timeline/item/context', (...args) => this.toTimelineArgs(...args)],
             ['view/item/context', (...args) => this.toTreeArgs(...args)],
             ['view/title', noArgs],
@@ -229,6 +233,41 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
         }
     }
 
+    protected toScmChangeArgs(...args: any[]): any[] {
+        const arg = args[0];
+        if (arg instanceof DirtyDiffWidget) {
+            const toIChange = (change: Change): IChange => {
+                const convert = (range: LineRange): [number, number] => {
+                    let startLineNumber;
+                    let endLineNumber;
+                    if (!LineRange.isEmpty(range)) {
+                        startLineNumber = range.start + 1;
+                        endLineNumber = range.end;
+                    } else {
+                        startLineNumber = range.start;
+                        endLineNumber = 0;
+                    }
+                    return [startLineNumber, endLineNumber];
+                };
+                const { previousRange, currentRange } = change;
+                const [originalStartLineNumber, originalEndLineNumber] = convert(previousRange);
+                const [modifiedStartLineNumber, modifiedEndLineNumber] = convert(currentRange);
+                return {
+                    originalStartLineNumber,
+                    originalEndLineNumber,
+                    modifiedStartLineNumber,
+                    modifiedEndLineNumber
+                };
+            };
+            return [
+                arg.uri['codeUri'],
+                arg.changes.map(toIChange),
+                arg.currentChangeIndex
+            ];
+        }
+        return [];
+    }
+
     protected toTimelineArgs(...args: any[]): any[] {
         const timelineArgs: any[] = [];
         const arg = args[0];

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

@@ -26,6 +26,7 @@ import { DebugVariablesWidget } from '@theia/debug/lib/browser/view/debug-variab
 import { EditorWidget, EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
 import { NAVIGATOR_CONTEXT_MENU } from '@theia/navigator/lib/browser/navigator-contribution';
 import { ScmTreeWidget } from '@theia/scm/lib/browser/scm-tree-widget';
+import { PLUGIN_SCM_CHANGE_TITLE_MENU } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-widget';
 import { TIMELINE_ITEM_CONTEXT_MENU } from '@theia/timeline/lib/browser/timeline-tree-widget';
 import { COMMENT_CONTEXT, COMMENT_THREAD_CONTEXT, COMMENT_TITLE } from '../comments/comment-thread-widget';
 import { VIEW_ITEM_CONTEXT_MENU } from '../view/tree-view-widget';
@@ -53,6 +54,7 @@ export const implementedVSCodeContributionPoints = [
     'editor/title/run',
     'editor/lineNumber/context',
     'explorer/context',
+    'scm/change/title',
     'scm/resourceFolder/context',
     'scm/resourceGroup/context',
     'scm/resourceState/context',
@@ -84,6 +86,7 @@ export const codeToTheiaMappings = new Map<ContributionPoint, MenuPath[]>([
     ['editor/title/run', [PLUGIN_EDITOR_TITLE_RUN_MENU]],
     ['editor/lineNumber/context', [EDITOR_LINENUMBER_CONTEXT_MENU]],
     ['explorer/context', [NAVIGATOR_CONTEXT_MENU]],
+    ['scm/change/title', [PLUGIN_SCM_CHANGE_TITLE_MENU]],
     ['scm/resourceFolder/context', [ScmTreeWidget.RESOURCE_FOLDER_CONTEXT_MENU]],
     ['scm/resourceGroup/context', [ScmTreeWidget.RESOURCE_GROUP_CONTEXT_MENU]],
     ['scm/resourceState/context', [ScmTreeWidget.RESOURCE_CONTEXT_MENU]],

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

@@ -94,7 +94,7 @@ export namespace NotebookDto {
         return {
             handle: cell.handle,
             uri: cell.uri.toComponents(),
-            source: cell.text.split(eol),
+            source: cell.text.split(/\r?\n/g),
             eol,
             language: cell.language,
             cellKind: cell.cellKind,

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

@@ -145,7 +145,7 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
         this.notebookEditorWidgetService = container.get(NotebookEditorWidgetService);
 
         this.notebookEditorWidgetService.onDidAddNotebookEditor(editor => {
-            editor.onDidRecieveKernelMessage(async message => {
+            editor.onDidReceiveKernelMessage(async message => {
                 const kernel = this.notebookKernelService.getSelectedOrSuggestedKernel(editor.model!);
                 if (kernel) {
                     this.proxy.$acceptKernelMessageFromRenderer(kernel.handle, editor.id, message);
@@ -209,9 +209,16 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
             }
         }(handle, data, this.languageService);
 
+        // this is for when a kernel is bound to a notebook while being registered
+        const autobindListener = this.notebookKernelService.onDidChangeSelectedKernel(e => {
+            if (e.newKernel === kernel.id) {
+                this.proxy.$acceptNotebookAssociation(handle, e.notebook.toComponents(), true);
+            }
+        });
+
         const registration = this.notebookKernelService.registerKernel(kernel);
         this.kernels.set(handle, [kernel, registration]);
-
+        autobindListener.dispose();
     }
 
     $updateKernel(handle: number, data: Partial<NotebookKernelDto>): void {

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

@@ -117,7 +117,20 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
         }
 
         this.webviewWidget = await this.widgetManager.getOrCreateWidget(WebviewWidget.FACTORY_ID, { id: this.id });
-        this.webviewWidget.setContentOptions({ allowScripts: true });
+        this.webviewWidget.setContentOptions({
+            allowScripts: true,
+            // eslint-disable-next-line max-len
+            // list taken from https://github.com/microsoft/vscode/blob/a27099233b956dddc2536d4a0d714ab36266d897/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts#L762-L774
+            enableCommandUris: [
+                'github-issues.authNow',
+                'workbench.extensions.search',
+                'workbench.action.openSettings',
+                '_notebook.selectKernel',
+                'jupyter.viewOutput',
+                'workbench.action.openLargeOutput',
+                'cellOutput.enableScrolling',
+            ]
+        });
         this.webviewWidget.setHTML(await this.createWebviewContent());
 
         this.webviewWidget.onMessage((message: FromWebviewMessage) => {

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

@@ -553,11 +553,11 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
                 renderers.getRenderer(event.data.rendererId)?.receiveMessage(event.data.message);
                 break;
             case 'changePreferredMimetype':
-                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);
+                const mimeType = event.data.mimeType;
+                outputs.forEach(output => {
+                    output.element.innerHTML = '';
+                    renderers.render(output, mimeType, undefined, new AbortController().signal);
+                });
                 break;
             case 'customKernelMessage':
                 onDidReceiveKernelMessage.fire(event.data.message);

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

@@ -288,7 +288,7 @@ export class PluginContributionHandler {
         if (contributions.customEditors) {
             for (const customEditor of contributions.customEditors) {
                 pushContribution(`customEditors.${customEditor.viewType}`,
-                    () => this.customEditorRegistry.registerCustomEditor(customEditor)
+                    () => this.customEditorRegistry.registerCustomEditor(customEditor, plugin)
                 );
             }
         }
@@ -434,7 +434,7 @@ export class PluginContributionHandler {
         if (contributions.notebooks) {
             for (const notebook of contributions.notebooks) {
                 pushContribution(`notebook.${notebook.type}`,
-                    () => this.notebookTypeRegistry.registerNotebookType(notebook)
+                    () => this.notebookTypeRegistry.registerNotebookType(notebook, plugin.metadata.model.displayName)
                 );
             }
         }
@@ -463,7 +463,7 @@ export class PluginContributionHandler {
             return Disposable.NULL;
         }
         const toDispose = new DisposableCollection();
-        for (const { iconUrl, themeIcon, command, category, title, originalTitle, enablement } of contribution.commands) {
+        for (const { iconUrl, themeIcon, command, category, shortTitle, title, originalTitle, enablement } of contribution.commands) {
             const reference = iconUrl && this.style.toIconClass(iconUrl);
             const icon = themeIcon && ThemeIcon.fromString(themeIcon);
             let iconClass;
@@ -473,7 +473,7 @@ export class PluginContributionHandler {
             } else if (icon) {
                 iconClass = ThemeIcon.asClassName(icon);
             }
-            toDispose.push(this.registerCommand({ id: command, category, label: title, originalLabel: originalTitle, iconClass }, enablement));
+            toDispose.push(this.registerCommand({ id: command, category, shortTitle, label: title, originalLabel: originalTitle, iconClass }, enablement));
         }
         return toDispose;
     }

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

@@ -55,6 +55,13 @@ export const PLUGIN_VIEW_DATA_FACTORY_ID = 'plugin-view-data';
 
 export type ViewDataProvider = (params: { state?: object, viewInfo: View }) => Promise<TreeViewWidget>;
 
+export interface ViewContainerInfo {
+    id: string
+    location: string
+    options: ViewContainerTitleOptions
+    onViewAdded: () => void
+}
+
 @injectable()
 export class PluginViewRegistry implements FrontendApplicationContribution {
 
@@ -96,7 +103,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
 
     private readonly views = new Map<string, [string, View]>();
     private readonly viewsWelcome = new Map<string, ViewWelcome[]>();
-    private readonly viewContainers = new Map<string, [string, ViewContainerTitleOptions]>();
+    private readonly viewContainers = new Map<string, ViewContainerInfo>();
     private readonly containerViews = new Map<string, string[]>();
     private readonly viewClauseContexts = new Map<string, Set<string> | undefined>();
 
@@ -324,34 +331,47 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
 
     protected doRegisterViewContainer(id: string, location: string, options: ViewContainerTitleOptions): Disposable {
         const toDispose = new DisposableCollection();
-        this.viewContainers.set(id, [location, options]);
         toDispose.push(Disposable.create(() => this.viewContainers.delete(id)));
         const toggleCommandId = `plugin.view-container.${id}.toggle`;
-        toDispose.push(this.commands.registerCommand({
-            id: toggleCommandId,
-            label: 'Toggle ' + options.label + ' View'
-        }, {
-            execute: () => this.toggleViewContainer(id)
-        }));
-        toDispose.push(this.menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
-            commandId: toggleCommandId,
-            label: options.label
-        }));
-        toDispose.push(this.quickView?.registerItem({
-            label: options.label,
-            open: async () => {
-                const widget = await this.openViewContainer(id);
+        // Some plugins may register empty view containers.
+        // We should not register commands for them immediately, as that leads to bad UX.
+        // Instead, we register commands the first time we add a view to them.
+        let activate = () => {
+            toDispose.push(this.commands.registerCommand({
+                id: toggleCommandId,
+                category: nls.localizeByDefault('View'),
+                label: nls.localizeByDefault('Toggle {0}', options.label)
+            }, {
+                execute: () => this.toggleViewContainer(id)
+            }));
+            toDispose.push(this.menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
+                commandId: toggleCommandId,
+                label: options.label
+            }));
+            toDispose.push(this.quickView?.registerItem({
+                label: options.label,
+                open: async () => {
+                    const widget = await this.openViewContainer(id);
+                    if (widget) {
+                        this.shell.activateWidget(widget.id);
+                    }
+                }
+            }));
+            toDispose.push(Disposable.create(async () => {
+                const widget = await this.getPluginViewContainer(id);
                 if (widget) {
-                    this.shell.activateWidget(widget.id);
+                    widget.dispose();
                 }
-            }
-        }));
-        toDispose.push(Disposable.create(async () => {
-            const widget = await this.getPluginViewContainer(id);
-            if (widget) {
-                widget.dispose();
-            }
-        }));
+            }));
+            // Ignore every subsequent activation call
+            activate = () => { };
+        };
+        this.viewContainers.set(id, {
+            id,
+            location,
+            options,
+            onViewAdded: () => activate()
+        });
         return toDispose;
     }
 
@@ -374,6 +394,11 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         this.views.set(view.id, [viewContainerId, view]);
         toDispose.push(Disposable.create(() => this.views.delete(view.id)));
 
+        const containerInfo = this.viewContainers.get(viewContainerId);
+        if (containerInfo) {
+            containerInfo.onViewAdded();
+        }
+
         const containerViews = this.getContainerViews(viewContainerId);
         containerViews.push(view.id);
         this.containerViews.set(viewContainerId, containerViews);
@@ -634,7 +659,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         if (!data) {
             return undefined;
         }
-        const [location] = data;
+        const { location } = data;
         const containerWidget = await this.getOrCreateViewContainerWidget(containerId);
         if (!containerWidget.isAttached) {
             await this.shell.addWidget(containerWidget, {
@@ -648,7 +673,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     protected async prepareViewContainer(viewContainerId: string, containerWidget: ViewContainerWidget): Promise<void> {
         const data = this.viewContainers.get(viewContainerId);
         if (data) {
-            const [, options] = data;
+            const { options } = data;
             containerWidget.setTitleOptions(options);
         }
         for (const viewId of this.getContainerViews(viewContainerId)) {

package/src/main/browser/webview/pre/host.js

@@ -31,7 +31,7 @@
                 let sourceIsChildFrame = false;
                 for (let i = 0; i < window.frames.length; i++) {
                     const frame = window.frames[i];
-                    if (e.source === frame) {
+                    if (e.origin === frame.origin) {
                         sourceIsChildFrame = true;
                         break;
                     }

package/src/main/node/plugin-deployer-impl.ts

@@ -225,8 +225,20 @@ export class PluginDeployerImpl implements PluginDeployer {
     }
 
     protected async resolveAndHandle(id: string, type: PluginType, options?: PluginDeployOptions): Promise<PluginDeployerEntry[]> {
-        const entries = await this.resolvePlugin(id, type, options);
-        await this.applyFileHandlers(entries);
+        let entries = await this.resolvePlugin(id, type, options);
+        if (type === PluginType.User) {
+            await this.applyFileHandlers(entries);
+        } else {
+            const filteredEntries: PluginDeployerEntry[] = [];
+            for (const entry of entries) {
+                if (await entry.isFile()) {
+                    this.logger.warn(`Only user plugins will be handled by file handlers, please unpack the plugin '${entry.id()}' manually.`);
+                } else {
+                    filteredEntries.push(entry);
+                }
+            }
+            entries = filteredEntries;
+        }
         await this.applyDirectoryFileHandlers(entries);
         return entries;
     }
@@ -286,13 +298,12 @@ export class PluginDeployerImpl implements PluginDeployer {
         const pluginPaths = [...acceptedBackendPlugins, ...acceptedHeadlessPlugins].map(pluginEntry => pluginEntry.path());
         this.logger.debug('local path to deploy on remote instance', pluginPaths);
 
-        const deployments = await Promise.all([
-            // headless plugins are deployed like backend plugins
-            this.pluginDeployerHandler.deployBackendPlugins(acceptedHeadlessPlugins),
-            // start the backend plugins
-            this.pluginDeployerHandler.deployBackendPlugins(acceptedBackendPlugins),
-            this.pluginDeployerHandler.deployFrontendPlugins(acceptedFrontendPlugins)
-        ]);
+        const deployments = [];
+        // start the backend plugins
+        deployments.push(await this.pluginDeployerHandler.deployBackendPlugins(acceptedBackendPlugins));
+        // headless plugins are deployed like backend plugins
+        deployments.push(await this.pluginDeployerHandler.deployBackendPlugins(acceptedHeadlessPlugins));
+        deployments.push(await this.pluginDeployerHandler.deployFrontendPlugins(acceptedFrontendPlugins));
         this.onDidDeployEmitter.fire(undefined);
         return deployments.reduce<number>((accumulated, current) => accumulated += current ?? 0, 0);
     }

package/src/plugin/notebook/notebook-document.ts

@@ -26,7 +26,6 @@ import { Disposable, URI } from '@theia/core';
 import * as typeConverters from '../type-converters';
 import { ModelAddedData, NotebookCellDto, NotebookCellsChangedEventDto, NotebookModelAddedData, NotebookOutputDto } from '../../common';
 import { NotebookRange } from '../types-impl';
-import { UriComponents } from '../../common/uri-components';
 import { DocumentsExtImpl } from '../documents';
 
 class RawContentChangeEvent {
@@ -49,7 +48,7 @@ class RawContentChangeEvent {
 
 export class Cell {
 
-    static asModelAddData(notebook: theia.NotebookDocument, cell: NotebookCellDto): ModelAddedData & { notebook: theia.NotebookDocument } {
+    static asModelAddData(cell: NotebookCellDto): ModelAddedData {
         return {
             EOL: cell.eol,
             lines: cell.source,
@@ -57,7 +56,6 @@ export class Cell {
             uri: cell.uri,
             isDirty: false,
             versionId: 1,
-            notebook,
             modeId: ''
         };
     }
@@ -348,8 +346,6 @@ export class NotebookDocument implements Disposable {
         }
 
         const contentChangeEvents: RawContentChangeEvent[] = [];
-        const addedCellDocuments: ModelAddedData[] = [];
-        const removedCellDocuments: UriComponents[] = [];
 
         splices.reverse().forEach(splice => {
             const cellDtos = splice.newItems;
@@ -357,18 +353,8 @@ export class NotebookDocument implements Disposable {
 
                 const extCell = new Cell(this, this.editorsAndDocuments, cell);
                 if (!initialization) {
-                    addedCellDocuments.push(Cell.asModelAddData(this.apiNotebook, cell));
                     this.editorsAndDocuments.$acceptEditorsAndDocumentsDelta({
-                        addedDocuments: [
-                            {
-                                uri: cell.uri,
-                                versionId: 1,
-                                lines: cell.source,
-                                EOL: cell.eol,
-                                modeId: '',
-                                isDirty: false
-                            }
-                        ]
+                        addedDocuments: [Cell.asModelAddData(cell)]
                     });
                 }
                 return extCell;
@@ -377,7 +363,6 @@ export class NotebookDocument implements Disposable {
             const changeEvent = new RawContentChangeEvent(splice.start, splice.deleteCount, [], newCells);
             const deletedItems = this.cells.splice(splice.start, splice.deleteCount, ...newCells);
             for (const cell of deletedItems) {
-                removedCellDocuments.push(cell.uri.toComponents());
                 changeEvent.deletedItems.push(cell.apiCell);
             }
             contentChangeEvents.push(changeEvent);

package/src/plugin/notebook/notebooks.ts

@@ -22,7 +22,7 @@ import { CancellationToken, Disposable, DisposableCollection, Emitter, Event, UR
 import { URI as TheiaURI } from '../types-impl';
 import * as theia from '@theia/plugin';
 import {
-    CommandRegistryExt, NotebookCellStatusBarListDto, NotebookDataDto,
+    CommandRegistryExt, ModelAddedData, NotebookCellStatusBarListDto, NotebookDataDto,
     NotebookDocumentsAndEditorsDelta, NotebookDocumentShowOptions, NotebookDocumentsMain, NotebookEditorAddData, NotebookEditorsMain, NotebooksExt, NotebooksMain, Plugin,
     PLUGIN_RPC_CONTEXT
 } from '../../common';
@@ -32,7 +32,7 @@ import { UriComponents } from '../../common/uri-components';
 import { CommandsConverter } from '../command-registry';
 import * as typeConverters from '../type-converters';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
-import { NotebookDocument } from './notebook-document';
+import { Cell, NotebookDocument } from './notebook-document';
 import { NotebookEditor } from './notebook-editor';
 import { EditorsAndDocumentsExtImpl } from '../editors-and-documents';
 import { DocumentsExtImpl } from '../documents';
@@ -204,6 +204,8 @@ export class NotebooksExtImpl implements NotebooksExt {
     }
 
     async $acceptDocumentsAndEditorsDelta(delta: NotebookDocumentsAndEditorsDelta): Promise<void> {
+        const removedCellDocuments: UriComponents[] = [];
+        const addedCellDocuments: ModelAddedData[] = [];
         if (delta.removedDocuments) {
             for (const uri of delta.removedDocuments) {
                 const revivedUri = URI.fromComponents(uri);
@@ -213,6 +215,7 @@ export class NotebooksExtImpl implements NotebooksExt {
                     document.dispose();
                     this.documents.delete(revivedUri.toString());
                     this.onDidCloseNotebookDocumentEmitter.fire(document.apiNotebook);
+                    removedCellDocuments.push(...document.apiNotebook.getCells().map(cell => cell.document.uri));
                 }
 
                 for (const editor of this.editors.values()) {
@@ -223,6 +226,11 @@ export class NotebooksExtImpl implements NotebooksExt {
             }
         }
 
+        // publish all removed cell documents first
+        await this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
+            removedDocuments: removedCellDocuments
+        });
+
         if (delta.addedDocuments) {
             for (const modelData of delta.addedDocuments) {
                 const uri = TheiaURI.from(modelData.uri);
@@ -242,21 +250,17 @@ export class NotebooksExtImpl implements NotebooksExt {
                 this.documents.get(uri.toString())?.dispose();
                 this.documents.set(uri.toString(), document);
 
-                this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
-                    addedDocuments: modelData.cells.map(cell => ({
-                        uri: cell.uri,
-                        versionId: 1,
-                        lines: cell.source,
-                        EOL: cell.eol,
-                        modeId: '',
-                        isDirty: false
-                    }))
-                });
+                addedCellDocuments.push(...modelData.cells.map(cell => Cell.asModelAddData(cell)));
 
                 this.onDidOpenNotebookDocumentEmitter.fire(document.apiNotebook);
             }
         }
 
+        // publish all added cell documents in a separate call
+        await this.textDocumentsAndEditors.$acceptEditorsAndDocumentsDelta({
+            addedDocuments: addedCellDocuments
+        });
+
         if (delta.addedEditors) {
             for (const editorModelData of delta.addedEditors) {
                 if (this.editors.has(editorModelData.id)) {

package/src/plugin/plugin-context.ts

@@ -198,12 +198,19 @@ import {
     TextMergeTabInput,
     WebviewEditorTabInput,
     DocumentPasteEdit,
+    DocumentPasteEditKind,
+    DocumentPasteTriggerKind,
     ExternalUriOpenerPriority,
     EditSessionIdentityMatch,
     TerminalOutputAnchor,
     TerminalQuickFixTerminalCommand,
     TerminalQuickFixOpener,
-    TestResultState
+    TestResultState,
+    BranchCoverage,
+    DeclarationCoverage,
+    FileCoverage,
+    StatementCoverage,
+    TestCoverageCount
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -1398,11 +1405,18 @@ export function createAPIFactory(
             TerminalOutputAnchor,
             TerminalExitReason,
             DocumentPasteEdit,
+            DocumentPasteEditKind,
+            DocumentPasteTriggerKind,
             ExternalUriOpenerPriority,
             TerminalQuickFixTerminalCommand,
             TerminalQuickFixOpener,
             EditSessionIdentityMatch,
-            TestResultState
+            TestResultState,
+            BranchCoverage,
+            DeclarationCoverage,
+            FileCoverage,
+            StatementCoverage,
+            TestCoverageCount
         };
     };
 }

package/src/plugin/tests.ts

@@ -240,6 +240,8 @@ class TestRun implements theia.TestRun {
     onDidEnd: Event<void> = this.onDidEndEmitter.event;
     private onWillFlushEmitter = new Emitter<void>();
     onWillFlush: Event<void> = this.onWillFlushEmitter.event;
+    private onDidDisposeEmitter = new Emitter<void>();
+    onDidDispose: Event<void> = this.onDidDisposeEmitter.event;
 
     readonly id: string;
     private testStateDeltas = new Map<theia.TestItem, TestStateChangeDTO>();
@@ -293,6 +295,9 @@ class TestRun implements theia.TestRun {
         this.proxy.$notifyTestRunEnded(this.controller.id, this.id);
     }
 
+    /** @stubbed */
+    addCoverage(fileCoverage: theia.FileCoverage): void { }
+
     private checkNotEnded(test: theia.TestItem): boolean {
         if (this.ended) {
             console.warn(`Setting the state of test "${test.id}" is a no - op after the run ends.`);

package/src/plugin/type-converters.ts

@@ -749,9 +749,9 @@ export function isUriComponents(arg: unknown): arg is UriComponents {
     return isObject<UriComponents>(arg) &&
         typeof arg.scheme === 'string' &&
         (arg['$mid'] === 1 || (
-        typeof arg.path === 'string' &&
-        typeof arg.query === 'string' &&
-        typeof arg.fragment === 'string'));
+            typeof arg.path === 'string' &&
+            typeof arg.query === 'string' &&
+            typeof arg.fragment === 'string'));
 }
 
 export function isModelCallHierarchyItem(arg: unknown): arg is model.CallHierarchyItem {
@@ -1522,8 +1522,8 @@ export namespace NotebookCellData {
             cellKind: NotebookCellKind.from(data.kind),
             language: data.languageId,
             source: data.value,
-            // metadata: data.metadata,
-            // internalMetadata: NotebookCellExecutionSummary.from(data.executionSummary ?? {}),
+            metadata: data.metadata,
+            internalMetadata: NotebookCellExecutionSummary.from(data.executionSummary ?? {}),
             outputs: data.outputs ? data.outputs.map(NotebookCellOutputConverter.from) : []
         };
     }