Kill manually if we dont hear back from delve in a sec #1814

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Go",
-  "version": "0.6.86-beta.3",
+  "version": "0.6.86-beta.4",
   "publisher": "ms-vscode",
   "description": "Rich Go language support for Visual Studio Code",
   "author": {

src/debugAdapter/goDebug.ts

@@ -566,11 +566,10 @@ class GoDebugSession extends DebugSession {
 		this.delve.onclose = (code) => {
 			if (code !== 0) {
 				this.sendErrorResponse(response, 3000, 'Failed to continue: Check the debug console for details.');
-			} else {
-				this.sendEvent(new TerminatedEvent());
-				verbose('TerminatedEvent');
 			}
-			verbose('Delve is closed');
+
+			verbose('Sending TerminatedEvent as delve is closed');
+			this.sendEvent(new TerminatedEvent());
 		};
 
 		this.delve.connection.then(() => {
@@ -601,7 +600,19 @@ class GoDebugSession extends DebugSession {
 
 	protected disconnectRequest(response: DebugProtocol.DisconnectResponse, args: DebugProtocol.DisconnectArguments): void {
 		verbose('DisconnectRequest');
-		this.delve.close().then(() => {
+		const closeDelvePromise = new Promise((resolve, reject) => {
+			setTimeout(() => {
+				if (this.delve.debugProcess) {
+					verbose('Killing debug process manually as we didnt hear back from delve in time');
+					killTree(this.delve.debugProcess.pid);
+				}
+				resolve();
+			}, 1000);
+
+			this.delve.close().then(() => resolve(), reject);
+		});
+
+		closeDelvePromise.then(() => {
 			verbose('DisconnectRequest to parent');
 			super.disconnectRequest(response, args);
 			verbose('DisconnectResponse');
@@ -1036,4 +1047,24 @@ function random(low: number, high: number): number {
 	return Math.floor(Math.random() * (high - low) + low);
 }
 
+function killTree(processId: number): void {
+	if (process.platform === 'win32') {
+		const TASK_KILL = 'C:\\Windows\\System32\\taskkill.exe';
+
+		// when killing a process in Windows its child processes are *not* killed but become root processes.
+		// Therefore we use TASKKILL.EXE
+		try {
+			execSync(`${TASK_KILL} /F /T /PID ${processId}`);
+		} catch (err) {
+		}
+	} else {
+		// on linux and OS X we kill all direct and indirect child processes as well
+		try {
+			const cmd = path.join(__dirname, '../../../scripts/terminateProcess.sh');
+			spawnSync(cmd, [processId.toString()]);
+		} catch (err) {
+		}
+	}
+}
+
 DebugSession.run(GoDebugSession);