From bacbfd2302c8d5cd4792b20a0756388671438973 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 11 Dec 2019 11:55:54 -0800
Subject: [PATCH] use built-in queue(), pr comments

---
 .../debug/common/abstractDebugAdapter.ts      | 64 ++++++++-----------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts b/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts
index 29b4889ca3f..f060ba6c665 100644
--- a/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts
+++ b/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.ts
@@ -5,7 +5,7 @@
 
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDebugAdapter } from 'vs/workbench/contrib/debug/common/debug';
-import { timeout } from 'vs/base/common/async';
+import { timeout, Queue } from 'vs/base/common/async';
 
 /**
  * Abstract implementation of the low level API for a debug adapter.
@@ -18,7 +18,7 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
 	private requestCallback: ((request: DebugProtocol.Request) => void) | undefined;
 	private eventCallback: ((request: DebugProtocol.Event) => void) | undefined;
 	private messageCallback: ((message: DebugProtocol.ProtocolMessage) => void) | undefined;
-	private readonly queue: DebugProtocol.ProtocolMessage[] = [];
+	private readonly queue = new Queue();
 	protected readonly _onError = new Emitter<Error>();
 	protected readonly _onExit = new Emitter<number | null>();
 
@@ -109,41 +109,33 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
 			this.messageCallback(message);
 		}
 		else {
-			// Artificially queueing protocol messages guarantees that any microtasks for
-			// previous message finish before next message is processed. This is essential
-			// to guarantee ordering when using promises anywhere along the call path.
-			this.queue.push(message);
-			if (this.queue.length === 1) {
-				setTimeout(() => this.processQueue(), 0);
-			}
-		}
-	}
-
-	private processQueue(): void {
-		const message = this.queue!.shift()!;
-		switch (message.type) {
-			case 'event':
-				if (this.eventCallback) {
-					this.eventCallback(<DebugProtocol.Event>message);
-				}
-				break;
-			case 'request':
-				if (this.requestCallback) {
-					this.requestCallback(<DebugProtocol.Request>message);
+			this.queue.queue(() => {
+				switch (message.type) {
+					case 'event':
+						if (this.eventCallback) {
+							this.eventCallback(<DebugProtocol.Event>message);
+						}
+						break;
+					case 'request':
+						if (this.requestCallback) {
+							this.requestCallback(<DebugProtocol.Request>message);
+						}
+						break;
+					case 'response':
+						const response = <DebugProtocol.Response>message;
+						const clb = this.pendingRequests.get(response.request_seq);
+						if (clb) {
+							this.pendingRequests.delete(response.request_seq);
+							clb(response);
+						}
+						break;
 				}
-				break;
-			case 'response':
-				const response = <DebugProtocol.Response>message;
-				const clb = this.pendingRequests.get(response.request_seq);
-				if (clb) {
-					this.pendingRequests.delete(response.request_seq);
-					clb(response);
-				}
-				break;
-		}
 
-		if (this.queue.length) {
-			setTimeout(() => this.processQueue(), 0);
+				// Artificially queueing protocol messages guarantees that any microtasks for
+				// previous message finish before next message is processed. This is essential
+				// to guarantee ordering when using promises anywhere along the call path.
+				return timeout(0);
+			});
 		}
 	}
 
@@ -180,6 +172,6 @@ export abstract class AbstractDebugAdapter implements IDebugAdapter {
 	}
 
 	dispose(): void {
-		// noop
+		this.queue.dispose();
 	}
 }
-- 
GitLab