Avoid thread request if continue hasnt returned #1814

microsoft · Aug 9, 2018 · 69ffb74 · 69ffb74
1 parent 11fdfbd
commit 69ffb74
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Go-latest.vsix b/Go-latest.vsix
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Go",
-  "version": "0.6.86-beta.4",
+  "version": "0.6.86-beta.5",
   "publisher": "ms-vscode",
   "description": "Rich Go language support for Visual Studio Code",
   "author": {

diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
@@ -725,6 +725,11 @@ class GoDebugSession extends DebugSession {
 	}
 
 	protected threadsRequest(response: DebugProtocol.ThreadsResponse): void {
+		if (this.continueRequestRunning) {
+			// Thread request to delve is syncronous and will block if a previous async continue request didnt return
+			response.body = { threads: [] };
+			return this.sendResponse(response);
+		}
 		verbose('ThreadsRequest');
 		this.delve.call<DebugGoroutine[] | ListGoroutinesOut>('ListGoroutines', [], (err, out) => {
 			if (this.debugState.exited) {
@@ -953,10 +958,17 @@ class GoDebugSession extends DebugSession {
 			});
 		}
 	}
-
+	private continueEpoch = 0;
+	private continueRequestRunning = false;
 	protected continueRequest(response: DebugProtocol.ContinueResponse): void {
 		verbose('ContinueRequest');
+		this.continueEpoch++;
+		let closureEpoch = this.continueEpoch;
+		this.continueRequestRunning = true;
 		this.delve.call<DebuggerState | CommandOut>('Command', [{ name: 'continue' }], (err, out) => {
+			if (closureEpoch === this.continueEpoch) {
+				this.continueRequestRunning = false;
+			}
 			if (err) {
 				logError('Failed to continue - ' + err.toString());
 			}