@theia/debug 1.29.0-next.20 → 1.29.0-next.22

package/lib/browser/view/debug-configuration-select.js

@@ -38,8 +38,9 @@ class DebugConfigurationSelect extends React.Component {
                 this.selectDynamicConfigFromQuickPick(providerType);
             }
             else {
-                const { name, type, request, workspaceFolderUri, providerType } = debug_session_options_1.InternalDebugSessionOptions.parseValue(value);
-                this.manager.current = this.manager.find({ name, type, request }, workspaceFolderUri, providerType === 'undefined' ? undefined : providerType);
+                const data = JSON.parse(value);
+                this.manager.current = data;
+                this.refreshDebugConfigurations();
             }
         };
         this.refreshDebugConfigurations = async () => {
@@ -50,8 +51,9 @@ class DebugConfigurationSelect extends React.Component {
                     providerTypes.push(type);
                 }
             }
-            this.selectRef.current.value = this.currentValue;
-            this.setState({ providerTypes, currentValue: this.currentValue });
+            const value = this.currentValue;
+            this.selectRef.current.value = value;
+            this.setState({ providerTypes, currentValue: value });
         };
         this.manager = props.manager;
         this.quickInputService = props.quickInputService;
@@ -67,11 +69,26 @@ class DebugConfigurationSelect extends React.Component {
         this.refreshDebugConfigurations();
     }
     render() {
-        return React.createElement(select_component_1.SelectComponent, { options: this.renderOptions(), defaultValue: this.currentValue, onChange: option => this.setCurrentConfiguration(option), onFocus: () => this.refreshDebugConfigurations(), onBlur: () => this.refreshDebugConfigurations(), ref: this.selectRef });
+        return React.createElement(select_component_1.SelectComponent, { options: this.renderOptions(), defaultValue: this.state.currentValue, onChange: option => this.setCurrentConfiguration(option), onFocus: () => this.refreshDebugConfigurations(), onBlur: () => this.refreshDebugConfigurations(), ref: this.selectRef });
     }
     get currentValue() {
         const { current } = this.manager;
-        return current ? debug_session_options_1.InternalDebugSessionOptions.toValue(current) : DebugConfigurationSelect.NO_CONFIGURATION;
+        const matchingOption = this.getCurrentOption(current);
+        return matchingOption ? matchingOption.value : current ? JSON.stringify(current) : DebugConfigurationSelect.NO_CONFIGURATION;
+    }
+    getCurrentOption(current) {
+        if (!current || !this.selectRef.current) {
+            return;
+        }
+        const matchingOption = this.selectRef.current.options.find(option => option.userData === DebugConfigurationSelect.CONFIG_MARKER
+            && this.matchesOption(JSON.parse(option.value), current));
+        return matchingOption;
+    }
+    matchesOption(sessionOption, current) {
+        const matchesNameAndWorkspace = sessionOption.name === current.name && sessionOption.workspaceFolderUri === current.workspaceFolderUri;
+        return debug_session_options_1.DebugSessionOptions.isConfiguration(sessionOption) && debug_session_options_1.DebugSessionOptions.isConfiguration(current)
+            ? matchesNameAndWorkspace && sessionOption.providerType === current.providerType
+            : matchesNameAndWorkspace;
     }
     toPickValue(providerType) {
         return DebugConfigurationSelect.PICK + providerType;
@@ -114,10 +131,11 @@ class DebugConfigurationSelect extends React.Component {
         const options = [];
         // Add non dynamic debug configurations
         for (const config of this.manager.all) {
-            const value = debug_session_options_1.InternalDebugSessionOptions.toValue(config);
+            const value = JSON.stringify(config);
             options.push({
                 value,
-                label: this.toName(config, this.props.isMultiRoot)
+                label: this.toName(config, this.props.isMultiRoot),
+                userData: DebugConfigurationSelect.CONFIG_MARKER
             });
         }
         // Add recently used dynamic debug configurations
@@ -129,10 +147,11 @@ class DebugConfigurationSelect extends React.Component {
                 });
             }
             for (const dynamicOption of recentDynamicOptions) {
-                const value = debug_session_options_1.InternalDebugSessionOptions.toValue(dynamicOption);
+                const value = JSON.stringify(dynamicOption);
                 options.push({
                     value,
-                    label: this.toName(dynamicOption, this.props.isMultiRoot) + ' (' + dynamicOption.providerType + ')'
+                    label: this.toName(dynamicOption, this.props.isMultiRoot) + ' (' + dynamicOption.providerType + ')',
+                    userData: DebugConfigurationSelect.CONFIG_MARKER
                 });
             }
         }
@@ -168,11 +187,13 @@ class DebugConfigurationSelect extends React.Component {
         });
         return options;
     }
-    toName({ configuration, workspaceFolderUri }, multiRoot) {
-        if (!workspaceFolderUri || !multiRoot) {
-            return configuration.name;
+    toName(options, multiRoot) {
+        var _a, _b;
+        const name = (_b = (_a = options.configuration) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : options.name;
+        if (!options.workspaceFolderUri || !multiRoot) {
+            return name;
         }
-        return `${configuration.name} (${new uri_1.default(workspaceFolderUri).path.base})`;
+        return `${name} (${new uri_1.default(options.workspaceFolderUri).path.base})`;
     }
 }
 exports.DebugConfigurationSelect = DebugConfigurationSelect;
@@ -180,4 +201,5 @@ DebugConfigurationSelect.SEPARATOR = '──────────';
 DebugConfigurationSelect.PICK = '__PICK__';
 DebugConfigurationSelect.NO_CONFIGURATION = '__NO_CONF__';
 DebugConfigurationSelect.ADD_CONFIGURATION = '__ADD_CONF__';
+DebugConfigurationSelect.CONFIG_MARKER = '__CONFIG__';
 //# sourceMappingURL=debug-configuration-select.js.map

package/lib/browser/view/debug-configuration-select.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-configuration-select.js","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"debug-configuration-select.js","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-select.tsx"],"names":[],"mappings":"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"}

package/lib/common/debug-compound.d.ts

@@ -0,0 +1,15 @@
+import { TaskIdentifier } from '@theia/task/lib/common';
+export declare const defaultCompound: DebugCompound;
+export interface DebugCompound {
+    name: string;
+    stopAll?: boolean;
+    preLaunchTask?: string | TaskIdentifier;
+    configurations: (string | {
+        name: string;
+        folder: string;
+    })[];
+}
+export declare namespace DebugCompound {
+    function is(arg: unknown): arg is DebugCompound;
+}
+//# sourceMappingURL=debug-compound.d.ts.map

package/lib/common/debug-compound.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-compound.d.ts","sourceRoot":"","sources":["../../src/common/debug-compound.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,eAAO,MAAM,eAAe,EAAE,aAAwD,CAAC;AAEvF,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IACxC,cAAc,EAAE,CAAC,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;CACjE;AAED,yBAAiB,aAAa,CAAC;IAC3B,SAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,aAAa,CAErD;CACJ"}

package/lib/common/debug-compound.js

@@ -0,0 +1,27 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2022 EclipseSource 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DebugCompound = exports.defaultCompound = void 0;
+exports.defaultCompound = { name: 'Compound', configurations: [] };
+var DebugCompound;
+(function (DebugCompound) {
+    function is(arg) {
+        return !!arg && typeof arg === 'object' && 'name' in arg && 'configurations' in arg;
+    }
+    DebugCompound.is = is;
+})(DebugCompound = exports.DebugCompound || (exports.DebugCompound = {}));
+//# sourceMappingURL=debug-compound.js.map

package/lib/common/debug-compound.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-compound.js","sourceRoot":"","sources":["../../src/common/debug-compound.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAInE,QAAA,eAAe,GAAkB,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;AASvF,IAAiB,aAAa,CAI7B;AAJD,WAAiB,aAAa;IAC1B,SAAgB,EAAE,CAAC,GAAY;QAC3B,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,gBAAgB,IAAI,GAAG,CAAC;IACxF,CAAC;IAFe,gBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAI7B"}

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@theia/debug",
-  "version": "1.29.0-next.20+1c0253adc71",
+  "version": "1.29.0-next.22+e5333672c80",
   "description": "Theia - Debug Extension",
   "dependencies": {
-    "@theia/console": "1.29.0-next.20+1c0253adc71",
-    "@theia/core": "1.29.0-next.20+1c0253adc71",
-    "@theia/editor": "1.29.0-next.20+1c0253adc71",
-    "@theia/filesystem": "1.29.0-next.20+1c0253adc71",
-    "@theia/markers": "1.29.0-next.20+1c0253adc71",
-    "@theia/monaco": "1.29.0-next.20+1c0253adc71",
+    "@theia/console": "1.29.0-next.22+e5333672c80",
+    "@theia/core": "1.29.0-next.22+e5333672c80",
+    "@theia/editor": "1.29.0-next.22+e5333672c80",
+    "@theia/filesystem": "1.29.0-next.22+e5333672c80",
+    "@theia/markers": "1.29.0-next.22+e5333672c80",
+    "@theia/monaco": "1.29.0-next.22+e5333672c80",
     "@theia/monaco-editor-core": "1.67.2",
-    "@theia/output": "1.29.0-next.20+1c0253adc71",
-    "@theia/process": "1.29.0-next.20+1c0253adc71",
-    "@theia/task": "1.29.0-next.20+1c0253adc71",
-    "@theia/terminal": "1.29.0-next.20+1c0253adc71",
-    "@theia/variable-resolver": "1.29.0-next.20+1c0253adc71",
-    "@theia/workspace": "1.29.0-next.20+1c0253adc71",
+    "@theia/output": "1.29.0-next.22+e5333672c80",
+    "@theia/process": "1.29.0-next.22+e5333672c80",
+    "@theia/task": "1.29.0-next.22+e5333672c80",
+    "@theia/terminal": "1.29.0-next.22+e5333672c80",
+    "@theia/variable-resolver": "1.29.0-next.22+e5333672c80",
+    "@theia/workspace": "1.29.0-next.22+e5333672c80",
     "jsonc-parser": "^2.2.0",
     "mkdirp": "^0.5.0",
     "p-debounce": "^2.1.0",
@@ -68,5 +68,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "1c0253adc71fa59d6ca7aef0797d3ba0c7d7d36c"
+  "gitHead": "e5333672c80f6aaa99198717f7601e991a35182f"
 }

package/src/browser/debug-configuration-manager.ts

