From bd9d26deb328d05ff8efb102f658e933c1dbc4f8 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Mon, 19 May 2025 21:30:24 +0200
Subject: [PATCH] Add pending commands in queue order

---
 .../src/tsServer/requestQueue.ts                          | 8 ++++++--
 .../typescript-language-features/src/tsServer/server.ts   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/src/tsServer/requestQueue.ts b/extensions/typescript-language-features/src/tsServer/requestQueue.ts
index 036f5be9b8e..204e386c1bc 100644
--- a/extensions/typescript-language-features/src/tsServer/requestQueue.ts
+++ b/extensions/typescript-language-features/src/tsServer/requestQueue.ts
@@ -60,9 +60,13 @@ export class RequestQueue {
 		return this.queue.shift();
 	}
 
-	public getQueuedCommands(): string[] {
+	public getQueuedCommands(skipLast: boolean = false): string[] {
 		const result: string[] = [];
-		for (let i = this.queue.length - 1; i >= 0; i--) {
+		const end = skipLast ? this.queue.length - 1 : this.queue.length;
+		if (end <= 0) {
+			return result;
+		}
+		for (let i = 0; i < end; i++) {
 			const item = this.queue[i];
 			result.push(item.request.command);
 			if (result.length >= 5) {
diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts
index 17d87b3f45c..3374adc39e5 100644
--- a/extensions/typescript-language-features/src/tsServer/server.ts
+++ b/extensions/typescript-language-features/src/tsServer/server.ts
@@ -292,7 +292,7 @@ export class SingleTsServer extends Disposable implements ITypeScriptServer {
 				pendingResponses
 			};
 			if (queueLength > 0) {
-				data.queuedCommands = this._requestQueue.getQueuedCommands();
+				data.queuedCommands = this._requestQueue.getQueuedCommands(true);
 			}
 			if (pendingResponses > 0) {
 				data.pendingCommands = this.getPendingCommands();