@theia/plugin-ext 1.18.0 → 1.21.0-next.12

package/src/plugin/languages/call-hierarchy.ts

@@ -29,7 +29,9 @@ export class CallHierarchyAdapter {
         private readonly documents: DocumentsExtImpl
     ) { }
 
-    async provideRootDefinition(resource: URI, position: rpc.Position, token: theia.CancellationToken): Promise<model.CallHierarchyDefinition | undefined> {
+    async provideRootDefinition(
+        resource: URI, position: rpc.Position, token: theia.CancellationToken
+    ): Promise<model.CallHierarchyDefinition | model.CallHierarchyDefinition[] | undefined> {
         const documentData = this.documents.getDocumentData(resource);
         if (!documentData) {
             return Promise.reject(new Error(`There is no document for ${resource}`));
@@ -40,12 +42,14 @@ export class CallHierarchyAdapter {
                 position.lineNumber,
                 position.column
             ),
-            token);
+            token
+        );
+
         if (!definition) {
             return undefined;
         }
 
-        return this.fromCallHierarchyItem(definition);
+        return Array.isArray(definition) ? definition.map(item => this.fromCallHierarchyItem(item)) : this.fromCallHierarchyItem(definition);
     }
 
     async provideCallers(definition: model.CallHierarchyDefinition, token: theia.CancellationToken): Promise<model.CallHierarchyReference[] | undefined> {
@@ -73,7 +77,8 @@ export class CallHierarchyAdapter {
             selectionRange: this.fromRange(item.selectionRange),
             name: item.name,
             kind: item.kind,
-            tags: item.tags
+            tags: item.tags,
+            data: item.data,
         };
     }
 
