Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for running DebugConfigurations with serverReadyAction (#197597)

Browse Source 
* Add support for running DebugConfigurations with serverReadyAction

This PR adds 'config' as an option for serverReadyAction. It runs
similar to 'name', but if a configuration is generated on the fly, its
easier to inject the debug configurations with the serverReadyAction.

* Merge into startDebugSession method

---------

Co-authored-by: Rob Lourens <roblourens@gmail.com>
This commit is contained in:
Andrew Wang
2023-11-22 11:41:19 -08:00
committed by GitHub
parent 567021733a
commit 452b754c5e
3 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/debug-server-ready/src/extension.ts
View File

@@ -18,6 +18,7 @@ interface ServerReadyAction {
uriFormat?: string;
webRoot?: string;
name?: string;
config?: vscode.DebugConfiguration;
killOnServerStop?: boolean;
}
@@ -194,7 +195,11 @@ class ServerReadyDetector extends vscode.Disposable {
break;
case 'startDebugging':
await this.startNamedDebugSession(session, args.name || 'unspecified');
if (args.config) {
await this.startDebugSession(session, args.config.name, args.config);
} else {
await this.startDebugSession(session, args.name || 'unspecified');
}
break;
default:
@@ -246,17 +251,24 @@ class ServerReadyDetector extends vscode.Disposable {
});
}
private async startNamedDebugSession(session: vscode.DebugSession, name: string) {
/**
* Starts a debug session given a debug configuration name (saved in launch.json) or a debug configuration object.
*
* @param session The parent debugSession
* @param name The name of the configuration to launch. If config it set, it assumes it is the same as config.name.
* @param config [Optional] Instead of starting a debug session by debug configuration name, use a debug configuration object instead.
*/
private async startDebugSession(session: vscode.DebugSession, name: string, config?: vscode.DebugConfiguration) {
const args = session.configuration.serverReadyAction as ServerReadyAction;
if (!args.killOnServerStop) {
await vscode.debug.startDebugging(session.workspaceFolder, name);
await vscode.debug.startDebugging(session.workspaceFolder, config ?? name);
return;
}
const cts = new vscode.CancellationTokenSource();
const newSessionPromise = this.catchStartedDebugSession(x => x.name === name, cts.token);
if (!await vscode.debug.startDebugging(session.workspaceFolder, name)) {
if (!await vscode.debug.startDebugging(session.workspaceFolder, config ?? name)) {
cts.cancel();
cts.dispose();
return;