@theia/plugin-ext 1.51.0 → 1.53.0-next.4

package/package.json

@@ -1,37 +1,37 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.51.0",
+  "version": "1.53.0-next.4+9e9124118",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.51.0",
-    "@theia/callhierarchy": "1.51.0",
-    "@theia/console": "1.51.0",
-    "@theia/core": "1.51.0",
-    "@theia/debug": "1.51.0",
-    "@theia/editor": "1.51.0",
-    "@theia/editor-preview": "1.51.0",
-    "@theia/file-search": "1.51.0",
-    "@theia/filesystem": "1.51.0",
-    "@theia/markers": "1.51.0",
-    "@theia/messages": "1.51.0",
-    "@theia/monaco": "1.51.0",
+    "@theia/bulk-edit": "1.53.0-next.4+9e9124118",
+    "@theia/callhierarchy": "1.53.0-next.4+9e9124118",
+    "@theia/console": "1.53.0-next.4+9e9124118",
+    "@theia/core": "1.53.0-next.4+9e9124118",
+    "@theia/debug": "1.53.0-next.4+9e9124118",
+    "@theia/editor": "1.53.0-next.4+9e9124118",
+    "@theia/editor-preview": "1.53.0-next.4+9e9124118",
+    "@theia/file-search": "1.53.0-next.4+9e9124118",
+    "@theia/filesystem": "1.53.0-next.4+9e9124118",
+    "@theia/markers": "1.53.0-next.4+9e9124118",
+    "@theia/messages": "1.53.0-next.4+9e9124118",
+    "@theia/monaco": "1.53.0-next.4+9e9124118",
     "@theia/monaco-editor-core": "1.83.101",
-    "@theia/navigator": "1.51.0",
-    "@theia/notebook": "1.51.0",
-    "@theia/output": "1.51.0",
-    "@theia/plugin": "1.51.0",
-    "@theia/preferences": "1.51.0",
-    "@theia/scm": "1.51.0",
-    "@theia/search-in-workspace": "1.51.0",
-    "@theia/task": "1.51.0",
-    "@theia/terminal": "1.51.0",
-    "@theia/test": "1.51.0",
-    "@theia/timeline": "1.51.0",
-    "@theia/typehierarchy": "1.51.0",
-    "@theia/variable-resolver": "1.51.0",
-    "@theia/workspace": "1.51.0",
+    "@theia/navigator": "1.53.0-next.4+9e9124118",
+    "@theia/notebook": "1.53.0-next.4+9e9124118",
+    "@theia/output": "1.53.0-next.4+9e9124118",
+    "@theia/plugin": "1.53.0-next.4+9e9124118",
+    "@theia/preferences": "1.53.0-next.4+9e9124118",
+    "@theia/scm": "1.53.0-next.4+9e9124118",
+    "@theia/search-in-workspace": "1.53.0-next.4+9e9124118",
+    "@theia/task": "1.53.0-next.4+9e9124118",
+    "@theia/terminal": "1.53.0-next.4+9e9124118",
+    "@theia/test": "1.53.0-next.4+9e9124118",
+    "@theia/timeline": "1.53.0-next.4+9e9124118",
+    "@theia/typehierarchy": "1.53.0-next.4+9e9124118",
+    "@theia/variable-resolver": "1.53.0-next.4+9e9124118",
+    "@theia/workspace": "1.53.0-next.4+9e9124118",
     "@types/mime": "^2.0.1",
     "@vscode/debugprotocol": "^1.51.0",
     "@vscode/proxy-agent": "^0.13.2",
@@ -88,7 +88,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.51.0",
+    "@theia/ext-scripts": "1.52.0",
     "@types/decompress": "^4.2.2",
     "@types/escape-html": "^0.0.20",
     "@types/lodash.clonedeep": "^4.5.3",
@@ -97,5 +97,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "fe70ec5d445d733038564d81357c78aedf5c7e0e"
+  "gitHead": "9e912411843f32b2a549ef6580b07872edd95e8b"
 }

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

@@ -895,3 +895,13 @@ export interface InlineCompletionsProvider<T extends InlineCompletions = InlineC
     freeInlineCompletions(completions: T): void;
 }
 
