From 3ba967fd7eb97621b0e2a4fb0267b70323ffcf5f Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 14 Dec 2020 10:39:10 -0800
Subject: [PATCH] ext: log errors running contributed commands to the console
 for debugger vis

---
 src/vs/workbench/api/common/extHostCommands.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
index 649612e38f4..228d60c37fc 100644
--- a/src/vs/workbench/api/common/extHostCommands.ts
+++ b/src/vs/workbench/api/common/extHostCommands.ts
@@ -194,7 +194,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		}
 	}
 
-	private _executeContributedCommand<T>(id: string, args: any[]): Promise<T> {
+	private async _executeContributedCommand<T>(id: string, args: any[]): Promise<T> {
 		const command = this._commands.get(id);
 		if (!command) {
 			throw new Error('Unknown command');
@@ -205,17 +205,17 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 				try {
 					validateConstraint(args[i], description.args[i].constraint);
 				} catch (err) {
-					return Promise.reject(new Error(`Running the contributed command: '${id}' failed. Illegal argument '${description.args[i].name}' - ${description.args[i].description}`));
+					throw new Error(`Running the contributed command: '${id}' failed. Illegal argument '${description.args[i].name}' - ${description.args[i].description}`);
 				}
 			}
 		}
 
 		try {
-			const result = callback.apply(thisArg, args);
-			return Promise.resolve(result);
+			return await callback.apply(thisArg, args);
 		} catch (err) {
+			console.error(err); // so that it shows up in any attached debugger
 			this._logService.error(err, id);
-			return Promise.reject(new Error(`Running the contributed command: '${id}' failed.`));
+			throw new Error(`Running the contributed command: '${id}' failed.`);
 		}
 	}