@@ -30,7 +30,7 @@ import { LabelProvider, PreferenceScope, PreferenceService, QuickPickValue, Stor
 import { QuickPickService } from '@theia/core/lib/common/quick-pick-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { DebugConfigurationModel } from './debug-configuration-model';
-import { DebugSessionOptions } from './debug-session-options';
+import { DebugSessionOptions, DynamicDebugConfigurationSessionOptions } from './debug-session-options';
 import { DebugService } from '../common/debug-service';
 import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { DebugConfiguration } from '../common/debug-common';
@@ -41,6 +41,7 @@ import * as monaco from '@theia/monaco-editor-core';
 import { ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { nls } from '@theia/core';
+import { DebugCompound } from '../common/debug-compound';
 
 export interface WillProvideDebugConfiguration extends WaitUntilEvent {
 }
@@ -94,7 +95,7 @@ export class DebugConfigurationManager {
 
     protected initialized: Promise<void>;
 
-    protected recentDynamicOptionsTracker: DebugSessionOptions[] = [];
+    protected recentDynamicOptionsTracker: DynamicDebugConfigurationSessionOptions[] = [];
 
     @postConstruct()
     protected async init(): Promise<void> {
@@ -141,10 +142,10 @@ export class DebugConfigurationManager {
     protected *getAll(): IterableIterator<DebugSessionOptions> {
         for (const model of this.models.values()) {
             for (const configuration of model.configurations) {
-                yield {
-                    configuration,
-                    workspaceFolderUri: model.workspaceFolderUri
-                };
+                yield this.configurationToOptions(configuration, model.workspaceFolderUri);
+            }
+            for (const compound of model.compounds) {
+                yield this.compoundToOptions(compound, model.workspaceFolderUri);
             }
         }
     }
@@ -159,7 +160,7 @@ export class DebugConfigurationManager {
     }
     protected *doGetSupported(debugTypes: Set<string>): IterableIterator<DebugSessionOptions> {
         for (const options of this.getAll()) {
-            if (debugTypes.has(options.configuration.type)) {
+            if (options.configuration && debugTypes.has(options.configuration.type)) {
                 yield options;
             }
         }
@@ -171,8 +172,7 @@ export class DebugConfigurationManager {
     }
 
     async getSelectedConfiguration(): Promise<DebugSessionOptions | undefined> {
-        // providerType applies to dynamic configurations only
-        if (!this._currentOptions?.providerType) {
+        if (!DebugSessionOptions.isDynamic(this._currentOptions)) {
             return this._currentOptions;
         }
 
@@ -188,7 +188,7 @@ export class DebugConfigurationManager {
             throw new Error(message);
         }
 
-        return { configuration, providerType };
+        return { name, configuration, providerType };
     }
 
     set current(option: DebugSessionOptions | undefined) {
@@ -197,7 +197,7 @@ export class DebugConfigurationManager {
     }
 
     protected updateRecentlyUsedDynamicConfigurationOptions(option: DebugSessionOptions | undefined): void {
-        if (option?.providerType) { // if it's a dynamic configuration option
+        if (DebugSessionOptions.isDynamic(option)) {
             // Removing an item already present in the list
             const index = this.recentDynamicOptionsTracker.findIndex(item => this.dynamicOptionsMatch(item, option));
             if (index > -1) {
@@ -212,32 +212,33 @@ export class DebugConfigurationManager {
         }
     }
 
-    protected dynamicOptionsMatch(one: DebugSessionOptions, other: DebugSessionOptions): boolean {
+    protected dynamicOptionsMatch(one: DynamicDebugConfigurationSessionOptions, other: DynamicDebugConfigurationSessionOptions): boolean {
         return one.providerType !== undefined
-        && one.configuration.name === other.configuration.name
-        && one.providerType === other.providerType;
+            && one.configuration.name === other.configuration.name
+            && one.providerType === other.providerType;
     }
 
-    get recentDynamicOptions(): readonly DebugSessionOptions[] {
+    get recentDynamicOptions(): readonly DynamicDebugConfigurationSessionOptions[] {
         return this.recentDynamicOptionsTracker;
     }
 
     protected updateCurrent(options: DebugSessionOptions | undefined = this._currentOptions): void {
-        this._currentOptions = options && this.find(options.configuration, options.workspaceFolderUri, options.providerType);
+        if (DebugSessionOptions.isCompound(options)) {
+            this._currentOptions = options && this.find(options.compound, options.workspaceFolderUri);
+        } else {
+            this._currentOptions = options && this.find(options.configuration, options.workspaceFolderUri, options.providerType);
+        }
 
         if (!this._currentOptions) {
             const model = this.getModel();
             if (model) {
                 const configuration = model.configurations[0];
                 if (configuration) {
-                    this._currentOptions = {
-                        configuration,
-                        workspaceFolderUri: model.workspaceFolderUri
-                    };
+                    this._currentOptions = this.configurationToOptions(configuration, model.workspaceFolderUri);
                 }
             }
         }
-        this.debugConfigurationTypeKey.set(this.current && this.current.configuration.type);
+        this.debugConfigurationTypeKey.set(this.current && this.current.configuration?.type);
         this.onDidChangeEmitter.fire(undefined);
     }
 
@@ -248,24 +249,57 @@ export class DebugConfigurationManager {
     /**
      * Find / Resolve DebugSessionOptions from a given target debug configuration
      */
-    find(targetConfiguration: DebugConfiguration, workspaceFolderUri?: string, providerType?: string): DebugSessionOptions | undefined;
-    find(nameOrTargetConfiguration: string | DebugConfiguration, workspaceFolderUri?: string, providerType?: string): DebugSessionOptions | undefined {
-        // providerType is only applicable to dynamic debug configurations
-        if (typeof nameOrTargetConfiguration === 'object' && providerType) {
-            return {
-                configuration: nameOrTargetConfiguration,
-                providerType
-            };
-        }
-        const name = typeof nameOrTargetConfiguration === 'string' ? nameOrTargetConfiguration : nameOrTargetConfiguration.name;
+    find(compound: DebugCompound, workspaceFolderUri?: string): DebugSessionOptions | undefined;
+    find(configuration: DebugConfiguration, workspaceFolderUri?: string, providerType?: string): DebugSessionOptions | undefined;
+    find(name: string, workspaceFolderUri?: string, providerType?: string): DebugSessionOptions | undefined;
+    find(nameOrConfigurationOrCompound: string | DebugConfiguration | DebugCompound, workspaceFolderUri?: string, providerType?: string): DebugSessionOptions | undefined {
+        if (DebugConfiguration.is(nameOrConfigurationOrCompound) && providerType) {
+            // providerType is only applicable to dynamic debug configurations and may only be created if we have a configuration given
+            return this.configurationToOptions(nameOrConfigurationOrCompound, workspaceFolderUri, providerType);
+        }
+        const name = typeof nameOrConfigurationOrCompound === 'string' ? nameOrConfigurationOrCompound : nameOrConfigurationOrCompound.name;
+        const configuration = this.findConfiguration(name, workspaceFolderUri);
+        if (configuration) {
+            return this.configurationToOptions(configuration, workspaceFolderUri);
+        }
+        const compound = this.findCompound(name, workspaceFolderUri);
+        if (compound) {
+            return this.compoundToOptions(compound, workspaceFolderUri);
+        }
+    }
+
+    findConfigurations(name: string, workspaceFolderUri?: string): DebugConfiguration[] {
+        const matches = [];
         for (const model of this.models.values()) {
             if (model.workspaceFolderUri === workspaceFolderUri) {
                 for (const configuration of model.configurations) {
                     if (configuration.name === name) {
-                        return {
-                            configuration,
-                            workspaceFolderUri
-                        };
+                        matches.push(configuration);
+                    }
+                }
+            }
+        }
+        return matches;
+    }
+
+    findConfiguration(name: string, workspaceFolderUri?: string): DebugConfiguration | undefined {
+        for (const model of this.models.values()) {
+            if (model.workspaceFolderUri === workspaceFolderUri) {
+                for (const configuration of model.configurations) {
+                    if (configuration.name === name) {
+                        return configuration;
+                    }
+                }
+            }
+        }
+    }
+
+    findCompound(name: string, workspaceFolderUri?: string): DebugCompound | undefined {
+        for (const model of this.models.values()) {
+            if (model.workspaceFolderUri === workspaceFolderUri) {
+                for (const compound of model.compounds) {
+                    if (compound.name === name) {
+                        return compound;
                     }
                 }
             }
@@ -279,6 +313,14 @@ export class DebugConfigurationManager {
         }
     }
 
+    protected configurationToOptions(configuration: DebugConfiguration, workspaceFolderUri?: string, providerType?: string): DebugSessionOptions {
+        return { name: configuration.name, configuration, providerType, workspaceFolderUri };
+    }
+
+    protected compoundToOptions(compound: DebugCompound, workspaceFolderUri?: string): DebugSessionOptions {
+        return { name: compound.name, compound, workspaceFolderUri };
+    }
+
     async addConfiguration(): Promise<void> {
         let rootUri: URI | undefined = undefined;
         if (this.workspaceService.saved && this.workspaceService.tryGetRoots().length > 1) {
@@ -345,7 +387,8 @@ export class DebugConfigurationManager {
             });
         }
         const root = await this.quickPickService.show(items, {
-            placeholder: nls.localize('theia/debug/addConfigurationPlaceholder', 'Select workspace root to add configuration to')
+            placeholder: nls.localize('theia/debug/addConfigurationPlaceholder', 'Select workspace root to add configuration to'),
+            ignoreFocusOut: true
         });
         return root?.value;
     }
@@ -469,17 +512,26 @@ export class DebugConfigurationManager {
 
         // Between versions v1.26 and v1.27, the expected format of the data changed so that old stored data
         // may not contain the configuration key.
-        if (data.current && 'configuration' in data.current) {
+        if (DebugSessionOptions.isConfiguration(data.current)) {
+            // ensure options name is reflected from old configurations data
+            data.current.name = data.current.name ?? data.current.configuration?.name;
             this.current = this.find(data.current.configuration, data.current.workspaceFolderUri, data.current.providerType);
+        } else if (DebugSessionOptions.isCompound(data.current)) {
+            this.current = this.find(data.current.name, data.current.workspaceFolderUri);
         }
     }
 
-    protected resolveRecentDynamicOptionsFromData(options?: DebugSessionOptions[]): void {
+    protected resolveRecentDynamicOptionsFromData(options?: DynamicDebugConfigurationSessionOptions[]): void {
         if (!options || this.recentDynamicOptionsTracker.length !== 0) {
             return;
         }
 
-        this.recentDynamicOptionsTracker = options;
+        // ensure options name is reflected from old configurations data
+        const dynamicOptions = options.map(option => {
+            option.name = option.name ?? option.configuration.name;
+            return option;
+        }).filter(DebugSessionOptions.isDynamic);
+        this.recentDynamicOptionsTracker = dynamicOptions;
     }
 
     save(): void {
@@ -502,6 +554,6 @@ export class DebugConfigurationManager {
 export namespace DebugConfigurationManager {
     export interface Data {
         current?: DebugSessionOptions,
-        recentDynamicOptions?: DebugSessionOptions[]
+        recentDynamicOptions?: DynamicDebugConfigurationSessionOptions[]
     }
 }

package/src/browser/debug-configuration-model.ts

@@ -19,6 +19,7 @@ import { Emitter, Event } from '@theia/core/lib/common/event';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { DebugConfiguration } from '../common/debug-common';
 import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
+import { DebugCompound } from '../common/debug-compound';
 
 export class DebugConfigurationModel implements Disposable {
 
@@ -58,6 +59,10 @@ export class DebugConfigurationModel implements Disposable {
         return this.json.configurations;
     }
 
+    get compounds(): DebugCompound[] {
+        return this.json.compounds;
+    }
+
     async reconcile(): Promise<void> {
         this.json = this.parseConfigurations();
         this.onDidChangeEmitter.fire(undefined);
@@ -66,19 +71,22 @@ export class DebugConfigurationModel implements Disposable {
         const configurations: DebugConfiguration[] = [];
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const { configUri, value } = this.preferences.resolve<any>('launch', undefined, this.workspaceFolderUri);
-        if (value && typeof value === 'object' && 'configurations' in value) {
-            if (Array.isArray(value.configurations)) {
-                for (const configuration of value.configurations) {
-                    if (DebugConfiguration.is(configuration)) {
-                        configurations.push(configuration);
-                    }
+        if (value && typeof value === 'object' && Array.isArray(value.configurations)) {
+            for (const configuration of value.configurations) {
+                if (DebugConfiguration.is(configuration)) {
+                    configurations.push(configuration);
+                }
+            }
+        }
+        const compounds: DebugCompound[] = [];
+        if (value && typeof value === 'object' && Array.isArray(value.compounds)) {
+            for (const compound of value.compounds) {
+                if (DebugCompound.is(compound)) {
+                    compounds.push(compound);
                 }
             }
         }
-        return {
-            uri: configUri,
-            configurations
-        };
+        return { uri: configUri, configurations, compounds };
     }
 
 }
@@ -86,5 +94,6 @@ export namespace DebugConfigurationModel {
     export interface JsonContent {
         uri?: URI
         configurations: DebugConfiguration[]
+        compounds: DebugCompound[]
     }
 }

package/src/browser/debug-frontend-application-contribution.ts

@@ -1122,8 +1122,9 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
             await this.configurations.addConfiguration();
             return;
         }
-        if (current) {
-            if (noDebug !== undefined) {
+
+        if (noDebug !== undefined) {
+            if (current.configuration) {
                 current = {
                     ...current,
                     configuration: {
@@ -1131,9 +1132,15 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
                         noDebug
                     }
                 };
+            } else {
+                current = {
+                    ...current,
+                    noDebug
+                };
             }
-            await this.manager.start(current);
         }
+
+        await this.manager.start(current);
     }
 
     get threads(): DebugThreadsWidget | undefined {

package/src/browser/debug-prefix-configuration.ts

@@ -113,7 +113,7 @@ export class DebugPrefixConfiguration implements CommandContribution, CommandHan
 
         for (const config of configurations) {
             items.push({
-                label: config.configuration.name,
+                label: config.name,
                 description: this.workspaceService.isMultiRootWorkspaceOpened
                     ? this.labelProvider.getName(new URI(config.workspaceFolderUri))
                     : '',
@@ -134,7 +134,7 @@ export class DebugPrefixConfiguration implements CommandContribution, CommandHan
             for (const configuration of dynamicConfigurations) {
                 items.push({
                     label: configuration.name,
-                    execute: () => this.runConfiguration({ configuration, providerType })
+                    execute: () => this.runConfiguration({ name: configuration.name, configuration, providerType })
                 });
             }
         }
@@ -170,7 +170,7 @@ export class DebugPrefixConfiguration implements CommandContribution, CommandHan
      */
     protected updateStatusBar(): void {
         const text: string = this.debugConfigurationManager.current
-            ? this.debugConfigurationManager.current.configuration.name
+            ? this.debugConfigurationManager.current.name
             : '';
         const icon = '$(codicon-debug-alt-small)';
         this.statusBar.setElement(this.statusBarId, {