Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

debug: make serverReadyAction multi-session aware

Browse Source 
Fixes #109171
This commit is contained in:
Connor Peet
2021-10-20 16:01:39 -07:00
parent 17dc026824
commit f883017206
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,12 +22,24 @@ interface ServerReadyAction {
name?: string; name?: string;
} }
class Trigger {
private _fired = false;
public get hasFired() {
return this._fired;
}
public fire() {
this._fired = true;
}
}
class ServerReadyDetector extends vscode.Disposable { class ServerReadyDetector extends vscode.Disposable {
private static detectors = new Map<vscode.DebugSession, ServerReadyDetector>(); private static detectors = new Map<vscode.DebugSession, ServerReadyDetector>();
private static terminalDataListener: vscode.Disposable | undefined; private static terminalDataListener: vscode.Disposable | undefined;
private hasFired = false; private trigger: Trigger;
private shellPid?: number; private shellPid?: number;
private regexp: RegExp; private regexp: RegExp;
private disposables: vscode.Disposable[] = []; private disposables: vscode.Disposable[] = [];
@@ -85,6 +97,13 @@ class ServerReadyDetector extends vscode.Disposable {
private constructor(private session: vscode.DebugSession) { private constructor(private session: vscode.DebugSession) {
super(() => this.internalDispose()); super(() => this.internalDispose());
// Re-used the triggered of the parent session, if one exists
if (session.parentSession) {
this.trigger = ServerReadyDetector.start(session.parentSession)?.trigger ?? new Trigger();
} else {
this.trigger = new Trigger();
}
this.regexp = new RegExp(session.configuration.serverReadyAction.pattern || PATTERN, 'i'); this.regexp = new RegExp(session.configuration.serverReadyAction.pattern || PATTERN, 'i');
} }
@@ -94,11 +113,11 @@ class ServerReadyDetector extends vscode.Disposable {
} }
detectPattern(s: string): boolean { detectPattern(s: string): boolean {
if (!this.hasFired) { if (!this.trigger.hasFired) {
const matches = this.regexp.exec(s); const matches = this.regexp.exec(s);
if (matches && matches.length >= 1) { if (matches && matches.length >= 1) {
this.openExternalWithString(this.session, matches.length > 1 ? matches[1] : ''); this.openExternalWithString(this.session, matches.length > 1 ? matches[1] : '');
this.hasFired = true; this.trigger.fire();
this.internalDispose(); this.internalDispose();
return true; return true;
} }