@@ -96,7 +101,7 @@ export class CallHierarchyAdapter {
     }
 
     private toCallHierarchyItem(definition: model.CallHierarchyDefinition): theia.CallHierarchyItem {
-        return new types.CallHierarchyItem(
+        const item = new types.CallHierarchyItem(
             Converter.SymbolKind.toSymbolKind(definition.kind),
             definition.name,
             definition.detail ? definition.detail : '',
@@ -104,6 +109,9 @@ export class CallHierarchyAdapter {
             this.toRange(definition.range),
             this.toRange(definition.selectionRange),
         );
+        item.tags = definition.tags;
+        item.data = definition.data;
+        return item;
     }
 
     private fromCallHierarchyIncomingCall(caller: theia.CallHierarchyIncomingCall): model.CallHierarchyReference {

package/src/plugin/languages/rename.ts

@@ -19,8 +19,7 @@ import * as theia from '@theia/plugin';
 import * as Converter from '../type-converters';
 import * as model from '../../common/plugin-api-rpc-model';
 import { DocumentsExtImpl } from '../documents';
-import { WorkspaceEditDto } from '../../common/plugin-api-rpc';
-import { Position } from '../../common/plugin-api-rpc';
+import { Position, WorkspaceEditDto } from '../../common/plugin-api-rpc';
 import { Range } from '../types-impl';
 import { isObject } from '../../common/types';
 

package/src/plugin/languages.ts

@@ -583,7 +583,9 @@ export class LanguagesExtImpl implements LanguagesExt {
         return this.createDisposable(callId);
     }
 
-    $provideRootDefinition(handle: number, resource: UriComponents, location: Position, token: theia.CancellationToken): Promise<CallHierarchyDefinition | undefined> {
+    $provideRootDefinition(
+        handle: number, resource: UriComponents, location: Position, token: theia.CancellationToken
+    ): Promise<CallHierarchyDefinition | CallHierarchyDefinition[] | undefined> {
         return this.withAdapter(handle, CallHierarchyAdapter, adapter => adapter.provideRootDefinition(URI.revive(resource), location, token), undefined);
     }
 

package/src/plugin/message-registry.ts

@@ -50,6 +50,9 @@ export class MessageRegistryExt {
             } else {
                 if ('modal' in optionsOrFirstItem) {
                     options.modal = optionsOrFirstItem.modal;
+                    if ('detail' in optionsOrFirstItem) {
+                        options.detail = optionsOrFirstItem.detail;
+                    }
                 }
             }
         }
@@ -59,5 +62,4 @@ export class MessageRegistryExt {
         const actionHandle = await this.proxy.$showMessage(type, message, options, actions);
         return actionHandle !== undefined ? items[actionHandle] : undefined;
     }
-
 }

package/src/plugin/node/debug/debug.ts

@@ -15,22 +15,24 @@
  ********************************************************************************/
 import { Emitter } from '@theia/core/lib/common/event';
 import { Path } from '@theia/core/lib/common/path';
-import { CommunicationProvider } from '@theia/debug/lib/common/debug-model';
 import * as theia from '@theia/plugin';
 import { URI } from '@theia/core/shared/vscode-uri';
 import { Breakpoint } from '../../../common/plugin-api-rpc-model';
 import { DebugConfigurationProviderTriggerKind, DebugExt, DebugMain, PLUGIN_RPC_CONTEXT as Ext, TerminalOptionsExt } from '../../../common/plugin-api-rpc';
 import { PluginPackageDebuggersContribution } from '../../../common/plugin-protocol';
 import { RPCProtocol } from '../../../common/rpc-protocol';
-import { PluginWebSocketChannel } from '../../../common/connection';
 import { CommandRegistryImpl } from '../../command-registry';
-import { ConnectionExtImpl } from '../../connection-ext';
-import { Disposable, Breakpoint as BreakpointExt, SourceBreakpoint, FunctionBreakpoint, Location, Range } from '../../types-impl';
+import { ConnectionImpl } from '../../../common/connection';
+import {
+    Disposable, Breakpoint as BreakpointExt, SourceBreakpoint, FunctionBreakpoint, Location, Range,
+    DebugAdapterServer, DebugAdapterExecutable, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation
+} from '../../types-impl';
 import { resolveDebugAdapterExecutable } from './plugin-debug-adapter-executable-resolver';
 import { PluginDebugAdapterSession } from './plugin-debug-adapter-session';
-import { connectDebugAdapter, startDebugAdapter } from './plugin-debug-adapter-starter';
+import { connectInlineDebugAdapter, connectPipeDebugAdapter, connectSocketDebugAdapter, startDebugAdapter } from './plugin-debug-adapter-starter';
 import { PluginDebugAdapterTracker } from './plugin-debug-adapter-tracker';
 import uuid = require('uuid');
+import { DebugAdapter } from '@theia/debug/lib/node/debug-model';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -57,7 +59,7 @@ export class DebugExtImpl implements DebugExt {
     private trackerFactories: [string, theia.DebugAdapterTrackerFactory][] = [];
     private contributionPaths = new Map<string, string>();
 
-    private connectionExt: ConnectionExtImpl;
+    private connectionExt: ConnectionImpl;
     private commandRegistryExt: CommandRegistryImpl;
 
     private proxy: DebugMain;
@@ -88,7 +90,7 @@ export class DebugExtImpl implements DebugExt {
     /**
      * Sets dependencies.
      */
-    assistedInject(connectionExt: ConnectionExtImpl, commandRegistryExt: CommandRegistryImpl): void {
+    assistedInject(connectionExt: ConnectionImpl, commandRegistryExt: CommandRegistryImpl): void {
         this.connectionExt = connectionExt;
         this.commandRegistryExt = commandRegistryExt;
     }
@@ -298,13 +300,13 @@ export class DebugExtImpl implements DebugExt {
         };
 
         const tracker = await this.createDebugAdapterTracker(theiaSession);
-        const communicationProvider = await this.createCommunicationProvider(theiaSession, debugConfiguration);
+        const communicationProvider = await this.createDebugAdapter(theiaSession, debugConfiguration);
 
         const debugAdapterSession = new PluginDebugAdapterSession(communicationProvider, tracker, theiaSession);
         this.sessions.set(sessionId, debugAdapterSession);
 
         const connection = await this.connectionExt!.ensureConnection(sessionId);
-        debugAdapterSession.start(new PluginWebSocketChannel(connection));
+        debugAdapterSession.start(connection);
 
         return sessionId;
     }
@@ -403,7 +405,7 @@ export class DebugExtImpl implements DebugExt {
         return PluginDebugAdapterTracker.create(session, this.trackerFactories);
     }
 
-    protected async createCommunicationProvider(session: theia.DebugSession, debugConfiguration: theia.DebugConfiguration): Promise<CommunicationProvider> {
+    protected async createDebugAdapter(session: theia.DebugSession, debugConfiguration: theia.DebugConfiguration): Promise<DebugAdapter> {
         const executable = await this.resolveDebugAdapterExecutable(debugConfiguration);
         const descriptorFactory = this.descriptorFactories.get(session.type);
         if (descriptorFactory) {
@@ -423,16 +425,20 @@ export class DebugExtImpl implements DebugExt {
             //  @param executable The debug adapter's executable information as specified in the package.json (or undefined if no such information exists).
             const descriptor = await descriptorFactory.createDebugAdapterDescriptor(session, executable);
             if (descriptor) {
-                if ('port' in descriptor) {
-                    return connectDebugAdapter(descriptor);
-                } else {
+                if (DebugAdapterServer.is(descriptor)) {
+                    return connectSocketDebugAdapter(descriptor);
+                } else if (DebugAdapterExecutable.is(descriptor)) {
                     return startDebugAdapter(descriptor);
+                } else if (DebugAdapterNamedPipeServer.is(descriptor)) {
+                    return connectPipeDebugAdapter(descriptor);
+                } else if (DebugAdapterInlineImplementation.is(descriptor)) {
+                    return connectInlineDebugAdapter(descriptor);
                 }
             }
         }
 
         if ('debugServer' in debugConfiguration) {
-            return connectDebugAdapter({ port: debugConfiguration.debugServer });
+            return connectSocketDebugAdapter({ port: debugConfiguration.debugServer });
         } else {
             if (!executable) {
                 throw new Error('It is not possible to provide debug adapter executable.');

package/src/plugin/node/debug/plugin-debug-adapter-session.ts

@@ -14,34 +14,34 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { CommunicationProvider } from '@theia/debug/lib/common/debug-model';
 import { DebugAdapterSessionImpl } from '@theia/debug/lib/node/debug-adapter-session';
 import * as theia from '@theia/plugin';
-import { IWebSocket } from '@theia/core/shared/vscode-ws-jsonrpc';
+import { DebugAdapter } from '@theia/debug/lib/node/debug-model';
+import { Channel } from '@theia/debug/lib/common/debug-service';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /**
  * Server debug adapter session.
  */
-export class PluginDebugAdapterSession extends DebugAdapterSessionImpl implements theia.DebugSession {
+export class PluginDebugAdapterSession extends DebugAdapterSessionImpl {
     readonly type: string;
     readonly name: string;
     readonly configuration: theia.DebugConfiguration;
 
     constructor(
-        protected readonly communicationProvider: CommunicationProvider,
+        readonly debugAdapter: DebugAdapter,
         protected readonly tracker: theia.DebugAdapterTracker,
         protected readonly theiaSession: theia.DebugSession) {
 
-        super(theiaSession.id, communicationProvider);
+        super(theiaSession.id, debugAdapter);
 
         this.type = theiaSession.type;
         this.name = theiaSession.name;
         this.configuration = theiaSession.configuration;
     }
 
-    async start(channel: IWebSocket): Promise<void> {
+    async start(channel: Channel): Promise<void> {
         if (this.tracker.onWillStartSession) {
             this.tracker.onWillStartSession();
         }
@@ -83,10 +83,10 @@ export class PluginDebugAdapterSession extends DebugAdapterSessionImpl implement
         super.write(message);
     }
 
-    protected onDebugAdapterExit(exitCode: number, signal: string | undefined): void {
+    protected onDebugAdapterExit(): void {
         if (this.tracker.onExit) {
-            this.tracker.onExit(exitCode, signal);
+            this.tracker.onExit(undefined, undefined);
         }
-        super.onDebugAdapterExit(exitCode, signal);
+        super.onDebugAdapterExit();
     }
 }

package/src/plugin/node/debug/plugin-debug-adapter-starter.ts

@@ -15,15 +15,17 @@
  ********************************************************************************/
 
 import * as net from 'net';
-import * as theia from '@theia/plugin';
-import { CommunicationProvider } from '@theia/debug/lib/common/debug-model';
 import { ChildProcess, spawn, fork, ForkOptions } from 'child_process';
+import { DebugAdapter } from '@theia/debug/lib/node/debug-model';
+import { DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer } from '../../types-impl';
+import { InlineDebugAdapter } from '@theia/debug/lib/node/inline-debug-adapter';
+import { ProcessDebugAdapter, SocketDebugAdapter } from '@theia/debug/lib/node/stream-debug-adapter';
 const isElectron = require('is-electron');
 
 /**
  * Starts debug adapter process.
  */
-export function startDebugAdapter(executable: theia.DebugAdapterExecutable): CommunicationProvider {
+export function startDebugAdapter(executable: DebugAdapterExecutable): DebugAdapter {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const options: any = { stdio: ['pipe', 'pipe', 2] };
 
@@ -63,21 +65,22 @@ export function startDebugAdapter(executable: theia.DebugAdapterExecutable): Com
         childProcess = spawn(command, args, options);
     }
 
-    return {
-        input: childProcess.stdin!,
-        output: childProcess.stdout!,
-        dispose: () => childProcess.kill()
-    };
+    return new ProcessDebugAdapter(childProcess);
 }
 
 /**
  * Connects to a remote debug server.
  */
-export function connectDebugAdapter(server: theia.DebugAdapterServer): CommunicationProvider {
+export function connectSocketDebugAdapter(server: DebugAdapterServer): SocketDebugAdapter {
     const socket = net.createConnection(server.port, server.host);
-    return {
-        input: socket,
-        output: socket,
-        dispose: () => socket.end()
-    };
+    return new SocketDebugAdapter(socket);
+}
+
+export function connectPipeDebugAdapter(adapter: DebugAdapterNamedPipeServer): SocketDebugAdapter {
+    const socket = net.createConnection(adapter.path);
+    return new SocketDebugAdapter(socket);
+}
+
+export function connectInlineDebugAdapter(adapter: DebugAdapterInlineImplementation): InlineDebugAdapter {
+    return new InlineDebugAdapter(adapter.implementation);
 }

package/src/plugin/plugin-context.ts

@@ -20,7 +20,7 @@
 import type * as theia from '@theia/plugin';
 import { CommandRegistryImpl } from './command-registry';
 import { Emitter } from '@theia/core/lib/common/event';
-import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
+import { CancellationError, CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
 import { QuickOpenExtImpl } from './quick-open';
 import {
     MAIN_RPC_CONTEXT,
@@ -28,7 +28,8 @@ import {
     PluginManager,
     PluginAPIFactory,
     MainMessageType,
-    DebugConfigurationProviderTriggerKind
+    DebugConfigurationProviderTriggerKind,
+    PLUGIN_RPC_CONTEXT
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { MessageRegistryExt } from './message-registry';
@@ -106,6 +107,8 @@ import {
     Task2,
     DebugAdapterExecutable,
     DebugAdapterServer,
+    DebugAdapterNamedPipeServer,
+    DebugAdapterInlineImplementation,
     Breakpoint,
     SourceBreakpoint,
     FunctionBreakpoint,
@@ -151,17 +154,15 @@ import { LanguagesExtImpl } from './languages';
 import { fromDocumentSelector, pluginToPluginInfo, fromGlobPattern } from './type-converters';
 import { DialogsExtImpl } from './dialogs';
 import { NotificationExtImpl } from './notification';
-import { CancellationToken, CancellationError } from '@theia/core/lib/common/cancellation';
 import { score } from '@theia/callhierarchy/lib/common/language-selector';
 import { MarkdownString } from './markdown-string';
 import { TreeViewsExtImpl } from './tree/tree-views';
-import { ConnectionExtImpl } from './connection-ext';
+import { ConnectionImpl } from '../common/connection';
 import { TasksExtImpl } from './tasks/tasks';
 import { DebugExtImpl } from './node/debug/debug';
 import { FileSystemExtImpl } from './file-system-ext-impl';
-import { QuickPick, QuickPickItem, ResourceLabelFormatter } from '@theia/plugin';
+import { QuickPick, QuickPickItem, ResourceLabelFormatter, LineChange } from '@theia/plugin';
 import { ScmExtImpl } from './scm';
-import { LineChange } from '@theia/plugin';
 import { DecorationsExtImpl } from './decorations';
 import { TextEditorExt } from './text-editor';
 import { ClipboardExt } from './clipboard-ext';
@@ -200,7 +201,7 @@ export function createAPIFactory(
     const languagesExt = rpc.set(MAIN_RPC_CONTEXT.LANGUAGES_EXT, new LanguagesExtImpl(rpc, documents, commandRegistry));
     const treeViewsExt = rpc.set(MAIN_RPC_CONTEXT.TREE_VIEWS_EXT, new TreeViewsExtImpl(rpc, commandRegistry));
     const tasksExt = rpc.set(MAIN_RPC_CONTEXT.TASKS_EXT, new TasksExtImpl(rpc, terminalExt));
-    const connectionExt = rpc.set(MAIN_RPC_CONTEXT.CONNECTION_EXT, new ConnectionExtImpl(rpc));
+    const connectionExt = rpc.set(MAIN_RPC_CONTEXT.CONNECTION_EXT, new ConnectionImpl(rpc.getProxy(PLUGIN_RPC_CONTEXT.CONNECTION_MAIN)));
     const fileSystemExt = rpc.set(MAIN_RPC_CONTEXT.FILE_SYSTEM_EXT, new FileSystemExtImpl(rpc, languagesExt));
     const extHostFileSystemEvent = rpc.set(MAIN_RPC_CONTEXT.ExtHostFileSystemEventService, new ExtHostFileSystemEventService(rpc, editorsAndDocumentsExt));
     const scmExt = rpc.set(MAIN_RPC_CONTEXT.SCM_EXT, new ScmExtImpl(rpc, commandRegistry));
@@ -930,6 +931,8 @@ export function createAPIFactory(
             Task2,
             DebugAdapterExecutable,
             DebugAdapterServer,
+            DebugAdapterNamedPipeServer,
+            DebugAdapterInlineImplementation,
             DebugConfigurationProviderTriggerKind,
             Breakpoint,
             SourceBreakpoint,

package/src/plugin/plugin-storage.ts

@@ -16,10 +16,9 @@
 
 import * as theia from '@theia/plugin';
 import { Event, Emitter } from '@theia/core/lib/common/event';
-import { StorageMain, StorageExt } from '../common/plugin-api-rpc';
+import { PLUGIN_RPC_CONTEXT, StorageMain, StorageExt } from '../common/plugin-api-rpc';
 import { KeysToAnyValues, KeysToKeysToAnyValue } from '../common/types';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
 
 export class Memento implements theia.Memento {
 

package/src/plugin/preference-registry.spec.ts

@@ -17,8 +17,7 @@
 import { PreferenceRegistryExtImpl } from './preference-registry';
 import * as chai from 'chai';
 import { WorkspaceExtImpl } from '../plugin/workspace';
-import { RPCProtocol } from '../common/rpc-protocol';
-import { ProxyIdentifier } from '../common/rpc-protocol';
+import { ProxyIdentifier, RPCProtocol } from '../common/rpc-protocol';
 
 const expect = chai.expect;
 

package/src/plugin/quick-open.ts

@@ -30,6 +30,7 @@ import * as path from 'path';
 import { convertToTransferQuickPickItems } from './type-converters';
 import { PluginPackage } from '../common/plugin-protocol';
 import { QuickInputButtonHandle } from '@theia/core/lib/browser';
+import { MaybePromise } from '@theia/core/lib/common/types';
 
 const canceledName = 'Canceled';
 /**
@@ -64,7 +65,7 @@ export function getDarkIconUri(iconPath: URI | { light: URI; dark: URI; }): URI
 export class QuickOpenExtImpl implements QuickOpenExt {
     private proxy: QuickOpenMain;
     private onDidSelectItem: undefined | ((handle: number) => void);
-    private validateInputHandler: (input: string) => Promise<string | null | undefined> | undefined;
+    private validateInputHandler?: (input: string) => MaybePromise<string | null | undefined>;
     private _sessions = new Map<number, QuickInputExt>(); // Each quickinput will have a number so that we know where to fire events
     private _instances = 0;
 
@@ -143,17 +144,13 @@ export class QuickOpenExtImpl implements QuickOpenExt {
     // ---- input
 
     showInput(options?: InputBoxOptions, token: theia.CancellationToken = CancellationToken.None): PromiseLike<string | undefined> {
-        if (options?.validateInput) {
-            this.validateInputHandler = options.validateInput;
-        }
-
+        this.validateInputHandler = options?.validateInput;
         if (!options) { options = { placeHolder: '' }; }
         return this.proxy.$input(options, typeof this.validateInputHandler === 'function', token);
     }
 
     async showInputBox(options: TransferInputBox): Promise<string | undefined> {
-        this.validateInputHandler = options && options.validateInput;
-
+        this.validateInputHandler = typeof options.validateInput === 'function' ? options.validateInput : undefined;
         return this.proxy.$showInputBox(options, typeof this.validateInputHandler === 'function');
     }
 
@@ -259,7 +256,7 @@ export class QuickInputExt implements QuickInput {
     private onDidHideEmitter: Emitter<void>;
     private onDidTriggerButtonEmitter: Emitter<theia.QuickInputButton>;
     private _updateTimeout: any;
-    private _pendingUpdate: TransferQuickInput<any> = { id: this._id };
+    private _pendingUpdate: TransferQuickInput = { id: this._id };
 
     constructor(readonly quickOpen: QuickOpenExtImpl, readonly quickOpenMain: QuickOpenMain, readonly plugin: Plugin, private _onDidDispose: () => void) {
         this.title = undefined;
@@ -613,9 +610,16 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
             this._handlesToItems.set(i, item);
             this._itemsToHandles.set(item, i);
         });
-        items.forEach((item, i) => Object.assign(item, { handle: i }));
         this.update({
-            items
+            items: items.map((item, i) => ({
+                type: item.type,
+                label: item.label,
+                description: item.description,
+                handle: i,
+                detail: item.detail,
+                picked: item.picked,
+                alwaysShow: item.alwaysShow
+            }))
         });
     }
 

package/src/plugin/tasks/tasks.ts

@@ -24,7 +24,7 @@ import {
 import * as theia from '@theia/plugin';
 import * as converter from '../type-converters';
 import { CustomExecution, Disposable } from '../types-impl';
-import { RPCProtocol, ConnectionClosedError } from '../../common/rpc-protocol';
+import { RPCProtocol } from '../../common/rpc-protocol';
 import { TaskProviderAdapter } from './task-provider';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { TerminalServiceExtImpl } from '../terminal-ext';
@@ -49,15 +49,8 @@ export class TasksExtImpl implements TasksExt {
     private readonly onDidExecuteTaskProcess: Emitter<theia.TaskProcessStartEvent> = new Emitter<theia.TaskProcessStartEvent>();
     private readonly onDidTerminateTaskProcess: Emitter<theia.TaskProcessEndEvent> = new Emitter<theia.TaskProcessEndEvent>();
 
-    private disposed = false;
-
     constructor(rpc: RPCProtocol, readonly terminalExt: TerminalServiceExtImpl) {
         this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.TASKS_MAIN);
-        this.fetchTaskExecutions();
-    }
-
-    dispose(): void {
-        this.disposed = true;
     }
 
     get taskExecutions(): ReadonlyArray<theia.TaskExecution> {
@@ -216,16 +209,9 @@ export class TasksExtImpl implements TasksExt {
         });
     }
 
-    private async fetchTaskExecutions(): Promise<void> {
-        try {
-            const taskExecutions = await this.proxy.$taskExecutions();
-            taskExecutions.forEach(execution => this.getTaskExecution(execution));
-        } catch (error) {
-            if (this.disposed && ConnectionClosedError.is(error)) {
-                return;
-            }
-            console.error(`Can not fetch running tasks: ${error}`);
-        }
+    // Initial `this.executions` map with the running tasks from the previous session
+    async $initLoadedTasks(taskExecutions: TaskExecutionDto[]): Promise<void> {
+        taskExecutions.forEach(execution => this.getTaskExecution(execution));
     }
 
     private getTaskExecution(execution: TaskExecutionDto): theia.TaskExecution {

package/src/plugin/timeline.ts

@@ -13,10 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Plugin, TimelineCommandArg, TimelineExt, TimelineMain } from '../common';
+import { Plugin, PLUGIN_RPC_CONTEXT, TimelineCommandArg, TimelineExt, TimelineMain } from '../common';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Disposable, URI } from './types-impl';
-import { PLUGIN_RPC_CONTEXT } from '../common';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { CommandRegistryImpl } from './command-registry';
 import type {

package/src/plugin/type-converters.ts

@@ -26,7 +26,6 @@ import { LanguageFilter, LanguageSelector, RelativePattern } from '@theia/callhi
 import { isMarkdownString, MarkdownString } from './markdown-string';
 import * as types from './types-impl';
 import { UriComponents } from '../common/uri-components';
-import { TaskGroup } from './types-impl';
 import { isReadonlyArray } from '../common/arrays';
 
 const SIDE_GROUP = -2;
@@ -684,18 +683,23 @@ export function fromCallHierarchyItem(item: theia.CallHierarchyItem): model.Call
         uri: item.uri,
         range: fromRange(item.range),
         selectionRange: fromRange(item.selectionRange),
-        tags: item.tags
+        tags: item.tags,
+        data: item.data,
     };
 }
 
 export function toCallHierarchyItem(value: model.CallHierarchyItem): types.CallHierarchyItem {
-    return new types.CallHierarchyItem(
+    const item = new types.CallHierarchyItem(
         SymbolKind.toSymbolKind(value.kind),
         value.name,
         value.detail ? value.detail : '',
         URI.revive(value.uri),
         toRange(value.range),
-        toRange(value.selectionRange));
+        toRange(value.selectionRange),
+    );
+    item.tags = value.tags;
+    item.data = value.data;
+    return item;
 }
 
 export function toCallHierarchyIncomingCall(value: model.CallHierarchyIncomingCall): types.CallHierarchyIncomingCall {
@@ -744,9 +748,9 @@ export function fromTask(task: theia.Task): TaskDto | undefined {
     }
 
     const group = task.group;
-    if (group === TaskGroup.Build) {
+    if (group === types.TaskGroup.Build) {
         taskDto.group = BUILD_GROUP;
-    } else if (group === TaskGroup.Test) {
+    } else if (group === types.TaskGroup.Test) {
         taskDto.group = TEST_GROUP;
     }
 
@@ -833,9 +837,9 @@ export function toTask(taskDto: TaskDto): theia.Task {
 
     if (group) {
         if (group === BUILD_GROUP) {
-            result.group = TaskGroup.Build;
+            result.group = types.TaskGroup.Build;
         } else if (group === TEST_GROUP) {
-            result.group = TaskGroup.Test;
+            result.group = types.TaskGroup.Test;
         }
     }
 

package/src/plugin/types-impl.ts

@@ -2120,6 +2120,12 @@ export class DebugAdapterExecutable {
     }
 }
 
+export namespace DebugAdapterExecutable {
+    export function is(adapter: theia.DebugAdapterDescriptor | undefined): adapter is theia.DebugAdapterExecutable {
+        return !!adapter && 'command' in adapter;
+    }
+}
+
 /**
  * Represents a debug adapter running as a socket based server.
  */
@@ -2145,6 +2151,52 @@ export class DebugAdapterServer {
     }
 }
 
+export namespace DebugAdapterServer {
+    export function is(adapter: theia.DebugAdapterDescriptor | undefined): adapter is DebugAdapterServer {
+        return !!adapter && 'port' in adapter;
+    }
+}
+
+/**
+ * Represents a debug adapter running as a Named Pipe (on Windows)/UNIX Domain Socket (on non-Windows) based server.
+ */
+@es5ClassCompat
+export class DebugAdapterNamedPipeServer {
+    /**
+     * Create a description for a debug adapter running as a Named Pipe (on Windows)/UNIX Domain Socket (on non-Windows) based server.
+     */
+    constructor(readonly path: string) { }
+}
+
+export namespace DebugAdapterNamedPipeServer {
+    export function is(adapter: theia.DebugAdapterDescriptor | undefined): adapter is DebugAdapterNamedPipeServer {
+        return !!adapter && 'path' in adapter;
+    }
+}
+
+/**
+ * A debug adapter descriptor for an inline implementation.
+ */
+@es5ClassCompat
+export class DebugAdapterInlineImplementation {
+    implementation: theia.DebugAdapter;
+
+    /**
+     * Create a descriptor for an inline implementation of a debug adapter.
+     */
+    constructor(impl: theia.DebugAdapter) {
+        this.implementation = impl;
+    }
+}
+
+export namespace DebugAdapterInlineImplementation {
+    export function is(adapter: theia.DebugAdapterDescriptor | undefined): adapter is DebugAdapterInlineImplementation {
+        return !!adapter && 'implementation' in adapter;
+    }
+}
+
+export type DebugAdapterDescriptor = DebugAdapterExecutable | DebugAdapterServer | DebugAdapterNamedPipeServer | DebugAdapterInlineImplementation;
+
 export enum LogLevel {
     Trace = 1,
     Debug = 2,
@@ -2367,6 +2419,7 @@ export class CallHierarchyItem {
     range: Range;
     selectionRange: Range;
     tags?: readonly SymbolTag[];
+    data?: unknown;
 
     constructor(kind: SymbolKind, name: string, detail: string, uri: URI, range: Range, selectionRange: Range) {
         this.kind = kind;