@theia/plugin-ext 1.46.0-next.106 → 1.46.0-next.144

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

@@ -301,6 +301,7 @@ export interface TerminalServiceExt {
     $handleTerminalLink(link: ProvidedTerminalLink): Promise<void>;
     getEnvironmentVariableCollection(extensionIdentifier: string): theia.GlobalEnvironmentVariableCollection;
     $setShell(shell: string): void;
+    $reportOutputMatch(observerId: string, groups: string[]): void;
 }
 export interface OutputChannelRegistryExt {
     createOutputChannel(name: string, pluginInfo: PluginInfo): theia.OutputChannel,
@@ -438,6 +439,20 @@ export interface TerminalServiceMain {
      * @param providerId id of the terminal link provider to be unregistered.
      */
     $unregisterTerminalLinkProvider(providerId: string): Promise<void>;
+
+    /**
+     * Register a new terminal observer.
+     * @param providerId id of the terminal link provider to be registered.
+     * @param nrOfLinesToMatch the number of lines to match the outputMatcherRegex against
+     * @param outputMatcherRegex the regex to match the output to
+     */
+    $registerTerminalObserver(id: string, nrOfLinesToMatch: number, outputMatcherRegex: string): unknown;
+
+    /**
+     * Unregister the terminal observer with the specified id.
+     * @param providerId id of the terminal observer to be unregistered.
+     */
+    $unregisterTerminalObserver(id: string): unknown;
 }
 
 export interface AutoFocus {
@@ -1548,6 +1563,16 @@ export interface WorkspaceNotebookCellEditDto {
     cellEdit: CellEditOperationDto;
 }
 
+export namespace WorkspaceNotebookCellEditDto {
+    export function is(arg: WorkspaceNotebookCellEditDto | WorkspaceFileEditDto | WorkspaceTextEditDto): arg is WorkspaceNotebookCellEditDto {
+        return !!arg
+            && 'resource' in arg
+            && 'cellEdit' in arg
+            && arg.cellEdit !== null
+            && typeof arg.cellEdit === 'object';
+    }
+}
+
 export interface WorkspaceEditDto {
     edits: Array<WorkspaceTextEditDto | WorkspaceFileEditDto | WorkspaceNotebookCellEditDto>;
 }
@@ -2449,6 +2474,10 @@ export type NotebookRawContentEventDto =
         readonly outputItems: NotebookOutputItemDto[];
         readonly append: boolean;
     }
+    | {
+        readonly kind: notebookCommon.NotebookCellsChangeType.ChangeDocumentMetadata
+        readonly metadata: notebookCommon.NotebookDocumentMetadata;
+    }
     | notebookCommon.NotebookCellsChangeLanguageEvent
     | notebookCommon.NotebookCellsChangeMetadataEvent
     | notebookCommon.NotebookCellsChangeInternalMetadataEvent

package/src/main/browser/custom-editors/plugin-custom-editor-registry.ts

@@ -15,15 +15,11 @@
 // *****************************************************************************
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { CustomEditor } from '../../../common';
+import { CustomEditor, DeployedPlugin } from '../../../common';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { CustomEditorOpener } from './custom-editor-opener';
-import { WorkspaceCommands } from '@theia/workspace/lib/browser';
-import { CommandRegistry, Emitter, MenuModelRegistry } from '@theia/core';
-import { SelectionService } from '@theia/core/lib/common';
-import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
-import { NavigatorContextMenu } from '@theia/navigator/lib//browser/navigator-contribution';
-import { ApplicationShell, DefaultOpenerService, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
+import { Emitter } from '@theia/core';
+import { ApplicationShell, DefaultOpenerService, OpenWithService, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
 import { CustomEditorWidget } from './custom-editor-widget';
 
 @injectable()
@@ -38,21 +34,15 @@ export class PluginCustomEditorRegistry {
     @inject(DefaultOpenerService)
     protected readonly defaultOpenerService: DefaultOpenerService;
 
-    @inject(MenuModelRegistry)
-    protected readonly menuModelRegistry: MenuModelRegistry;
-
-    @inject(CommandRegistry)
-    protected readonly commandRegistry: CommandRegistry;
-
-    @inject(SelectionService)
-    protected readonly selectionService: SelectionService;
-
     @inject(WidgetManager)
     protected readonly widgetManager: WidgetManager;
 
     @inject(ApplicationShell)
     protected readonly shell: ApplicationShell;
 
+    @inject(OpenWithService)
+    protected readonly openWithService: OpenWithService;
+
     @postConstruct()
     protected init(): void {
         this.widgetManager.onDidCreateWidget(({ factoryId, widget }) => {
@@ -71,7 +61,7 @@ export class PluginCustomEditorRegistry {
         });
     }
 
-    registerCustomEditor(editor: CustomEditor): Disposable {
+    registerCustomEditor(editor: CustomEditor, plugin: DeployedPlugin): Disposable {
         if (this.editors.has(editor.viewType)) {
             console.warn('editor with such id already registered: ', JSON.stringify(editor));
             return Disposable.NULL;
@@ -87,26 +77,14 @@ export class PluginCustomEditorRegistry {
             this.widgetManager
         );
         toDispose.push(this.defaultOpenerService.addHandler(editorOpenHandler));
-
-        const openWithCommand = WorkspaceCommands.FILE_OPEN_WITH(editorOpenHandler);
-        toDispose.push(
-            this.menuModelRegistry.registerMenuAction(
-                NavigatorContextMenu.OPEN_WITH,
-                {
-                    commandId: openWithCommand.id,
-                    label: editorOpenHandler.label
-                }
-            )
-        );
         toDispose.push(
-            this.commandRegistry.registerCommand(
-                openWithCommand,
-                UriAwareCommandHandler.MonoSelect(this.selectionService, {
-                    execute: uri => editorOpenHandler.open(uri),
-                    isEnabled: uri => editorOpenHandler.canHandle(uri) > 0,
-                    isVisible: uri => editorOpenHandler.canHandle(uri) > 0
-                })
-            )
+            this.openWithService.registerHandler({
+                id: editor.viewType,
+                label: editorOpenHandler.label,
+                providerName: plugin.metadata.model.displayName,
+                canHandle: uri => editorOpenHandler.canHandle(uri),
+                open: uri => editorOpenHandler.open(uri)
+            })
         );
         toDispose.push(
             editorOpenHandler.onDidOpenCustomEditor(event => this.resolveWidget(event[0], event[1]))

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

@@ -32,6 +32,7 @@ import { dispose } from '../../common/disposable-util';
 import { MonacoLanguages } from '@theia/monaco/lib/browser/monaco-languages';
 import * as monaco from '@theia/monaco-editor-core';
 import { TextDocumentChangeReason } from '../../plugin/types-impl';
+import { NotebookDocumentsMainImpl } from './notebooks/notebook-documents-main';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -90,6 +91,7 @@ export class DocumentsMainImpl implements DocumentsMain, Disposable {
 
     constructor(
         editorsAndDocuments: EditorsAndDocumentsMain,
+        notebookDocuments: NotebookDocumentsMainImpl,
         private readonly modelService: EditorModelService,
         rpc: RPCProtocol,
         private editorManager: EditorManager,
@@ -105,6 +107,8 @@ export class DocumentsMainImpl implements DocumentsMain, Disposable {
         this.toDispose.push(editorsAndDocuments.onDocumentRemove(documents => documents.forEach(this.onModelRemoved, this)));
         this.toDispose.push(modelService.onModelModeChanged(this.onModelChanged, this));
 
+        this.toDispose.push(notebookDocuments.onDidAddNotebookCellModel(this.onModelAdded, this));
+
         this.toDispose.push(modelService.onModelSaved(m => {
             this.proxy.$acceptModelSaved(m.textEditorModel.uri);
         }));

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

@@ -1434,7 +1434,6 @@ export function toMonacoWorkspaceEdit(data: WorkspaceEditDto | undefined): monac
                     metadata: fileEdit.metadata
                 };
             }
-            // TODO implement WorkspaceNotebookCellEditDto
         })
     };
 }

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

@@ -44,7 +44,6 @@ import { EditorManager } from '@theia/editor/lib/browser';
 import { EditorModelService } from './text-editor-model-service';
 import { OpenerService } from '@theia/core/lib/browser/opener-service';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
-import { MonacoBulkEditService } from '@theia/monaco/lib/browser/monaco-bulk-edit-service';
 import { MainFileSystemEventService } from './main-file-system-event-service';
 import { LabelServiceMainImpl } from './label-service-main';
 import { TimelineMainImpl } from './timeline-main';
@@ -91,26 +90,27 @@ export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container
 
     const editorsAndDocuments = new EditorsAndDocumentsMain(rpc, container);
 
+    const notebookDocumentsMain = new NotebookDocumentsMainImpl(rpc, container);
+    rpc.set(PLUGIN_RPC_CONTEXT.NOTEBOOK_DOCUMENTS_MAIN, notebookDocumentsMain);
+
     const modelService = container.get(EditorModelService);
     const editorManager = container.get(EditorManager);
     const openerService = container.get<OpenerService>(OpenerService);
     const shell = container.get(ApplicationShell);
     const untitledResourceResolver = container.get(UntitledResourceResolver);
     const languageService = container.get(MonacoLanguages);
-    const documentsMain = new DocumentsMainImpl(editorsAndDocuments, modelService, rpc, editorManager, openerService, shell, untitledResourceResolver, languageService);
+    const documentsMain = new DocumentsMainImpl(editorsAndDocuments, notebookDocumentsMain, modelService, rpc,
+        editorManager, openerService, shell, untitledResourceResolver, languageService);
     rpc.set(PLUGIN_RPC_CONTEXT.DOCUMENTS_MAIN, documentsMain);
 
     rpc.set(PLUGIN_RPC_CONTEXT.NOTEBOOKS_MAIN, new NotebooksMainImpl(rpc, container, commandRegistryMain));
     rpc.set(PLUGIN_RPC_CONTEXT.NOTEBOOK_RENDERERS_MAIN, new NotebookRenderersMainImpl(rpc, container));
     const notebookEditorsMain = new NotebookEditorsMainImpl(rpc, container);
     rpc.set(PLUGIN_RPC_CONTEXT.NOTEBOOK_EDITORS_MAIN, notebookEditorsMain);
-    const notebookDocumentsMain = new NotebookDocumentsMainImpl(rpc, container);
-    rpc.set(PLUGIN_RPC_CONTEXT.NOTEBOOK_DOCUMENTS_MAIN, notebookDocumentsMain);
     rpc.set(PLUGIN_RPC_CONTEXT.NOTEBOOK_DOCUMENTS_AND_EDITORS_MAIN, new NotebooksAndEditorsMain(rpc, container, notebookDocumentsMain, notebookEditorsMain));
     rpc.set(PLUGIN_RPC_CONTEXT.NOTEBOOK_KERNELS_MAIN, new NotebookKernelsMainImpl(rpc, container));
 
-    const bulkEditService = container.get(MonacoBulkEditService);
-    const editorsMain = new TextEditorsMainImpl(editorsAndDocuments, documentsMain, rpc, bulkEditService);
+    const editorsMain = new TextEditorsMainImpl(editorsAndDocuments, documentsMain, rpc, container);
     rpc.set(PLUGIN_RPC_CONTEXT.TEXT_EDITORS_MAIN, editorsMain);
 
     // start listening only after all clients are subscribed to events

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

@@ -14,24 +14,28 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { DisposableCollection } from '@theia/core';
+import { DisposableCollection, Event } from '@theia/core';
 import { URI, UriComponents } from '@theia/core/lib/common/uri';
 import { interfaces } from '@theia/core/shared/inversify';
 import { NotebookModelResolverService } from '@theia/notebook/lib/browser';
 import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
 import { NotebookCellsChangeType } from '@theia/notebook/lib/common';
+import { NotebookMonacoTextModelService } from '@theia/notebook/lib/browser/service/notebook-monaco-text-model-service';
 import { MAIN_RPC_CONTEXT, NotebookCellsChangedEventDto, NotebookDataDto, NotebookDocumentsExt, NotebookDocumentsMain } from '../../../common';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { NotebookDto } from './notebook-dto';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
 
 export class NotebookDocumentsMainImpl implements NotebookDocumentsMain {
 
-    private readonly disposables = new DisposableCollection();
+    protected readonly disposables = new DisposableCollection();
 
-    private readonly proxy: NotebookDocumentsExt;
-    private readonly documentEventListenersMapping = new Map<string, DisposableCollection>();
+    protected readonly proxy: NotebookDocumentsExt;
+    protected readonly documentEventListenersMapping = new Map<string, DisposableCollection>();
 
-    private readonly notebookModelResolverService: NotebookModelResolverService;
+    protected readonly notebookModelResolverService: NotebookModelResolverService;
+
+    protected notebookMonacoTextModelService: NotebookMonacoTextModelService;
 
     constructor(
         rpc: RPCProtocol,
@@ -44,6 +48,11 @@ export class NotebookDocumentsMainImpl implements NotebookDocumentsMain {
         this.disposables.push(this.notebookModelResolverService.onDidChangeDirty(model => this.proxy.$acceptDirtyStateChanged(model.uri.toComponents(), model.isDirty())));
         this.disposables.push(this.notebookModelResolverService.onDidSaveNotebook(e => this.proxy.$acceptModelSaved(e)));
 
+        this.notebookMonacoTextModelService = container.get(NotebookMonacoTextModelService) as NotebookMonacoTextModelService;
+    }
+
+    get onDidAddNotebookCellModel(): Event<MonacoEditorModel> {
+        return this.notebookMonacoTextModelService.onDidCreateNotebookCellModel;
     }
 
     dispose(): void {
@@ -102,6 +111,12 @@ export class NotebookDocumentsMainImpl implements NotebookDocumentsMain {
                         case NotebookCellsChangeType.ChangeCellInternalMetadata:
                             eventDto.rawEvents.push(e);
                             break;
+                        case NotebookCellsChangeType.ChangeDocumentMetadata:
+                            eventDto.rawEvents.push({
+                                kind: e.kind,
+                                metadata: e.metadata
+                            });
+                            break;
                     }
                 }
 

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

@@ -27,7 +27,6 @@ import {
     CellExecution, NotebookEditorWidgetService, NotebookExecutionStateService,
     NotebookKernelChangeEvent, NotebookKernelService, NotebookService
 } from '@theia/notebook/lib/browser';
-import { combinedDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
 import { interfaces } from '@theia/core/shared/inversify';
 import { NotebookKernelSourceAction } from '@theia/notebook/lib/common';
 import { NotebookDto } from './notebook-dto';
@@ -153,6 +152,20 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
                 }
             });
         });
+        this.notebookKernelService.onDidChangeSelectedKernel(e => {
+            if (e.newKernel) {
+                const newKernelHandle = Array.from(this.kernels.entries()).find(([_, [kernel]]) => kernel.id === e.newKernel)?.[0];
+                if (newKernelHandle !== undefined) {
+                    this.proxy.$acceptNotebookAssociation(newKernelHandle, e.notebook.toComponents(), true);
+                }
+            } else {
+                const oldKernelHandle = Array.from(this.kernels.entries()).find(([_, [kernel]]) => kernel.id === e.oldKernel)?.[0];
+                if (oldKernelHandle !== undefined) {
+                    this.proxy.$acceptNotebookAssociation(oldKernelHandle, e.notebook.toComponents(), false);
+                }
+
+            }
+        });
     }
 
     async $postMessage(handle: number, editorId: string | undefined, message: unknown): Promise<boolean> {
@@ -196,16 +209,8 @@ export class NotebookKernelsMainImpl implements NotebookKernelsMain {
             }
         }(handle, data, this.languageService);
 
-        const listener = this.notebookKernelService.onDidChangeSelectedKernel(e => {
-            if (e.oldKernel === kernel.id) {
-                this.proxy.$acceptNotebookAssociation(handle, e.notebook.toComponents(), false);
-            } else if (e.newKernel === kernel.id) {
-                this.proxy.$acceptNotebookAssociation(handle, e.notebook.toComponents(), true);
-            }
-        });
-
         const registration = this.notebookKernelService.registerKernel(kernel);
-        this.kernels.set(handle, [kernel, combinedDisposable(listener, registration)]);
+        this.kernels.set(handle, [kernel, registration]);
 
     }
 

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

@@ -14,17 +14,18 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { CancellationToken, DisposableCollection, Emitter, Event } from '@theia/core';
+import { CancellationToken, DisposableCollection, Emitter, Event, URI } from '@theia/core';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
-import { NotebookCellStatusBarItem, NotebookData, TransientOptions } from '@theia/notebook/lib/common';
-import { NotebookService } from '@theia/notebook/lib/browser';
+import { CellEditType, NotebookCellModelResource, NotebookCellStatusBarItem, NotebookData, NotebookModelResource, TransientOptions } from '@theia/notebook/lib/common';
+import { NotebookService, NotebookWorkspaceEdit } from '@theia/notebook/lib/browser';
 import { Disposable } from '@theia/plugin';
-import { CommandRegistryMain, MAIN_RPC_CONTEXT, NotebooksExt, NotebooksMain } from '../../../common';
+import { CommandRegistryMain, MAIN_RPC_CONTEXT, NotebooksExt, NotebooksMain, WorkspaceEditDto, WorkspaceNotebookCellEditDto } from '../../../common';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { NotebookDto } from './notebook-dto';
 import { UriComponents } from '@theia/core/lib/common/uri';
 import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
 import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
+import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-model';
 import { interfaces } from '@theia/core/shared/inversify';
 
 export interface NotebookCellStatusBarItemList {
@@ -62,7 +63,9 @@ export class NotebooksMainImpl implements NotebooksMain {
         commands.registerArgumentProcessor({
             processArgument: arg => {
                 if (arg instanceof NotebookModel) {
-                    return arg.uri;
+                    return NotebookModelResource.create(arg.uri);
+                } else if (arg instanceof NotebookCellModel) {
+                    return NotebookCellModelResource.create(arg.uri);
                 }
                 return arg;
             }
@@ -148,3 +151,14 @@ export class NotebooksMainImpl implements NotebooksMain {
     }
 }
 
+export function toNotebookWorspaceEdit(dto: WorkspaceEditDto): NotebookWorkspaceEdit {
+    return {
+        edits: dto.edits.map((edit: WorkspaceNotebookCellEditDto) => ({
+            resource: URI.fromComponents(edit.resource),
+            edit: edit.cellEdit.editType === CellEditType.Replace ? {
+                ...edit.cellEdit,
+                cells: edit.cellEdit.cells.map(cell => NotebookDto.fromNotebookCellDataDto(cell))
+            } : edit.cellEdit
+        }))
+    };
+}

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

@@ -99,6 +99,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
 
         if (this.editor) {
             this.toDispose.push(this.editor.onDidPostKernelMessage(message => {
+                // console.log('from extension customKernelMessage ', JSON.stringify(message));
                 this.webviewWidget.sendMessage({
                     type: 'customKernelMessage',
                     message
@@ -106,6 +107,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
             }));
 
             this.toDispose.push(this.editor.onPostRendererMessage(messageObj => {
+                // console.log('from extension customRendererMessage ', JSON.stringify(messageObj));
                 this.webviewWidget.sendMessage({
                     type: 'customRendererMessage',
                     ...messageObj
@@ -115,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) => {
@@ -188,6 +203,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
                 this.updateOutput({ newOutputs: this.cell.outputs, start: 0, deleteCount: 0 });
                 break;
             case 'customRendererMessage':
+                // console.log('from webview customRendererMessage ', message.rendererId, '', JSON.stringify(message.message));
                 this.messagingService.getScoped(this.editor.id).postMessage(message.rendererId, message.message);
                 break;
             case 'didRenderOutput':
@@ -197,6 +213,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
                 this.editor.node.getElementsByClassName('theia-notebook-viewport')[0].children[0].scrollBy(message.deltaX, message.deltaY);
                 break;
             case 'customKernelMessage':
+                // console.log('from webview customKernelMessage ', JSON.stringify(message.message));
                 this.editor.recieveKernelMessage(message.message);
                 break;
         }

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

@@ -573,5 +573,13 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
     });
     window.addEventListener('wheel', handleWheel);
 
+    (document.head as HTMLHeadElement & { originalAppendChild: typeof document.head.appendChild }).originalAppendChild = document.head.appendChild;
+    (document.head as HTMLHeadElement & { originalAppendChild: typeof document.head.appendChild }).appendChild = function appendChild<T extends Node>(node: T): T {
+        if (node instanceof HTMLScriptElement && node.src.includes('webviewuuid')) {
+            node.src = node.src.replace('webviewuuid', location.hostname.split('.')[0]);
+        }
+        return this.originalAppendChild(node);
+    };
+
     theia.postMessage(<webviewCommunication.WebviewInitialized>{ type: 'initialized' });
 }

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)
                 );
             }
         }

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

@@ -90,6 +90,7 @@ import { CellOutputWebviewImpl, createCellOutputWebviewContainer } from './noteb
 import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-model';
 import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
 import { ArgumentProcessorContribution } from './command-registry-main';
+import { WebviewSecondaryWindowSupport } from './webview/webview-secondary-window-support';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
@@ -187,6 +188,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(WebviewWidgetFactory).toDynamicValue(ctx => new WebviewWidgetFactory(ctx.container)).inSingletonScope();
     bind(WidgetFactory).toService(WebviewWidgetFactory);
     bind(WebviewContextKeys).toSelf().inSingletonScope();
+    bind(WebviewSecondaryWindowSupport).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(WebviewSecondaryWindowSupport);
     bind(FrontendApplicationContribution).toService(WebviewContextKeys);
 
     bind(CustomEditorContribution).toSelf().inSingletonScope();

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

@@ -30,6 +30,13 @@ import { getIconClass } from '../../plugin/terminal-ext';
 import { PluginTerminalRegistry } from './plugin-terminal-registry';
 import { CancellationToken } from '@theia/core';
 import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
+import debounce = require('@theia/core/shared/lodash.debounce');
+
+interface TerminalObserverData {
+    nrOfLinesToMatch: number;
+    outputMatcherRegex: RegExp
+    disposables: DisposableCollection;
+}
 
 /**
  * Plugin api service allows working with terminal emulator.
@@ -46,6 +53,7 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
     private readonly terminalLinkProviders: string[] = [];
 
     private readonly toDispose = new DisposableCollection();
+    private readonly observers = new Map<string, TerminalObserverData>();
 
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.terminals = container.get(TerminalService);
@@ -121,6 +129,8 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
             this.extProxy.$terminalOnInput(terminal.id, data);
             this.extProxy.$terminalStateChanged(terminal.id);
         }));
+
+        this.observers.forEach((observer, id) => this.observeTerminal(id, terminal, observer));
     }
 
     $write(id: string, data: string): void {
@@ -293,6 +303,42 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
         }
     }
 
+    $registerTerminalObserver(id: string, nrOfLinesToMatch: number, outputMatcherRegex: string): void {
+        const observerData = {
+            nrOfLinesToMatch: nrOfLinesToMatch,
+            outputMatcherRegex: new RegExp(outputMatcherRegex, 'm'),
+            disposables: new DisposableCollection()
+        };
+        this.observers.set(id, observerData);
+        this.terminals.all.forEach(terminal => {
+            this.observeTerminal(id, terminal, observerData);
+        });
+    }
+
+    protected observeTerminal(observerId: string, terminal: TerminalWidget, observerData: TerminalObserverData): void {
+        const doMatch = debounce(() => {
+            const lineCount = Math.min(observerData.nrOfLinesToMatch, terminal.buffer.length);
+            const lines = terminal.buffer.getLines(terminal.buffer.length - lineCount, lineCount);
+            const result = lines.join('\n').match(observerData.outputMatcherRegex);
+            if (result) {
+                this.extProxy.$reportOutputMatch(observerId, result.map(value => value));
+            }
+        });
+        observerData.disposables.push(terminal.onOutput(output => {
+            doMatch();
+        }));
+    }
+
+    $unregisterTerminalObserver(id: string): void {
+        const observer = this.observers.get(id);
+        if (observer) {
+            observer.disposables.dispose();
+            this.observers.delete(id);
+        } else {
+            throw new Error(`Unregistering unknown terminal observer: ${id}`);
+        }
+    }
+
     async provideLinks(line: string, terminal: TerminalWidget, cancellationToken?: CancellationToken | undefined): Promise<TerminalLink[]> {
         if (this.terminalLinkProviders.length < 1) {
             return [];

package/src/main/browser/text-editors-main.ts

@@ -28,6 +28,7 @@ import {
     ThemeDecorationInstanceRenderOptions,
     DecorationOptions,
     WorkspaceEditDto,
+    WorkspaceNotebookCellEditDto,
     DocumentsMain,
     WorkspaceEditMetadataDto,
 } from '../../common/plugin-api-rpc';
@@ -46,7 +47,10 @@ import { ResourceEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/se
 import { IDecorationRenderOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/editorCommon';
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { URI } from '@theia/core';
+import { ArrayUtils, URI } from '@theia/core';
+import { toNotebookWorspaceEdit } from './notebooks/notebooks-main';
+import { interfaces } from '@theia/core/shared/inversify';
+import { NotebookService } from '@theia/notebook/lib/browser';
 
 export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
@@ -55,13 +59,20 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
     private readonly editorsToDispose = new Map<string, DisposableCollection>();
     private readonly fileEndpoint = new Endpoint({ path: 'file' }).getRestUrl();
 
+    private readonly bulkEditService: MonacoBulkEditService;
+    private readonly notebookService: NotebookService;
+
     constructor(
         private readonly editorsAndDocuments: EditorsAndDocumentsMain,
         private readonly documents: DocumentsMain,
         rpc: RPCProtocol,
-        private readonly bulkEditService: MonacoBulkEditService,
+        container: interfaces.Container
     ) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.TEXT_EDITORS_EXT);
+
+        this.bulkEditService = container.get(MonacoBulkEditService);
+        this.notebookService = container.get(NotebookService);
+
         this.toDispose.push(editorsAndDocuments);
         this.toDispose.push(editorsAndDocuments.onTextEditorAdd(editors => editors.forEach(this.onTextEditorAdd, this)));
         this.toDispose.push(editorsAndDocuments.onTextEditorRemove(editors => editors.forEach(this.onTextEditorRemove, this)));
@@ -128,11 +139,19 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
     }
 
     async $tryApplyWorkspaceEdit(dto: WorkspaceEditDto, metadata?: WorkspaceEditMetadataDto): Promise<boolean> {
-        const workspaceEdit = toMonacoWorkspaceEdit(dto);
+        const [notebookEdits, monacoEdits] = ArrayUtils.partition(dto.edits, edit => WorkspaceNotebookCellEditDto.is(edit));
         try {
-            const edits = ResourceEdit.convert(workspaceEdit);
-            const { isApplied } = await this.bulkEditService.apply(edits, { respectAutoSaveConfig: metadata?.isRefactoring });
-            return isApplied;
+            if (notebookEdits.length > 0) {
+                const workspaceEdit = toNotebookWorspaceEdit({ edits: notebookEdits });
+                return this.notebookService.applyWorkspaceEdit(workspaceEdit);
+            }
+            if (monacoEdits.length > 0) {
+                const workspaceEdit = toMonacoWorkspaceEdit({ edits: monacoEdits });
+                const edits = ResourceEdit.convert(workspaceEdit);
+                const { isApplied } = await this.bulkEditService.apply(edits, { respectAutoSaveConfig: metadata?.isRefactoring });
+                return isApplied;
+            }
+            return false;
         } catch {
             return false;
         }