Merge pull request #2164 from github/koesie10/unify-command-runners

Unify `commandRunner` implementations

Author: koesie10

extensions/ql-vscode/src/commandRunner.ts

@@ -121,6 +121,7 @@ export function withProgress<R>(
 export function commandRunner(
   commandId: string,
   task: NoProgressTask,
+  outputLogger = extLogger,
 ): Disposable {
   return commands.registerCommand(commandId, async (...args: any[]) => {
     const startTime = Date.now();
@@ -137,16 +138,19 @@ export function commandRunner(
       if (e instanceof UserCancellationException) {
         // User has cancelled this action manually
         if (e.silent) {
-          void extLogger.log(errorMessage.fullMessage);
+          void outputLogger.log(errorMessage.fullMessage);
         } else {
-          void showAndLogWarningMessage(errorMessage.fullMessage);
+          void showAndLogWarningMessage(errorMessage.fullMessage, {
+            outputLogger,
+          });
         }
       } else {
         // Include the full stack in the error log only.
         const fullMessage = errorStack
           ? `${errorMessage.fullMessage}\n${errorStack}`
           : errorMessage.fullMessage;
         void showAndLogExceptionWithTelemetry(errorMessage, {
+          outputLogger,
           fullMessage,
           extraTelemetryProperties: {
             command: commandId,
@@ -177,49 +181,18 @@ export function commandRunnerWithProgress<R>(
   progressOptions: Partial<ProgressOptions>,
   outputLogger = extLogger,
 ): Disposable {
-  return commands.registerCommand(commandId, async (...args: any[]) => {
-    const startTime = Date.now();
-    let error: Error | undefined;
-    const progressOptionsWithDefaults = {
-      location: ProgressLocation.Notification,
-      ...progressOptions,
-    };
-    try {
-      return await withProgress(progressOptionsWithDefaults, task, ...args);
-    } catch (e) {
-      error = asError(e);
-      const errorMessage = redactableError`${
-        getErrorMessage(e) || e
-      } (${commandId})`;
-      const errorStack = getErrorStack(e);
-      if (e instanceof UserCancellationException) {
-        // User has cancelled this action manually
-        if (e.silent) {
-          void outputLogger.log(errorMessage.fullMessage);
-        } else {
-          void showAndLogWarningMessage(errorMessage.fullMessage, {
-            outputLogger,
-          });
-        }
-      } else {
-        // Include the full stack in the error log only.
-        const fullMessage = errorStack
-          ? `${errorMessage.fullMessage}\n${errorStack}`
-          : errorMessage.fullMessage;
-        void showAndLogExceptionWithTelemetry(errorMessage, {
-          outputLogger,
-          fullMessage,
-          extraTelemetryProperties: {
-            command: commandId,
-          },
-        });
-      }
-      return undefined;
-    } finally {
-      const executionTime = Date.now() - startTime;
-      telemetryListener?.sendCommandUsage(commandId, executionTime, error);
-    }
-  });
+  return commandRunner(
+    commandId,
+    async (...args: any[]) => {
+      const progressOptionsWithDefaults = {
+        location: ProgressLocation.Notification,
+        ...progressOptions,
+      };
+
+      return withProgress(progressOptionsWithDefaults, task, ...args);
+    },
+    outputLogger,
+  );
 }
 
 /**