+export interface DebugStackFrameDTO {
+    readonly sessionId: string,
+    readonly frameId: number,
+    readonly threadId: number
+}
+
+export interface DebugThreadDTO {
+    readonly sessionId: string,
+    readonly threadId: number
+}

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

@@ -89,7 +89,9 @@ import {
     InlineCompletionContext,
     DocumentDropEdit,
     DataTransferDTO,
-    DocumentDropEditProviderMetadata
+    DocumentDropEditProviderMetadata,
+    DebugStackFrameDTO,
+    DebugThreadDTO
 } from './plugin-api-rpc-model';
 import { ExtPluginApi } from './plugin-ext-api-contribution';
 import { KeysToAnyValues, KeysToKeysToAnyValue } from './types';
@@ -339,7 +341,7 @@ export interface TerminalServiceMain {
      * Create new Terminal with Terminal options.
      * @param options - object with parameters to create new terminal.
      */
-    $createTerminal(id: string, options: theia.TerminalOptions, parentId?: string, isPseudoTerminal?: boolean): Promise<string>;
+    $createTerminal(id: string, options: TerminalOptions, parentId?: string, isPseudoTerminal?: boolean): Promise<string>;
 
     /**
      * Send text to the terminal by id.
@@ -469,6 +471,10 @@ export interface TerminalServiceMain {
     $unregisterTerminalObserver(id: string): unknown;
 }
 
+export interface TerminalOptions extends theia.TerminalOptions {
+    iconUrl?: string | { light: string; dark: string } | ThemeIcon;
+}
+
 export interface AutoFocus {
     autoFocusFirstEntry?: boolean;
     // TODO
@@ -524,10 +530,10 @@ export interface QuickOpenExt {
     $onDidChangeSelection(sessionId: number, handles: number[]): void;
 
     /* eslint-disable max-len */
-    showQuickPick(itemsOrItemsPromise: Array<theia.QuickPickItem> | Promise<Array<theia.QuickPickItem>>, options: theia.QuickPickOptions & { canPickMany: true; },
+    showQuickPick(plugin: Plugin, itemsOrItemsPromise: Array<theia.QuickPickItem> | Promise<Array<theia.QuickPickItem>>, options: theia.QuickPickOptions & { canPickMany: true; },
         token?: theia.CancellationToken): Promise<Array<theia.QuickPickItem> | undefined>;
-    showQuickPick(itemsOrItemsPromise: string[] | Promise<string[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<string | undefined>;
-    showQuickPick(itemsOrItemsPromise: Array<theia.QuickPickItem> | Promise<Array<theia.QuickPickItem>>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<theia.QuickPickItem | undefined>;
+    showQuickPick(plugin: Plugin, itemsOrItemsPromise: string[] | Promise<string[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<string | undefined>;
+    showQuickPick(plugin: Plugin, itemsOrItemsPromise: Array<theia.QuickPickItem> | Promise<Array<theia.QuickPickItem>>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<theia.QuickPickItem | undefined>;
 
     showInput(options?: theia.InputBoxOptions, token?: theia.CancellationToken): PromiseLike<string | undefined>;
     // showWorkspaceFolderPick(options?: theia.WorkspaceFolderPickOptions, token?: theia.CancellationToken): Promise<theia.WorkspaceFolder | undefined>
@@ -651,7 +657,7 @@ export interface TransferQuickPickItem {
     handle: number;
     kind: 'item' | 'separator',
     label: string;
-    iconPath?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
+    iconUrl?: string | { light: string; dark: string } | ThemeIcon;
     description?: string;
     detail?: string;
     picked?: boolean;
@@ -675,7 +681,7 @@ export interface TransferQuickPickOptions<T extends TransferQuickPickItem> {
 
 export interface TransferQuickInputButton {
     handle?: number;
-    readonly iconPath: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
+    readonly iconUrl?: string | { light: string; dark: string } | ThemeIcon;
     readonly tooltip?: string | undefined;
 }
 
@@ -1514,12 +1520,10 @@ export interface WorkspaceEditEntryMetadataDto {
     needsConfirmation: boolean;
     label: string;
     description?: string;
-    iconPath?: {
-        id: string;
-    } | {
+    iconPath?: ThemeIcon | {
         light: UriComponents;
         dark: UriComponents;
-    } | ThemeIcon;
+    };
 }
 
 export interface WorkspaceFileEditDto {
@@ -1979,6 +1983,8 @@ export interface DebugExt {
         debugConfiguration: DebugConfiguration
     ): Promise<theia.DebugConfiguration | undefined | null>;
 
+    $onDidChangeActiveFrame(frame: DebugStackFrameDTO | undefined): void;
+    $onDidChangeActiveThread(thread: DebugThreadDTO | undefined): void;
     $createDebugSession(debugConfiguration: DebugConfiguration, workspaceFolder: string | undefined): Promise<string>;
     $terminateDebugSession(sessionId: string): Promise<void>;
     $getTerminalCreationOptions(debugType: string): Promise<TerminalOptionsExt | undefined>;

package/src/hosted/browser/worker/worker-main.ts

@@ -45,7 +45,7 @@ const pluginsModulesNames = new Map<string, Plugin>();
 const scripts = new Set<string>();
 
 function initialize(contextPath: string, pluginMetadata: PluginMetadata): void {
-    const path = '/context/' + contextPath;
+    const path = './context/' + contextPath;
 
     if (!scripts.has(path)) {
         ctx.importScripts(path);
@@ -70,7 +70,7 @@ pluginManager.setPluginHost({
                         ctx.frontendModuleName = plugin.lifecycle.frontendModuleName;
                     }
 
-                    ctx.importScripts('/hostedPlugin/' + getPluginId(plugin.model) + '/' + plugin.pluginPath);
+                    ctx.importScripts('./hostedPlugin/' + getPluginId(plugin.model) + '/' + plugin.pluginPath);
                 }
             }
 

package/src/hosted/node/hosted-plugin-process.ts

@@ -149,13 +149,13 @@ export class HostedPluginProcess implements ServerPluginRunner {
         }
     }
 
-    public runPluginServer(): void {
+    public runPluginServer(serverName?: string): void {
         if (this.childProcess) {
             this.terminatePluginServer();
         }
         this.terminatingPluginServer = false;
         this.childProcess = this.fork({
-            serverName: 'hosted-plugin',
+            serverName: serverName ?? 'hosted-plugin',
             logger: this.logger,
             args: []
         });

package/src/hosted/node/hosted-plugin.ts

@@ -85,9 +85,9 @@ export class HostedPluginSupport {
         }
     }
 
-    runPluginServer(): void {
+    runPluginServer(serverName?: string): void {
         if (!this.isPluginProcessRunning) {
-            this.hostedPluginProcess.runPluginServer();
+            this.hostedPluginProcess.runPluginServer(serverName);
             this.isPluginProcessRunning = true;
         }
     }

package/src/hosted/node/plugin-service.ts

@@ -59,6 +59,7 @@ export class HostedPluginServerImpl implements HostedPluginServer {
     protected toDispose = new DisposableCollection();
 
     protected _ignoredPlugins?: Set<PluginIdentifiers.VersionedId>;
+
     // We ignore any plugins that are marked as uninstalled the first time the frontend requests information about deployed plugins.
     protected get ignoredPlugins(): Set<PluginIdentifiers.VersionedId> {
         if (!this._ignoredPlugins) {
@@ -96,6 +97,10 @@ export class HostedPluginServerImpl implements HostedPluginServer {
         ]);
     }
 
+    protected getServerName(): string {
+        return 'hosted-plugin';
+    }
+
     dispose(): void {
         this.toDispose.dispose();
     }
@@ -109,7 +114,7 @@ export class HostedPluginServerImpl implements HostedPluginServer {
         const backendPlugins = (await this.deployerHandler.getDeployedBackendPlugins())
             .filter(this.backendPluginHostableFilter);
         if (backendPlugins.length > 0) {
-            this.hostedPlugin.runPluginServer();
+            this.hostedPlugin.runPluginServer(this.getServerName());
         }
         const plugins = new Set<PluginIdentifiers.VersionedId>();
         const addIds = async (identifiers: PluginIdentifiers.VersionedId[]): Promise<void> => {

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

@@ -196,6 +196,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 for (const c of configurations) {
                     const config = this.readConfiguration(c, rawPlugin.packagePath);
                     if (config) {
+                        Object.values(config.properties).forEach(property => property.title = config.title);
                         contributions.configuration.push(config);
                     }
                 }

package/src/main/browser/custom-editors/custom-editor-undo-redo-handler.ts

@@ -0,0 +1,41 @@
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ApplicationShell, UndoRedoHandler } from '@theia/core/lib/browser';
+import { CustomEditorWidget } from './custom-editor-widget';
+
+@injectable()
+export class CustomEditorUndoRedoHandler implements UndoRedoHandler<CustomEditorWidget> {
+
+    @inject(ApplicationShell)
+    protected readonly applicationShell: ApplicationShell;
+
+    priority = 190;
+    select(): CustomEditorWidget | undefined {
+        const current = this.applicationShell.currentWidget;
+        if (current instanceof CustomEditorWidget) {
+            return current;
+        }
+        return undefined;
+    }
+    undo(item: CustomEditorWidget): void {
+        item.undo();
+    }
+    redo(item: CustomEditorWidget): void {
+        item.redo();
+    }
+}

package/src/main/browser/custom-editors/custom-editor-widget.ts

@@ -21,7 +21,6 @@ import { ApplicationShell, NavigatableWidget, Saveable, SaveableSource, SaveOpti
 import { SaveableService } from '@theia/core/lib/browser/saveable-service';
 import { Reference } from '@theia/core/lib/common/reference';
 import { WebviewWidget } from '../webview/webview';
-import { UndoRedoService } from '@theia/editor/lib/browser/undo-redo-service';
 import { CustomEditorModel } from './custom-editors-main';
 
 @injectable()
@@ -43,9 +42,6 @@ export class CustomEditorWidget extends WebviewWidget implements SaveableSource,
         return this._modelRef.object;
     }
 
-    @inject(UndoRedoService)
-    protected readonly undoRedoService: UndoRedoService;
-
     @inject(ApplicationShell)
     protected readonly shell: ApplicationShell;
 
@@ -64,11 +60,11 @@ export class CustomEditorWidget extends WebviewWidget implements SaveableSource,
     }
 
     undo(): void {
-        this.undoRedoService.undo(this.resource);
+        this._modelRef.object.undo();
     }
 
     redo(): void {
-        this.undoRedoService.redo(this.resource);
+        this._modelRef.object.redo();
     }
 
     async save(options?: SaveOptions): Promise<void> {

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

@@ -284,6 +284,9 @@ export interface CustomEditorModel extends Saveable, Disposable {
     revert(options?: Saveable.RevertOptions): Promise<void>;
     saveCustomEditor(options?: SaveOptions): Promise<void>;
     saveCustomEditorAs(resource: TheiaURI, targetResource: TheiaURI, options?: SaveOptions): Promise<void>;
+
+    undo(): void;
+    redo(): void;
 }
 
 export class MainCustomEditorModel implements CustomEditorModel {
@@ -436,7 +439,7 @@ export class MainCustomEditorModel implements CustomEditorModel {
         }
     }
 
-    private async undo(): Promise<void> {
+    async undo(): Promise<void> {
         if (!this.editable) {
             return;
         }
@@ -453,7 +456,7 @@ export class MainCustomEditorModel implements CustomEditorModel {
         await this.proxy.$undo(this.resource, this.viewType, undoneEdit, this.dirty);
     }
 
-    private async redo(): Promise<void> {
+    async redo(): Promise<void> {
         if (!this.editable) {
             return;
         }
@@ -571,4 +574,12 @@ export class CustomTextEditorModel implements CustomEditorModel {
         await this.saveCustomEditor(options);
         await this.fileService.copy(resource, targetResource, { overwrite: false });
     }
+
+    undo(): void {
+        this.editorTextModel.undo();
+    }
+
+    redo(): void {
+        this.editorTextModel.redo();
+    }
 }

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

@@ -25,7 +25,7 @@ import {
     MAIN_RPC_CONTEXT
 } from '../../../common/plugin-api-rpc';
 import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
-import { Breakpoint, WorkspaceFolder } from '../../../common/plugin-api-rpc-model';
+import { Breakpoint, DebugStackFrameDTO, DebugThreadDTO, WorkspaceFolder } from '../../../common/plugin-api-rpc-model';
 import { LabelProvider } from '@theia/core/lib/browser';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { BreakpointManager, BreakpointsChangeEvent } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
@@ -56,6 +56,9 @@ import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
 import { ConnectionImpl } from '../../../common/connection';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { DebugSessionOptions as TheiaDebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
+import { DebugStackFrame } from '@theia/debug/lib/browser/model/debug-stack-frame';
+import { DebugThread } from '@theia/debug/lib/browser/model/debug-thread';
+import { TestService } from '@theia/test/lib/browser/test-service';
 
 export class DebugMainImpl implements DebugMain, Disposable {
     private readonly debugExt: DebugExt;
@@ -75,6 +78,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
     private readonly fileService: FileService;
     private readonly pluginService: HostedPluginSupport;
     private readonly debugContributionProvider: ContributionProvider<DebugContribution>;
+    private readonly testService: TestService;
     private readonly workspaceService: WorkspaceService;
 
     private readonly debuggerContributions = new Map<string, DisposableCollection>();
@@ -98,6 +102,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
         this.debugContributionProvider = container.getNamed(ContributionProvider, DebugContribution);
         this.fileService = container.get(FileService);
         this.pluginService = container.get(HostedPluginSupport);
+        this.testService = container.get(TestService);
         this.workspaceService = container.get(WorkspaceService);
 
         const fireDidChangeBreakpoints = ({ added, removed, changed }: BreakpointsChangeEvent<SourceBreakpoint | FunctionBreakpoint>) => {
@@ -117,7 +122,9 @@ export class DebugMainImpl implements DebugMain, Disposable {
             this.sessionManager.onDidStartDebugSession(debugSession => this.debugExt.$sessionDidStart(debugSession.id)),
             this.sessionManager.onDidDestroyDebugSession(debugSession => this.debugExt.$sessionDidDestroy(debugSession.id)),
             this.sessionManager.onDidChangeActiveDebugSession(event => this.debugExt.$sessionDidChange(event.current && event.current.id)),
-            this.sessionManager.onDidReceiveDebugSessionCustomEvent(event => this.debugExt.$onSessionCustomEvent(event.session.id, event.event, event.body))
+            this.sessionManager.onDidReceiveDebugSessionCustomEvent(event => this.debugExt.$onSessionCustomEvent(event.session.id, event.event, event.body)),
+            this.sessionManager.onDidFocusStackFrame(stackFrame => this.debugExt.$onDidChangeActiveFrame(this.toDebugStackFrameDTO(stackFrame))),
+            this.sessionManager.onDidFocusThread(debugThread => this.debugExt.$onDidChangeActiveThread(this.toDebugThreadDTO(debugThread))),
         ]);
     }
 
@@ -161,6 +168,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
             this.fileService,
             terminalOptionsExt,
             this.debugContributionProvider,
+            this.testService,
             this.workspaceService,
         );
 
@@ -323,6 +331,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
         } else {
             sessionOptions = { ...sessionOptions, ...options, workspaceFolderUri };
         }
+        sessionOptions.testRun = options.testRun;
 
         // start options
         const session = await this.sessionManager.start(sessionOptions);
@@ -340,6 +349,21 @@ export class DebugMainImpl implements DebugMain, Disposable {
         }
     }
 
+    private toDebugStackFrameDTO(stackFrame: DebugStackFrame | undefined): DebugStackFrameDTO | undefined {
+        return stackFrame ? {
+            sessionId: stackFrame.session.id,
+            frameId: stackFrame.frameId,
+            threadId: stackFrame.thread.threadId
+        } : undefined;
+    }
+
+    private toDebugThreadDTO(debugThread: DebugThread | undefined): DebugThreadDTO | undefined {
+        return debugThread ? {
+            sessionId: debugThread.session.id,
+            threadId: debugThread.threadId
+        } : undefined;
+    }
+
     private toTheiaPluginApiBreakpoints(breakpoints: (SourceBreakpoint | FunctionBreakpoint)[]): Breakpoint[] {
         return breakpoints.map(b => this.toTheiaPluginApiBreakpoint(b));
     }

package/src/main/browser/debug/plugin-debug-session-factory.ts

@@ -22,7 +22,7 @@ import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
 import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences';
-import { DebugConfigurationSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
+import { DebugConfigurationSessionOptions, TestRunReference } from '@theia/debug/lib/browser/debug-session-options';
 import { DebugSession } from '@theia/debug/lib/browser/debug-session';
 import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
 import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
@@ -32,12 +32,17 @@ import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
 import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { PluginChannel } from '../../../common/connection';
+import { TestService } from '@theia/test/lib/browser/test-service';
+import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
 
 export class PluginDebugSession extends DebugSession {
     constructor(
         override readonly id: string,
         override readonly options: DebugConfigurationSessionOptions,
         override readonly parentSession: DebugSession | undefined,
+        testService: TestService,
+        testRun: TestRunReference | undefined,
+        sessionManager: DebugSessionManager,
         protected override readonly connection: DebugSessionConnection,
         protected override readonly terminalServer: TerminalService,
         protected override readonly editorManager: EditorManager,
@@ -48,7 +53,8 @@ export class PluginDebugSession extends DebugSession {
         protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
         protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
         protected override readonly workspaceService: WorkspaceService) {
-        super(id, options, parentSession, connection, terminalServer, editorManager, breakpoints, labelProvider, messages, fileService, debugContributionProvider,
+        super(id, options, parentSession, testService, testRun, sessionManager, connection, terminalServer, editorManager, breakpoints,
+            labelProvider, messages, fileService, debugContributionProvider,
             workspaceService);
     }
 
@@ -75,12 +81,13 @@ export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
         protected override readonly fileService: FileService,
         protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
         protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
+        protected override readonly testService: TestService,
         protected override readonly workspaceService: WorkspaceService,
     ) {
         super();
     }
 
-    override get(sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
+    override get(manager: DebugSessionManager, sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
         const connection = new DebugSessionConnection(
             sessionId,
             this.connectionFactory,
@@ -90,6 +97,9 @@ export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
             sessionId,
             options,
             parentSession,
+            this.testService,
+            options.testRun,
+            manager,
             connection,
             this.terminalService,
             this.editorManager,

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

@@ -21,7 +21,8 @@ import '../../../src/main/browser/style/comments.css';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import {
     FrontendApplicationContribution, WidgetFactory, bindViewContribution,
-    ViewContainerIdentifier, ViewContainer, createTreeContainer, TreeWidget, LabelProviderContribution
+    ViewContainerIdentifier, ViewContainer, createTreeContainer, TreeWidget, LabelProviderContribution,
+    UndoRedoHandler
 } from '@theia/core/lib/browser';
 import { MaybePromise, CommandContribution, ResourceResolver, bindContributionProvider } from '@theia/core/lib/common';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging';
@@ -66,7 +67,6 @@ import { CommentsService, PluginCommentService } from './comments/comments-servi
 import { CommentingRangeDecorator } from './comments/comments-decorator';
 import { CommentsContribution } from './comments/comments-contribution';
 import { CommentsContextKeyService } from './comments/comments-context-key-service';
-import { CustomEditorContribution } from './custom-editors/custom-editor-contribution';
 import { PluginCustomEditorRegistry } from './custom-editors/plugin-custom-editor-registry';
 import { CustomEditorWidgetFactory } from '../browser/custom-editors/custom-editor-widget-factory';
 import { CustomEditorWidget } from './custom-editors/custom-editor-widget';
@@ -90,6 +90,7 @@ import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebo
 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';
+import { CustomEditorUndoRedoHandler } from './custom-editors/custom-editor-undo-redo-handler';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
@@ -191,14 +192,13 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(FrontendApplicationContribution).toService(WebviewSecondaryWindowSupport);
     bind(FrontendApplicationContribution).toService(WebviewContextKeys);
 
-    bind(CustomEditorContribution).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(CustomEditorContribution);
-
     bind(PluginCustomEditorRegistry).toSelf().inSingletonScope();
     bind(CustomEditorService).toSelf().inSingletonScope();
     bind(CustomEditorWidget).toSelf();
     bind(CustomEditorWidgetFactory).toDynamicValue(ctx => new CustomEditorWidgetFactory(ctx.container)).inSingletonScope();
     bind(WidgetFactory).toService(CustomEditorWidgetFactory);
+    bind(CustomEditorUndoRedoHandler).toSelf().inSingletonScope();
+    bind(UndoRedoHandler).toService(CustomEditorUndoRedoHandler);
 
     bind(PluginViewWidget).toSelf();
     bind(WidgetFactory).toDynamicValue(({ container }) => ({