From 75e1e3a43291ae2c4d045dbdc0938b541aed8783 Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Tue, 26 Mar 2019 22:21:53 +0100 Subject: [PATCH] use case insensitive matches for server ready; fixes #71164 --- extensions/debug-server-ready/src/extension.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/extensions/debug-server-ready/src/extension.ts b/extensions/debug-server-ready/src/extension.ts index 3edfcdc5031..57863fd995c 100644 --- a/extensions/debug-server-ready/src/extension.ts +++ b/extensions/debug-server-ready/src/extension.ts @@ -58,7 +58,7 @@ class ServerReadyDetector extends vscode.Disposable { private constructor(private session: vscode.DebugSession) { super(() => this.internalDispose()); - this.regexp = new RegExp(session.configuration.serverReadyAction.pattern || PATTERN); + this.regexp = new RegExp(session.configuration.serverReadyAction.pattern || PATTERN, 'i'); } private internalDispose() { @@ -198,8 +198,18 @@ function startTrackerForType(context: vscode.ExtensionContext, type: string) { let runInTerminalRequestSeq: number | undefined; return { onDidSendMessage: m => { - if (m.type === 'event' && m.event === 'output' && m.body.output) { - detector.detectPattern(m.body.output); + if (m.type === 'event' && m.event === 'output' && m.body) { + switch (m.body.category) { + case 'console': + case 'stderr': + case 'stdout': + if (m.body.output) { + detector.detectPattern(m.body.output); + } + break; + default: + break; + } } if (m.type === 'request' && m.command === 'runInTerminal' && m.arguments) { if (m.arguments.kind === 'integrated') {