@theia/debug 1.27.0-next.7 → 1.27.0-next.72

package/lib/node/debug-service-impl.js

@@ -27,7 +27,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebugServiceImpl = void 0;
 const inversify_1 = require("@theia/core/shared/inversify");
 const debug_adapter_session_manager_1 = require("./debug-adapter-session-manager");
-const debug_adapter_contribution_registry_1 = require("./debug-adapter-contribution-registry");
+const debug_adapter_contribution_registry_1 = require("../common/debug-adapter-contribution-registry");
+const core_1 = require("@theia/core");
 /**
  * DebugService implementation.
  */
@@ -35,6 +36,9 @@ let DebugServiceImpl = class DebugServiceImpl {
     constructor() {
         this.sessions = new Set();
     }
+    get onDidChangeDebugConfigurationProviders() {
+        return core_1.Event.None;
+    }
     dispose() {
         this.terminateDebugSession();
     }
@@ -57,6 +61,14 @@ let DebugServiceImpl = class DebugServiceImpl {
     async provideDebugConfigurations(debugType, workspaceFolderUri) {
         return this.registry.provideDebugConfigurations(debugType, workspaceFolderUri);
     }
+    async provideDynamicDebugConfigurations() {
+        // TODO: Support dynamic debug configurations through Theia extensions?
+        return {};
+    }
+    fetchDynamicDebugConfiguration(name, type) {
+        // TODO: Support dynamic debug configurations through Theia extensions?
+        return Promise.resolve(undefined);
+    }
     async resolveDebugConfiguration(config, workspaceFolderUri) {
         return this.registry.resolveDebugConfiguration(config, workspaceFolderUri);
     }

package/lib/node/debug-service-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-service-impl.js","sourceRoot":"","sources":["../../src/node/debug-service-impl.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;;;;;;;;;;;;AAEhF,4DAAkE;AAKlE,mFAA6E;AAC7E,+FAAyF;AAEzF;;GAEG;AAEH,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QA2CuB,aAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAmCpD,CAAC;IAtEG,OAAO;QACH,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAED,uBAAuB,CAAC,QAAgB;QACpC,OAAO,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,mBAAmB,CAAC,SAAiB;QACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAED,wBAAwB;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,wBAAwB,EAAE,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,SAAiB;QAC5C,sEAAsE;QACtE,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,SAAiB,EAAE,kBAA2B;QAC3E,OAAO,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACnF,CAAC;IACD,KAAK,CAAC,yBAAyB,CAAC,MAA0B,EAAE,kBAA2B;QACnF,OAAO,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC/E,CAAC;IACD,KAAK,CAAC,iDAAiD,CAAC,MAA0B,EAAE,kBAA2B;QAC3G,OAAO,IAAI,CAAC,QAAQ,CAAC,iDAAiD,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACvG,CAAC;IAGD,KAAK,CAAC,kBAAkB,CAAC,MAA0B,EAAE,mBAA4B;QAC7E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,SAAkB;QAC1C,IAAI,SAAS,EAAE;YACX,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;aAAM;YACH,MAAM,QAAQ,GAAoB,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACtB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC5B,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;oBACtB,IAAI;wBACA,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;qBAC9B;oBAAC,OAAO,CAAC,EAAE;wBACR,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;qBACrD;gBACL,CAAC,CAAC,EAAE,CAAC,CAAC;aACT;YACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC/B;IACL,CAAC;IACS,KAAK,CAAC,MAAM,CAAC,SAAiB;QACpC,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAChC,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;SAC7B;IACL,CAAC;CAEJ,CAAA;AA3EG;IADC,IAAA,kBAAM,EAAC,0DAA0B,CAAC;8BACA,0DAA0B;wDAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,sEAAgC,CAAC;8BACZ,sEAAgC;kDAAC;AANrD,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CA8E5B;AA9EY,4CAAgB"}
+{"version":3,"file":"debug-service-impl.js","sourceRoot":"","sources":["../../src/node/debug-service-impl.ts"],"names":[],"mappings":"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"}

package/lib/node/stream-debug-adapter.d.ts

@@ -4,7 +4,7 @@ import { Event } from '@theia/core/lib/common/event';
 import { ChildProcess } from 'child_process';
 import * as stream from 'stream';
 import * as net from 'net';
-import { DebugAdapter } from './debug-model';
+import { DebugAdapter } from '../common/debug-model';
 declare abstract class StreamDebugAdapter extends DisposableCollection {
     private fromAdapter;
     private toAdapter;

package/lib/node/stream-debug-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-debug-adapter.d.ts","sourceRoot":"","sources":["../../src/node/stream-debug-adapter.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAW,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,uBAAe,kBAAmB,SAAQ,oBAAoB;IAc9C,OAAO,CAAC,WAAW;IAAmB,OAAO,CAAC,SAAS;IAbnE,OAAO,CAAC,sBAAsB,CAAyB;IACvD,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAqC;IACrE,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAA2B;IAChD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAA2B;IAG/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAoB;IACjD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,MAAM,CAA2B;gBAErB,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAU,SAAS,EAAE,MAAM,CAAC,QAAQ;IASpF,YAAY,IAAI,IAAI;IAIpB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM3B,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CA0C3C;AAED,qBAAa,mBAAoB,SAAQ,kBAAmB,YAAW,YAAY;IAC/E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAC7B,OAAO,EAAE,YAAY;IAK3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAI9B;AAED,qBAAa,kBAAmB,SAAQ,kBAAmB,YAAW,YAAY;IAC9E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;gBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;IAK9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAKxB"}
+{"version":3,"file":"stream-debug-adapter.d.ts","sourceRoot":"","sources":["../../src/node/stream-debug-adapter.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAW,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,uBAAe,kBAAmB,SAAQ,oBAAoB;IAc9C,OAAO,CAAC,WAAW;IAAmB,OAAO,CAAC,SAAS;IAbnE,OAAO,CAAC,sBAAsB,CAAyB;IACvD,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAqC;IACrE,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAA2B;IAChD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAA2B;IAG/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAoB;IACjD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,MAAM,CAA2B;gBAErB,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAU,SAAS,EAAE,MAAM,CAAC,QAAQ;IASpF,YAAY,IAAI,IAAI;IAIpB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM3B,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CA0C3C;AAED,qBAAa,mBAAoB,SAAQ,kBAAmB,YAAW,YAAY;IAC/E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAC7B,OAAO,EAAE,YAAY;IAK3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAI9B;AAED,qBAAa,kBAAmB,SAAQ,kBAAmB,YAAW,YAAY;IAC9E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;gBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;IAK9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAKxB"}

package/lib/node/vscode/vscode-debug-adapter-contribution.d.ts

@@ -1,4 +1,4 @@
-import { DebugAdapterExecutable, DebugAdapterContribution } from '../debug-model';
+import { DebugAdapterExecutable, DebugAdapterContribution } from '../../common/debug-model';
 import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
 export interface VSCodeExtensionPackage {
     contributes: {

package/lib/node/vscode/vscode-debug-adapter-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vscode-debug-adapter-contribution.d.ts","sourceRoot":"","sources":["../../../src/node/vscode/vscode-debug-adapter-contribution.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAgBrF,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE;QACT,SAAS,EAAE,0BAA0B,EAAE,CAAA;KAC1C,CAAA;CACJ;AACD,MAAM,WAAW,yCAAyC;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AACD,MAAM,WAAW,0BAA2B,SAAQ,yCAAyC;IACzF,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,qBAAqB,CAAC,EAAE,kBAAkB,EAAE,CAAA;IAC5C,uBAAuB,CAAC,EAAE;QACtB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAAA;KACjC,CAAA;IACD,GAAG,CAAC,EAAE,yCAAyC,CAAC;IAChD,MAAM,CAAC,EAAE,yCAAyC,CAAC;IACnD,OAAO,CAAC,EAAE,yCAAyC,CAAC;IACpD,GAAG,CAAC,EAAE,yCAAyC,CAAC;IAChD,KAAK,CAAC,EAAE,yCAAyC,CAAC;CACrD;AAED,yBAAiB,0BAA0B,CAAC;IACxC,SAAgB,cAAc,CAAC,UAAU,EAAE,0BAA0B,GAAG,yCAAyC,GAAG,SAAS,CAW5H;CACJ;AAED,8BACsB,sCAAuC,YAAW,wBAAwB;IAU3E,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,MAAM;IAT/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAE7E,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;gBAGxB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM;cAU/B,KAAK,IAAI,OAAO,CAAC,sBAAsB,CAAC;cAexC,2BAA2B,IAAI,OAAO,CAAC,0BAA0B,CAAC;IASlF,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,SAAS,CAAC;IACzD,mBAAmB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;cAGnC,uBAAuB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAsF3D,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAKzD,6BAA6B,IAAI,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;CA+BrF"}
+{"version":3,"file":"vscode-debug-adapter-contribution.d.ts","sourceRoot":"","sources":["../../../src/node/vscode/vscode-debug-adapter-contribution.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAE5F,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAgBrF,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE;QACT,SAAS,EAAE,0BAA0B,EAAE,CAAA;KAC1C,CAAA;CACJ;AACD,MAAM,WAAW,yCAAyC;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AACD,MAAM,WAAW,0BAA2B,SAAQ,yCAAyC;IACzF,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,qBAAqB,CAAC,EAAE,kBAAkB,EAAE,CAAA;IAC5C,uBAAuB,CAAC,EAAE;QACtB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAAA;KACjC,CAAA;IACD,GAAG,CAAC,EAAE,yCAAyC,CAAC;IAChD,MAAM,CAAC,EAAE,yCAAyC,CAAC;IACnD,OAAO,CAAC,EAAE,yCAAyC,CAAC;IACpD,GAAG,CAAC,EAAE,yCAAyC,CAAC;IAChD,KAAK,CAAC,EAAE,yCAAyC,CAAC;CACrD;AAED,yBAAiB,0BAA0B,CAAC;IACxC,SAAgB,cAAc,CAAC,UAAU,EAAE,0BAA0B,GAAG,yCAAyC,GAAG,SAAS,CAW5H;CACJ;AAED,8BACsB,sCAAuC,YAAW,wBAAwB;IAU3E,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,MAAM;IAT/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAE7E,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;gBAGxB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM;cAU/B,KAAK,IAAI,OAAO,CAAC,sBAAsB,CAAC;cAexC,2BAA2B,IAAI,OAAO,CAAC,0BAA0B,CAAC;IASlF,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,SAAS,CAAC;IACzD,mBAAmB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;cAGnC,uBAAuB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAsF3D,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAKzD,6BAA6B,IAAI,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;CA+BrF"}

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@theia/debug",
-  "version": "1.27.0-next.7+5f887e22825",
+  "version": "1.27.0-next.72+1af3f9e1a07",
   "description": "Theia - Debug Extension",
   "dependencies": {
-    "@theia/console": "1.27.0-next.7+5f887e22825",
-    "@theia/core": "1.27.0-next.7+5f887e22825",
-    "@theia/editor": "1.27.0-next.7+5f887e22825",
-    "@theia/filesystem": "1.27.0-next.7+5f887e22825",
-    "@theia/markers": "1.27.0-next.7+5f887e22825",
-    "@theia/monaco": "1.27.0-next.7+5f887e22825",
+    "@theia/console": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/core": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/editor": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/filesystem": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/markers": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/monaco": "1.27.0-next.72+1af3f9e1a07",
     "@theia/monaco-editor-core": "1.65.2",
-    "@theia/output": "1.27.0-next.7+5f887e22825",
-    "@theia/process": "1.27.0-next.7+5f887e22825",
-    "@theia/task": "1.27.0-next.7+5f887e22825",
-    "@theia/terminal": "1.27.0-next.7+5f887e22825",
-    "@theia/variable-resolver": "1.27.0-next.7+5f887e22825",
-    "@theia/workspace": "1.27.0-next.7+5f887e22825",
+    "@theia/output": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/process": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/task": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/terminal": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/variable-resolver": "1.27.0-next.72+1af3f9e1a07",
+    "@theia/workspace": "1.27.0-next.72+1af3f9e1a07",
     "jsonc-parser": "^2.2.0",
     "mkdirp": "^0.5.0",
     "p-debounce": "^2.1.0",
@@ -68,5 +68,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "5f887e22825c7284b16104b517678ca0a2824319"
+  "gitHead": "1af3f9e1a071c3c818395f575940372e429a342f"
 }

package/src/browser/console/debug-console-contribution.tsx

@@ -189,7 +189,7 @@ export class DebugConsoleContribution extends AbstractViewContribution<ConsoleWi
         return <SelectComponent
             key="debugConsoleSeverity"
             options={severityElements}
-            value={this.consoleSessionManager.severity || Severity.Ignore}
+            defaultValue={this.consoleSessionManager.severity || Severity.Ignore}
             onChange={this.changeSeverity} />;
     }
 
@@ -207,7 +207,7 @@ export class DebugConsoleContribution extends AbstractViewContribution<ConsoleWi
         return <SelectComponent
             key="debugConsoleSelector"
             options={availableConsoles}
-            value={0}
+            defaultValue={0}
             onChange={this.changeDebugConsole} />;
     }
 

package/src/browser/debug-call-stack-item-type-key.ts

@@ -17,4 +17,4 @@
 import { ContextKey } from '@theia/core/lib/browser/context-key-service';
 
 export const DebugCallStackItemTypeKey = Symbol('DebugCallStackItemTypeKey');
-export type DebugCallStackItemTypeKey = ContextKey<'session' | 'thread' | 'stackFrame'>;
+export type DebugCallStackItemTypeKey = ContextKey<'session' | 'thread' | 'stackFrame'>;

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

@@ -86,10 +86,16 @@ export class DebugConfigurationManager {
         return this.onWillProvideDynamicDebugConfigurationEmitter.event;
     }
 
+    get onDidChangeConfigurationProviders(): Event<void> {
+        return this.debug.onDidChangeDebugConfigurationProviders;
+    }
+
     protected debugConfigurationTypeKey: ContextKey<string>;
 
     protected initialized: Promise<void>;
 
+    protected recentDynamicOptionsTracker: DebugSessionOptions[] = [];
+
     @postConstruct()
     protected async init(): Promise<void> {
         this.debugConfigurationTypeKey = this.contextKeyService.createKey<string>('debugConfigurationType', undefined);
@@ -126,6 +132,9 @@ export class DebugConfigurationManager {
         this.updateCurrent();
     }, 500);
 
+    /**
+     * All _non-dynamic_ debug configurations.
+     */
     get all(): IterableIterator<DebugSessionOptions> {
         return this.getAll();
     }
@@ -160,11 +169,61 @@ export class DebugConfigurationManager {
     get current(): DebugSessionOptions | undefined {
         return this._currentOptions;
     }
+
+    async getSelectedConfiguration(): Promise<DebugSessionOptions | undefined> {
+        // providerType applies to dynamic configurations only
+        if (!this._currentOptions?.providerType) {
+            return this._currentOptions;
+        }
+
+        // Refresh a dynamic configuration from the provider.
+        // This allow providers to update properties before the execution e.g. program
+        const { providerType, configuration: { name } } = this._currentOptions;
+        const configuration = await this.fetchDynamicDebugConfiguration(name, providerType);
+
+        if (!configuration) {
+            const message = nls.localize(
+                'theia/debug/missingConfiguration',
+                "Dynamic configuration '{0}:{1}' is missing or not applicable", providerType, name);
+            throw new Error(message);
+        }
+
+        return { configuration, providerType };
+    }
+
     set current(option: DebugSessionOptions | undefined) {
         this.updateCurrent(option);
+        this.updateRecentlyUsedDynamicConfigurationOptions(option);
+    }
+
+    protected updateRecentlyUsedDynamicConfigurationOptions(option: DebugSessionOptions | undefined): void {
+        if (option?.providerType) { // if it's a dynamic configuration option
+            // Removing an item already present in the list
+            const index = this.recentDynamicOptionsTracker.findIndex(item => this.dynamicOptionsMatch(item, option));
+            if (index > -1) {
+                this.recentDynamicOptionsTracker.splice(index, 1);
+            }
+            // Adding new item, most recent at the top of the list
+            const recentMax = 3;
+            if (this.recentDynamicOptionsTracker.unshift(option) > recentMax) {
+                // Keep the latest 3 dynamic configuration options to not clutter the dropdown.
+                this.recentDynamicOptionsTracker.splice(recentMax);
+            }
+        }
     }
+
+    protected dynamicOptionsMatch(one: DebugSessionOptions, other: DebugSessionOptions): boolean {
+        return one.providerType !== undefined
+        && one.configuration.name === other.configuration.name
+        && one.providerType === other.providerType;
+    }
+
+    get recentDynamicOptions(): readonly DebugSessionOptions[] {
+        return this.recentDynamicOptionsTracker;
+    }
+
     protected updateCurrent(options: DebugSessionOptions | undefined = this._currentOptions): void {
-        this._currentOptions = options && !options.configuration.dynamic ? this.find(options.configuration.name, options.workspaceFolderUri) : options;
+        this._currentOptions = options && this.find(options.configuration, options.workspaceFolderUri, options.providerType);
 
         if (!this._currentOptions) {
             const model = this.getModel();
@@ -181,7 +240,24 @@ export class DebugConfigurationManager {
         this.debugConfigurationTypeKey.set(this.current && this.current.configuration.type);
         this.onDidChangeEmitter.fire(undefined);
     }
-    find(name: string, workspaceFolderUri: string | undefined): DebugSessionOptions | undefined {
+
+    /**
+     * @deprecated since v1.27.0
+     */
+    find(name: string, workspaceFolderUri: string): DebugSessionOptions | undefined;
+    /**
+     * 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;
         for (const model of this.models.values()) {
             if (model.workspaceFolderUri === workspaceFolderUri) {
                 for (const configuration of model.configurations) {
@@ -194,7 +270,6 @@ export class DebugConfigurationManager {
                 }
             }
         }
-        return undefined;
     }
 
     async openConfiguration(): Promise<void> {
@@ -349,7 +424,13 @@ export class DebugConfigurationManager {
         return this.debug.provideDynamicDebugConfigurations!();
     }
 
+    async fetchDynamicDebugConfiguration(name: string, type: string): Promise<DebugConfiguration | undefined> {
+        await this.fireWillProvideDynamicDebugConfiguration();
+        return this.debug.fetchDynamicDebugConfiguration(name, type);
+    }
+
     protected async fireWillProvideDynamicDebugConfiguration(): Promise<void> {
+        await this.initialized;
         await WaitUntilEvent.fire(this.onWillProvideDynamicDebugConfigurationEmitter, {});
     }
 
@@ -384,29 +465,43 @@ export class DebugConfigurationManager {
     async load(): Promise<void> {
         await this.initialized;
         const data = await this.storage.getData<DebugConfigurationManager.Data>('debug.configurations', {});
-        if (data.current) {
-            this.current = this.find(data.current.name, data.current.workspaceFolderUri);
+        this.resolveRecentDynamicOptionsFromData(data.recentDynamicOptions);
+
+        // 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) {
+            this.current = this.find(data.current.configuration, data.current.workspaceFolderUri, data.current.providerType);
+        }
+    }
+
+    protected resolveRecentDynamicOptionsFromData(options?: DebugSessionOptions[]): void {
+        if (!options || this.recentDynamicOptionsTracker.length !== 0) {
+            return;
         }
+
+        this.recentDynamicOptionsTracker = options;
     }
 
     save(): void {
         const data: DebugConfigurationManager.Data = {};
-        const { current } = this;
+        const { current, recentDynamicOptionsTracker } = this;
         if (current) {
-            data.current = {
-                name: current.configuration.name,
-                workspaceFolderUri: current.workspaceFolderUri
-            };
+            data.current = current;
         }
-        this.storage.setData('debug.configurations', data);
-    }
 
+        if (this.recentDynamicOptionsTracker.length > 0) {
+            data.recentDynamicOptions = recentDynamicOptionsTracker;
+        }
+
+        if (Object.keys(data).length > 0) {
+            this.storage.setData('debug.configurations', data);
+        }
+    }
 }
+
 export namespace DebugConfigurationManager {
     export interface Data {
-        current?: {
-            name: string
-            workspaceFolderUri?: string
-        }
+        current?: DebugSessionOptions,
+        recentDynamicOptions?: DebugSessionOptions[]
     }
 }

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

@@ -14,11 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { AbstractViewContribution, ApplicationShell, KeybindingRegistry, Widget, CompositeTreeNode, LabelProvider, codicon } from '@theia/core/lib/browser';
+import { AbstractViewContribution, KeybindingRegistry, Widget, CompositeTreeNode, LabelProvider, codicon } from '@theia/core/lib/browser';
 import { injectable, inject } from '@theia/core/shared/inversify';
 import * as monaco from '@theia/monaco-editor-core';
 import { MenuModelRegistry, CommandRegistry, MAIN_MENU_BAR, Command, Emitter, Mutable } from '@theia/core/lib/common';
-import { DebugViewLocation } from '../common/debug-configuration';
 import { EditorKeybindingContexts, EditorManager } from '@theia/editor/lib/browser';
 import { DebugSessionManager } from './debug-session-manager';
 import { DebugWidget } from './view/debug-widget';
@@ -34,7 +33,7 @@ import { DebugStackFramesWidget } from './view/debug-stack-frames-widget';
 import { DebugStackFrame } from './model/debug-stack-frame';
 import { DebugVariablesWidget } from './view/debug-variables-widget';
 import { DebugVariable } from './console/debug-console-items';
-import { DebugSessionWidget, DebugSessionWidgetFactory } from './view/debug-session-widget';
+import { DebugSessionWidget } from './view/debug-session-widget';
 import { DebugKeybindingContexts } from './debug-keybinding-contexts';
 import { DebugEditorModel } from './editor/debug-editor-model';
 import { DebugEditorService } from './editor/debug-editor-service';
@@ -334,15 +333,6 @@ export namespace DebugSessionContextCommands {
     export const REVEAL = {
         id: 'debug.session.context.reveal'
     };
-    export const OPEN_LEFT = {
-        id: 'debug.session.context.openLeft'
-    };
-    export const OPEN_RIGHT = {
-        id: 'debug.session.context.openRight'
-    };
-    export const OPEN_BOTTOM = {
-        id: 'debug.session.context.openBottom'
-    };
 }
 export namespace DebugEditorContextCommands {
     export const ADD_BREAKPOINT = {
@@ -403,9 +393,6 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
     @inject(BreakpointManager)
     protected readonly breakpointManager: BreakpointManager;
 
-    @inject(DebugSessionWidgetFactory)
-    protected readonly sessionWidgetFactory: DebugSessionWidgetFactory;
-
     @inject(DebugEditorService)
     protected readonly editors: DebugEditorService;
 
@@ -556,12 +543,7 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
             { ...DebugCommands.STOP, ...DebugSessionContextCommands.STOP },
             { ...DebugThreadContextCommands.TERMINATE, label: nls.localizeByDefault('Terminate Thread') }
         );
-        registerMenuActions(DebugThreadsWidget.OPEN_MENU,
-            { ...DebugSessionContextCommands.REVEAL, label: nls.localize('theia/debug/reveal', 'Reveal') },
-            { ...DebugSessionContextCommands.OPEN_LEFT, label: nls.localize('theia/debug/openLeft', 'Open Left') },
-            { ...DebugSessionContextCommands.OPEN_RIGHT, label: nls.localize('theia/debug/openRight', 'Open Right') },
-            { ...DebugSessionContextCommands.OPEN_BOTTOM, label: nls.localize('theia/debug/openBottom', 'Open Bottom') }
-        );
+        registerMenuActions(DebugThreadsWidget.OPEN_MENU, { ...DebugSessionContextCommands.REVEAL, label: nls.localize('theia/debug/reveal', 'Reveal') });
 
         registerMenuActions(DebugStackFramesWidget.CONTEXT_MENU,
             DebugCommands.RESTART_FRAME,
@@ -721,31 +703,9 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
         });
         registry.registerCommand(DebugSessionContextCommands.REVEAL, {
             execute: () => this.selectedSession && this.revealSession(this.selectedSession),
-            isEnabled: () => this.hasSessionWidget,
-            isVisible: () => !this.selectedThread && this.hasSessionWidget
-        });
-        registry.registerCommand(DebugSessionContextCommands.OPEN_LEFT, {
-            execute: () => this.selectedSession && this.openSession(this.selectedSession, {
-                debugViewLocation: 'left'
-            }),
-            isEnabled: () => !this.hasSessionWidget,
-            isVisible: () => !this.selectedThread && !this.hasSessionWidget
-        });
-        registry.registerCommand(DebugSessionContextCommands.OPEN_RIGHT, {
-            execute: () => this.selectedSession && this.openSession(this.selectedSession, {
-                debugViewLocation: 'right'
-            }),
-            isEnabled: () => !this.hasSessionWidget,
-            isVisible: () => !this.selectedThread && !this.hasSessionWidget
-        });
-        registry.registerCommand(DebugSessionContextCommands.OPEN_BOTTOM, {
-            execute: () => this.selectedSession && this.openSession(this.selectedSession, {
-                debugViewLocation: 'bottom'
-            }),
-            isEnabled: () => !this.hasSessionWidget,
-            isVisible: () => !this.selectedThread && !this.hasSessionWidget
+            isEnabled: () => Boolean(this.selectedSession),
+            isVisible: () => !this.selectedThread && Boolean(this.selectedSession)
         });
-
         registry.registerCommand(DebugCommands.TOGGLE_BREAKPOINT, {
             execute: () => this.editors.toggleBreakpoint(),
             isEnabled: () => !!this.editors.model
@@ -1131,43 +1091,23 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
         });
     }
 
-    protected readonly sessionWidgets = new Map<string, DebugSessionWidget>();
-    get hasSessionWidget(): boolean {
-        return !!this.selectedSession && this.sessionWidgets.has(this.selectedSession.label);
-    }
     protected async openSession(
         session: DebugSession,
         options?: {
-            debugViewLocation?: DebugViewLocation;
             reveal?: boolean;
         }
     ): Promise<DebugWidget | DebugSessionWidget> {
-        const { debugViewLocation, reveal } = {
-            debugViewLocation: session.configuration.debugViewLocation || this.preference['debug.debugViewLocation'],
+        const { reveal } = {
             reveal: true,
             ...options
         };
-        const sessionWidget = this.revealSession(session);
-        if (sessionWidget) {
-            return sessionWidget;
-        }
-        const area = ApplicationShell.isSideArea(debugViewLocation) ? debugViewLocation : 'debug';
-        if (area === 'debug') {
-            return this.openView({ reveal });
-        }
-        const newSessionWidget = this.sessionWidgetFactory({ session });
-        this.sessionWidgets.set(session.label, newSessionWidget);
-        newSessionWidget.disposed.connect(() =>
-            this.sessionWidgets.delete(session.label)
-        );
-        this.shell.addWidget(newSessionWidget, { area });
-        if (reveal) {
-            this.shell.revealWidget(newSessionWidget.id);
-        }
-        return newSessionWidget;
+        const debugWidget = await this.openView({ reveal });
+        debugWidget.sessionManager.currentSession = session;
+        return debugWidget['sessionWidget'];
     }
+
     protected revealSession(session: DebugSession): DebugSessionWidget | undefined {
-        const widget = this.sessionWidgets.get(session.label);
+        const widget = this.tryGetWidget()?.['sessionWidget'];
         if (widget) {
             this.shell.revealWidget(widget.id);
         }

package/src/browser/debug-frontend-module.ts

@@ -39,8 +39,6 @@ import { DebugFrontendApplicationContribution } from './debug-frontend-applicati
 import { DebugConsoleContribution } from './console/debug-console-contribution';
 import { BreakpointManager } from './breakpoint/breakpoint-manager';
 import { DebugEditorService } from './editor/debug-editor-service';
-import { DebugViewOptions } from './view/debug-view-model';
-import { DebugSessionWidget, DebugSessionWidgetFactory } from './view/debug-session-widget';
 import { InDebugModeContext, BreakpointWidgetInputFocusContext, BreakpointWidgetInputStrictFocusContext } from './debug-keybinding-contexts';
 import { DebugEditorModelFactory, DebugEditorModel } from './editor/debug-editor-model';
 import { bindDebugPreferences } from './debug-preferences';
@@ -60,6 +58,9 @@ import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator
 import { DebugTabBarDecorator } from './debug-tab-bar-decorator';
 import { DebugContribution } from './debug-contribution';
 import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
+import { DebugViewModel } from './view/debug-view-model';
+import { DebugToolBar } from './view/debug-toolbar-widget';
+import { DebugSessionWidget } from './view/debug-session-widget';
 
 export default new ContainerModule((bind: interfaces.Bind) => {
     bindContributionProvider(bind, DebugContribution);
@@ -81,9 +82,6 @@ export default new ContainerModule((bind: interfaces.Bind) => {
         return service;
     });
 
-    bind(DebugSessionWidgetFactory).toDynamicValue(({ container }) =>
-        (options: DebugViewOptions) => DebugSessionWidget.createWidget(container, options)
-    ).inSingletonScope();
     bind(WidgetFactory).toDynamicValue(({ container }) => ({
         id: DebugWidget.ID,
         createWidget: () => DebugWidget.createWidget(container)
@@ -124,4 +122,13 @@ export default new ContainerModule((bind: interfaces.Bind) => {
 
     bind(DebugTabBarDecorator).toSelf().inSingletonScope();
     bind(TabBarDecorator).toService(DebugTabBarDecorator);
+
+    bind(DebugViewModel).toSelf().inSingletonScope();
+    bind(DebugToolBar).toSelf().inSingletonScope();
+    for (const subwidget of DebugSessionWidget.subwidgets) {
+        bind(WidgetFactory).toDynamicValue(({ container }) => ({
+            id: subwidget.FACTORY_ID,
+            createWidget: () => subwidget.createWidget(container),
+        }));
+    }
 });

package/src/browser/debug-preferences.ts

@@ -26,11 +26,6 @@ export const debugPreferencesSchema: PreferenceSchema = {
             default: false,
             description: nls.localize('theia/debug/toggleTracing', 'Enable/disable tracing communications with debug adapters')
         },
-        'debug.debugViewLocation': {
-            enum: ['default', 'left', 'right', 'bottom'],
-            default: 'default',
-            description: nls.localize('theia/debug/debugViewLocation', 'Controls the location of the debug view.')
-        },
         'debug.openDebug': {
             enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart', 'openOnDebugBreak'],
             default: 'openOnSessionStart',
@@ -71,7 +66,6 @@ export const debugPreferencesSchema: PreferenceSchema = {
 
 export class DebugConfiguration {
     'debug.trace': boolean;
-    'debug.debugViewLocation': 'default' | 'left' | 'right' | 'bottom';
     'debug.openDebug': 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart' | 'openOnDebugBreak';
     'debug.internalConsoleOptions': 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart';
     'debug.inlineValues': boolean;

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

@@ -123,10 +123,10 @@ export class DebugPrefixConfiguration implements CommandContribution, CommandHan
 
         // Resolve dynamic configurations from providers
         const record = await this.debugConfigurationManager.provideDynamicDebugConfigurations();
-        for (const [type, dynamicConfigurations] of Object.entries(record)) {
+        for (const [providerType, dynamicConfigurations] of Object.entries(record)) {
             if (dynamicConfigurations.length > 0) {
                 items.push({
-                    label: type,
+                    label: providerType,
                     type: 'separator'
                 });
             }
@@ -134,7 +134,7 @@ export class DebugPrefixConfiguration implements CommandContribution, CommandHan
             for (const configuration of dynamicConfigurations) {
                 items.push({
                     label: configuration.name,
-                    execute: () => this.runDynamicConfiguration({ configuration })
+                    execute: () => this.runConfiguration({ configuration, providerType })
                 });
             }
         }
@@ -145,21 +145,13 @@ export class DebugPrefixConfiguration implements CommandContribution, CommandHan
     /**
      * Set the current debug configuration, and execute debug start command.
      *
-     * @param configuration the `DebugSessionOptions`.
+     * @param configurationOptions the `DebugSessionOptions`.
      */
-    protected runConfiguration(configuration: DebugSessionOptions): void {
-        this.debugConfigurationManager.current = { ...configuration };
+    protected runConfiguration(configurationOptions: DebugSessionOptions): void {
+        this.debugConfigurationManager.current = configurationOptions;
         this.commandRegistry.executeCommand(DebugCommands.START.id);
     }
 
-    /**
-     * Execute the debug start command without affecting the current debug configuration
-     * @param configuration the `DebugSessionOptions`.
-     */
-    protected runDynamicConfiguration(configuration: DebugSessionOptions): void {
-        this.commandRegistry.executeCommand(DebugCommands.START.id, configuration);
-    }
-
     /**
      * Handle the visibility of the debug status bar.
      * @param event the preference change event.

package/src/browser/debug-session-connection.ts

@@ -21,7 +21,7 @@ import { Deferred } from '@theia/core/lib/common/promise-util';
 import { Event, Emitter, DisposableCollection, Disposable, MaybePromise } from '@theia/core';
 import { OutputChannel } from '@theia/output/lib/browser/output-channel';
 
-import { Channel } from '../common/debug-service';
+import { DebugChannel } from '../common/debug-service';
 
 export type DebugRequestHandler = (request: DebugProtocol.Request) => MaybePromise<any>;
 
@@ -121,7 +121,7 @@ export class DebugSessionConnection implements Disposable {
     private sequence = 1;
 
     protected readonly pendingRequests = new Map<number, Deferred<DebugProtocol.Response>>();
-    protected readonly connectionPromise: Promise<Channel>;
+    protected readonly connectionPromise: Promise<DebugChannel>;
 
     protected readonly requestHandlers = new Map<string, DebugRequestHandler>();
 
@@ -141,7 +141,7 @@ export class DebugSessionConnection implements Disposable {
 
     constructor(
         readonly sessionId: string,
-        connectionFactory: (sessionId: string) => Promise<Channel>,
+        connectionFactory: (sessionId: string) => Promise<DebugChannel>,
         protected readonly traceOutputChannel: OutputChannel | undefined
     ) {
         this.connectionPromise = this.createConnection(connectionFactory);
@@ -161,7 +161,7 @@ export class DebugSessionConnection implements Disposable {
         this.toDispose.dispose();
     }
 
-    protected async createConnection(connectionFactory: (sessionId: string) => Promise<Channel>): Promise<Channel> {
+    protected async createConnection(connectionFactory: (sessionId: string) => Promise<DebugChannel>): Promise<DebugChannel> {
         const connection = await connectionFactory(this.sessionId);
         connection.onClose(() => {
             this.isClosed = true;