commit f56b715ba72d28c2e801fa9e9ffdb700d520f7ec
author Hana <hyangah@gmail.com> Fri Apr 02 00:30:48 2021 -0400
committer Hyang-Ah Hana Kim <hyangah@gmail.com> Fri Apr 02 16:14:41 2021 +0000
tree c80115c4b93ed66afe7655e5be3dd09dea74846d
parent 471ed7e7a92e5487b86af3c811d4568b6c44bf51

src/goDebugFactory: output dlv dap command as console output event

Change-Id: I332bee23ca6cd2e66d72f46bdce18885e9a892aa
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/306789
Trust: Hyang-Ah Hana Kim <hyangah@gmail.com>
Run-TryBot: Hyang-Ah Hana Kim <hyangah@gmail.com>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Suzy Mueller <suzmue@golang.org>

src/goDebugFactory.ts

diff --git a/src/goDebugFactory.ts b/src/goDebugFactory.ts
index fe23fd1..8005199 100644
--- a/src/goDebugFactory.ts
+++ b/src/goDebugFactory.ts
@@ -186,6 +186,7 @@
 		this.connected = undefined;
 		const dlvDapServer = this.dlvDapServer;
 		if (dlvDapServer.exitCode !== null) {
+			console.log(`dlv dap process(${dlvDapServer.pid}) exited ${dlvDapServer.exitCode}`);
 			return;
 		}
 		await new Promise<void>((resolve) => {
@@ -195,6 +196,7 @@
 				resolve();
 			}, 1_000);
 			dlvDapServer.on('exit', () => {
+				console.log(`dlv dap process(${dlvDapServer.pid}) exited`);
 				clearTimeout(exitTimeoutToken);
 				resolve();
 			});
@@ -204,8 +206,9 @@
 	private async startAndConnectToServer() {
 		const { port, host, dlvDapServer } = await startDapServer(
 			this.config,
-			(msg) => this.stdoutEvent(msg),
-			(msg) => this.stderrEvent(msg)
+			(msg) => this.outputEvent('stdout', msg),
+			(msg) => this.outputEvent('stderr', msg),
+			(msg) => this.outputEvent('console', msg)
 		);
 		const socket = await new Promise<net.Socket>((resolve, reject) => {
 			// eslint-disable-next-line prefer-const
@@ -226,25 +229,19 @@
 		this.start(this.socket, this.socket);
 	}
 
-	stdoutEvent(output: string, data?: any) {
+	private outputEvent(dest: string, output: string, data?: any) {
 		this.sendMessageToClient(new OutputEvent(output, 'stdout', data));
 		if (this.outputToConsole) {
 			console.log(output);
 		}
 	}
-
-	stderrEvent(output: string, data?: any) {
-		this.sendMessageToClient(new OutputEvent(output, 'stderr', data));
-		if (this.outputToConsole) {
-			console.error(output);
-		}
-	}
 }
 
 export async function startDapServer(
 	configuration: vscode.DebugConfiguration,
 	log?: (msg: string) => void,
-	logErr?: (msg: string) => void
+	logErr?: (msg: string) => void,
+	logConsole?: (msg: string) => void
 ): Promise<{ port: number; host: string; dlvDapServer?: ChildProcessWithoutNullStreams }> {
 	const host = configuration.host || '127.0.0.1';
 
@@ -260,7 +257,10 @@
 	if (!logErr) {
 		logErr = appendToDebugConsole;
 	}
-	const dlvDapServer = await spawnDlvDapServerProcess(configuration, host, port, log, logErr);
+	if (!logConsole) {
+		logConsole = appendToDebugConsole;
+	}
+	const dlvDapServer = await spawnDlvDapServerProcess(configuration, host, port, log, logErr, logConsole);
 	return { dlvDapServer, port, host };
 }
 
@@ -269,7 +269,8 @@
 	host: string,
 	port: number,
 	log: (msg: string) => void,
-	logErr: (msg: string) => void
+	logErr: (msg: string) => void,
+	logConsole: (msg: string) => void
 ): Promise<ChildProcess> {
 	const launchArgsEnv = launchArgs.env || {};
 	const env = Object.assign({}, process.env, launchArgsEnv);
@@ -301,7 +302,7 @@
 	if (launchArgs.logOutput) {
 		dlvArgs.push('--log-output=' + launchArgs.logOutput);
 	}
-	log(`Running: ${dlvPath} ${dlvArgs.join(' ')}`);
+	logConsole(`Running: ${dlvPath} ${dlvArgs.join(' ')}\n`);
 
 	const dir = parseProgramArgSync(launchArgs).dirname;
 	// TODO(hyangah): determine the directories: