@theia/plugin-ext 1.18.0-next.d3501165 → 1.19.0

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

@@ -193,7 +193,6 @@
             initialScrollProgress: undefined
         };
 
-
         /**
          * @param {HTMLDocument?} document
          * @param {HTMLElement?} body
@@ -477,7 +476,7 @@
                 const newFrame = document.createElement('iframe');
                 newFrame.setAttribute('id', 'pending-frame');
                 newFrame.setAttribute('frameborder', '0');
-                newFrame.setAttribute('sandbox', options.allowScripts ? 'allow-scripts allow-forms allow-same-origin' : 'allow-same-origin');
+                newFrame.setAttribute('sandbox', options.allowScripts ? 'allow-scripts allow-forms allow-same-origin allow-downloads' : 'allow-same-origin');
                 if (host.fakeLoad) {
                     // We should just be able to use srcdoc, but I wasn't
                     // seeing the service worker applying properly.

package/src/main/browser/webview/pre/service-worker.js

@@ -248,7 +248,7 @@ async function processLocalhostRequest(event, requestUrl) {
     const origin = requestUrl.origin;
 
     const resolveRedirect = redirectOrigin => {
-        if (!redirectOrigin) {
+        if (!redirectOrigin || requestUrl.origin === redirectOrigin) {
             return fetch(event.request);
         }
         const location = event.request.url.replace(new RegExp(`^${requestUrl.origin}(/|$)`), `${redirectOrigin}$1`);

package/src/main/browser/webview/webview-frontend-security-warnings.ts

@@ -15,8 +15,9 @@
  ********************************************************************************/
 
 import { MessageService } from '@theia/core';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { Dialog, FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import { nls } from '@theia/core/lib/common/nls';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { WebviewExternalEndpoint } from '../../common/webview-protocol';
@@ -44,12 +45,12 @@ export class WebviewFrontendSecurityWarnings implements FrontendApplicationContr
         }
         const hostPattern = await this.webviewEnvironment.hostPatternPromise;
         if (hostPattern !== WebviewExternalEndpoint.defaultPattern) {
-            this.messageService.warn(`\
-The webview endpoint's host pattern has been changed to \`${hostPattern}\`; changing the pattern can lead to security vulnerabilities. \
-See \`@theia/plugin-ext/README.md\` for more information.`,
-            /* actions: */ 'Ok', 'Go To README',
-            ).then(action => {
-                if (action === 'Go To README') {
+            const goToReadme = nls.localize('theia/webview/goToReadme', 'Go To README');
+            const message = nls.localize('theia/webview/messageWarning', '\
+            The {0} endpoint\'s host pattern has been changed to `{1}`; changing the pattern can lead to security vulnerabilities. \
+            See `{2}` for more information.', 'webview', hostPattern, '@theia/plugin-ext/README.md');
+            this.messageService.warn(message, Dialog.OK, goToReadme).then(action => {
+                if (action === goToReadme) {
                     this.windowService.openNewWindow('https://www.npmjs.com/package/@theia/plugin-ext', { external: true });
                 }
             });

package/src/main/browser/webview/webview-preferences.ts

@@ -23,6 +23,7 @@ import {
     PreferenceContribution,
     PreferenceSchema
 } from '@theia/core/lib/browser/preferences';
+import { nls } from '@theia/core/lib/common/nls';
 
 const frontendConfig = FrontendApplicationConfigProvider.get();
 
@@ -32,7 +33,7 @@ export const WebviewConfigSchema: PreferenceSchema = {
         'webview.trace': {
             type: 'string',
             enum: ['off', 'on', 'verbose'],
-            description: 'Controls communication tracing with webviews.',
+            description: nls.localize('theia/plugin-ext/webviewTrace', 'Controls communication tracing with webviews.'),
             default: 'off'
         }
     }
@@ -42,7 +43,7 @@ if (frontendConfig.securityWarnings) {
     WebviewConfigSchema.properties['webview.warnIfUnsecure'] = {
         scope: 'application',
         type: 'boolean',
-        description: 'Warns users that webviews are currently deployed unsecurely.',
+        description: nls.localize('theia/plugin-ext/webviewWarnIfUnsecure', 'Warns users that webviews are currently deployed unsecurely.'),
         default: true,
     };
 }

package/src/main/browser/webview/webview.ts

@@ -40,7 +40,7 @@ import { Schemes } from '../../../common/uri-components';
 import { PluginSharedStyle } from '../plugin-shared-style';
 import { WebviewThemeDataProvider } from './webview-theme-data-provider';
 import { ExternalUriService } from '@theia/core/lib/browser/external-uri-service';
-import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import { WebviewPreferences } from './webview-preferences';
 import { WebviewResourceCache } from './webview-resource-cache';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
@@ -249,7 +249,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget {
 
         const element = document.createElement('iframe');
         element.className = 'webview';
-        element.sandbox.add('allow-scripts', 'allow-forms', 'allow-same-origin');
+        element.sandbox.add('allow-scripts', 'allow-forms', 'allow-same-origin', 'allow-downloads');
         element.setAttribute('src', `${this.externalEndpoint}/index.html?id=${this.identifier.id}`);
         element.style.border = 'none';
         element.style.width = '100%';

package/src/plugin/comments.ts

@@ -18,7 +18,7 @@ import * as theia from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { CommandRegistryImpl } from './command-registry';
 import { UriComponents } from '../common/uri-components';
-import { URI } from './types-impl';
+import { CommentThreadCollapsibleState, URI } from './types-impl';
 import {
     Range,
     Comment,
@@ -29,7 +29,6 @@ import { DocumentsExtImpl } from './documents';
 import { Emitter } from '@theia/core/lib/common/event';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { fromMarkdown, fromRange, toRange } from './type-converters';
-import { CommentThreadCollapsibleState } from './types-impl';
 import {
     CommentsCommandArg, CommentsContextCommandArg, CommentsEditCommandArg,
     CommentsExt,

package/src/plugin/custom-editors.ts

@@ -19,17 +19,15 @@
  *--------------------------------------------------------------------------------------------*/
 // copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/workbench/api/common/extHostCustomEditors.ts
 
-import { CustomEditorsExt, CustomEditorsMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
+import { CustomEditorsExt, CustomEditorsMain, Plugin, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
 import * as theia from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { Plugin } from '../common/plugin-api-rpc';
-import { URI } from './types-impl';
+import { Disposable, URI } from './types-impl';
 import { UriComponents } from '../common/uri-components';
 import { DocumentsExtImpl } from './documents';
 import { WebviewImpl, WebviewsExtImpl } from './webviews';
 import { CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { Disposable } from './types-impl';
 import { WorkspaceExtImpl } from './workspace';
 import * as Converters from './type-converters';
 

package/src/plugin/decorations.ts

@@ -24,8 +24,7 @@ import {
     PLUGIN_RPC_CONTEXT, PluginInfo
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { URI } from './types-impl';
-import { Disposable, FileDecoration } from './types-impl';
+import { Disposable, FileDecoration, URI } from './types-impl';
 import { CancellationToken } from '@theia/core/lib/common';
 import { dirname } from 'path';
 

package/src/plugin/document-data.ts

@@ -17,9 +17,8 @@
 import * as theia from '@theia/plugin';
 import { ModelChangedEvent, DocumentsMain } from '../common/plugin-api-rpc';
 import { Range as ARange } from '../common/plugin-api-rpc-model';
-import { URI } from './types-impl';
+import { EndOfLine, Position, Range, URI } from './types-impl';
 import { ok } from '../common/assert';
-import { Range, Position, EndOfLine } from './types-impl';
 import { PrefixSumComputer } from './prefix-sum-computer';
 import { getWordAtText, ensureValidWordDefinition } from './word-helper';
 

package/src/plugin/documents.ts

@@ -21,7 +21,7 @@
  * based on https://github.com/Microsoft/vscode/blob/bf9a27ec01f2ef82fc45f69e0c946c7d74a57d3e/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
  */
 import { DocumentsExt, ModelChangedEvent, PLUGIN_RPC_CONTEXT, DocumentsMain, SingleEditOperation } from '../common/plugin-api-rpc';
-import { URI } from './types-impl';
+import { TextEdit, URI } from './types-impl';
 import { UriComponents } from '../common/uri-components';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Emitter, Event } from '@theia/core/lib/common/event';
@@ -31,7 +31,6 @@ import { EditorsAndDocumentsExtImpl } from './editors-and-documents';
 import * as Converter from './type-converters';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Range, TextDocumentShowOptions } from '../common/plugin-api-rpc-model';
-import { TextEdit } from './types-impl';
 
 export class DocumentsExtImpl implements DocumentsExt {
     private toDispose = new DisposableCollection();

package/src/plugin/file-system-event-service-ext-impl.ts

@@ -31,11 +31,10 @@
 import { Emitter, WaitUntilEvent, AsyncEmitter } from '@theia/core/lib/common/event';
 import { IRelativePattern, parse } from '@theia/callhierarchy/lib/common/glob';
 import { UriComponents } from '@theia/core/shared/vscode-uri';
-import { URI } from './types-impl';
+import { Disposable, URI, WorkspaceEdit } from './types-impl';
 import { EditorsAndDocumentsExtImpl as ExtHostDocumentsAndEditors } from './editors-and-documents';
 import type * as vscode from '@theia/plugin';
 import * as typeConverter from './type-converters';
-import { Disposable, WorkspaceEdit } from './types-impl';
 import { FileOperation } from '@theia/filesystem/lib/common/files';
 import { flatten } from '../common/arrays';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';

package/src/plugin/file-system-ext-impl.ts

@@ -29,12 +29,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { UriComponents } from '@theia/core/shared/vscode-uri';
-import { URI } from './types-impl';
+import { FileChangeType, FileSystemError, URI } from './types-impl';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { PLUGIN_RPC_CONTEXT, FileSystemExt, FileSystemMain, IFileChangeDto } from '../common/plugin-api-rpc';
 import * as vscode from '@theia/plugin';
 import * as files from '@theia/filesystem/lib/common/files';
-import { FileChangeType, FileSystemError } from './types-impl';
 import * as typeConverter from './type-converters';
 import { LanguagesExtImpl } from './languages';
 import { Schemes as Schemas } from '../common/uri-components';

package/src/plugin/known-commands.spec.ts

@@ -16,8 +16,7 @@
 
 import * as assert from 'assert';
 import { KnownCommands } from './known-commands';
-import { URI } from './types-impl';
-import { Position } from './types-impl';
+import { Position, URI } from './types-impl';
 import { fromPosition } from './type-converters';
 
 describe('Known Command Conversions', () => {

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> {
@@ -72,7 +76,9 @@ export class CallHierarchyAdapter {
             range: this.fromRange(item.range),
             selectionRange: this.fromRange(item.selectionRange),
             name: item.name,
-            kind: item.kind
+            kind: item.kind,
+            tags: item.tags,
+            data: item.data,
         };
     }
 
@@ -95,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 : '',
@@ -103,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

@@ -90,6 +90,7 @@ import { DeclarationAdapter } from './languages/declaration';
 import { CallHierarchyAdapter } from './languages/call-hierarchy';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { DocumentSemanticTokensAdapter, DocumentRangeSemanticTokensAdapter } from './languages/semantic-highlighting';
+import { isReadonlyArray } from '../common/arrays';
 
 type Adapter = CompletionAdapter |
     SignatureHelpAdapter |
@@ -204,7 +205,7 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
 
     private transformDocumentSelector(selector: theia.DocumentSelector): SerializedDocumentFilter[] {
-        if (Array.isArray(selector)) {
+        if (isReadonlyArray(selector)) {
             return selector.map(sel => this.doTransformDocumentSelector(sel)!);
         }
 
@@ -582,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,14 +50,17 @@ export class MessageRegistryExt {
             } else {
                 if ('modal' in optionsOrFirstItem) {
                     options.modal = optionsOrFirstItem.modal;
+                    if ('detail' in optionsOrFirstItem) {
+                        options.detail = optionsOrFirstItem.detail;
+                    }
                 }
             }
+            for (const item of rest) {
+                pushItem(item);
+            }
+            const actionHandle = await this.proxy.$showMessage(type, message, options, actions);
+            return actionHandle !== undefined ? items[actionHandle] : undefined;
         }
-        for (const item of rest) {
-            pushItem(item);
-        }
-        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,25 @@
  ********************************************************************************/
 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 { DebugExt, DebugMain, PLUGIN_RPC_CONTEXT as Ext, TerminalOptionsExt } from '../../../common/plugin-api-rpc';
+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 {
+    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 { CommunicationProvider } from '@theia/debug/lib/node/debug-model';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -43,8 +46,11 @@ export class DebugExtImpl implements DebugExt {
     // debug sessions by sessionId
     private sessions = new Map<string, PluginDebugAdapterSession>();
 
-    // providers by type
+    // providers by type (initial)
     private configurationProviders = new Map<string, Set<theia.DebugConfigurationProvider>>();
+    // providers by type (dynamic)
+    private dynamicConfigurationProviders = new Map<string, Set<theia.DebugConfigurationProvider>>();
+
     /**
      * Only use internally, don't send it to the frontend. It's expensive!
      * It's already there as a part of the plugin metadata.
@@ -182,19 +188,22 @@ export class DebugExtImpl implements DebugExt {
         });
     }
 
-    registerDebugConfigurationProvider(debugType: string, provider: theia.DebugConfigurationProvider): Disposable {
-        console.log(`Debug configuration provider has been registered: ${debugType}`);
-        const providers = this.configurationProviders.get(debugType) || new Set<theia.DebugConfigurationProvider>();
-        this.configurationProviders.set(debugType, providers);
+    registerDebugConfigurationProvider(debugType: string, provider: theia.DebugConfigurationProvider, trigger: theia.DebugConfigurationProviderTriggerKind): Disposable {
+        console.log(`Debug configuration provider has been registered: ${debugType}, trigger: ${trigger}`);
+        const providersByTriggerKind = trigger === DebugConfigurationProviderTriggerKind.Initial ? this.configurationProviders : this.dynamicConfigurationProviders;
+        let providers = providersByTriggerKind.get(debugType);
+        if (!providers) {
+            providersByTriggerKind.set(debugType, providers = new Set());
+        }
         providers.add(provider);
 
         return Disposable.create(() => {
             // eslint-disable-next-line @typescript-eslint/no-shadow
-            const providers = this.configurationProviders.get(debugType);
+            const providers = providersByTriggerKind.get(debugType);
             if (providers) {
                 providers.delete(provider);
                 if (providers.size === 0) {
-                    this.configurationProviders.delete(debugType);
+                    providersByTriggerKind.delete(debugType);
                 }
             }
         });
@@ -319,10 +328,10 @@ export class DebugExtImpl implements DebugExt {
         return undefined;
     }
 
-    async $provideDebugConfigurations(debugType: string, workspaceFolderUri: string | undefined): Promise<theia.DebugConfiguration[]> {
+    async $provideDebugConfigurations(debugType: string, workspaceFolderUri: string | undefined, dynamic: boolean = false): Promise<theia.DebugConfiguration[]> {
         let result: theia.DebugConfiguration[] = [];
 
-        const providers = this.configurationProviders.get(debugType);
+        const providers = dynamic ? this.dynamicConfigurationProviders.get(debugType) : this.configurationProviders.get(debugType);
         if (providers) {
             for (const provider of providers) {
                 if (provider.provideDebugConfigurations) {
@@ -337,7 +346,11 @@ export class DebugExtImpl implements DebugExt {
     async $resolveDebugConfigurations(debugConfiguration: theia.DebugConfiguration, workspaceFolderUri: string | undefined): Promise<theia.DebugConfiguration | undefined> {
         let current = debugConfiguration;
 
-        for (const providers of [this.configurationProviders.get(debugConfiguration.type), this.configurationProviders.get('*')]) {
+        for (const providers of [
+            this.configurationProviders.get(debugConfiguration.type),
+            this.dynamicConfigurationProviders.get(debugConfiguration.type),
+            this.configurationProviders.get('*')
+        ]) {
             if (providers) {
                 for (const provider of providers) {
                     if (provider.resolveDebugConfiguration) {
@@ -363,7 +376,11 @@ export class DebugExtImpl implements DebugExt {
         Promise<theia.DebugConfiguration | undefined> {
         let current = debugConfiguration;
 
-        for (const providers of [this.configurationProviders.get(debugConfiguration.type), this.configurationProviders.get('*')]) {
+        for (const providers of [
+            this.configurationProviders.get(debugConfiguration.type),
+            this.dynamicConfigurationProviders.get(debugConfiguration.type),
+            this.configurationProviders.get('*')
+        ]) {
             if (providers) {
                 for (const provider of providers) {
                     if (provider.resolveDebugConfigurationWithSubstitutedVariables) {
@@ -409,16 +426,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,23 +14,23 @@
  * 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 { CommunicationProvider, DebugAdapterSession } from '@theia/debug/lib/node/debug-model';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /**
  * Server debug adapter session.
  */
-export class PluginDebugAdapterSession extends DebugAdapterSessionImpl implements theia.DebugSession {
+export class PluginDebugAdapterSession extends DebugAdapterSessionImpl implements theia.DebugSession, DebugAdapterSession {
     readonly type: string;
     readonly name: string;
     readonly configuration: theia.DebugConfiguration;
 
     constructor(
-        protected readonly communicationProvider: CommunicationProvider,
+        readonly communicationProvider: CommunicationProvider,
         protected readonly tracker: theia.DebugAdapterTracker,
         protected readonly theiaSession: theia.DebugSession) {
 

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

@@ -15,15 +15,18 @@
  ********************************************************************************/
 
 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 { CommunicationProvider } from '@theia/debug/lib/node/debug-model';
+import { StreamCommunicationProvider } from '@theia/debug/lib/node/stream-communication-provider';
+import { Disposable } from '@theia/core/lib/common/disposable';
+import { DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer } from '../../types-impl';
+import { InlineCommunicationProvider } from '@theia/debug/lib/node/inline-communication-provider';
 const isElectron = require('is-electron');
 
 /**
  * Starts debug adapter process.
  */
-export function startDebugAdapter(executable: theia.DebugAdapterExecutable): CommunicationProvider {
+export function startDebugAdapter(executable: DebugAdapterExecutable): CommunicationProvider {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const options: any = { stdio: ['pipe', 'pipe', 2] };
 
@@ -63,21 +66,28 @@ export function startDebugAdapter(executable: theia.DebugAdapterExecutable): Com
         childProcess = spawn(command, args, options);
     }
 
-    return {
-        input: childProcess.stdin!,
-        output: childProcess.stdout!,
-        dispose: () => childProcess.kill()
-    };
+    const provider = new StreamCommunicationProvider(childProcess.stdout!, childProcess.stdin!);
+    provider.push(Disposable.create(() => childProcess.kill()));
+    return provider;
 }
 
 /**
  * Connects to a remote debug server.
  */
-export function connectDebugAdapter(server: theia.DebugAdapterServer): CommunicationProvider {
+export function connectSocketDebugAdapter(server: DebugAdapterServer): CommunicationProvider {
     const socket = net.createConnection(server.port, server.host);
-    return {
-        input: socket,
-        output: socket,
-        dispose: () => socket.end()
-    };
+    const provider = new StreamCommunicationProvider(socket, socket);
+    provider.push(Disposable.create(() => socket.end()));
+    return provider;
+}
+
+export function connectPipeDebugAdapter(adapter: DebugAdapterNamedPipeServer): CommunicationProvider {
+    const socket = net.createConnection(adapter.path);
+    const provider = new StreamCommunicationProvider(socket, socket);
+    provider.push(Disposable.create(() => socket.end()));
+    return provider;
+}
+
+export function connectInlineDebugAdapter(adapter: DebugAdapterInlineImplementation): CommunicationProvider {
+    return new InlineCommunicationProvider(adapter.implementation);
 }