Move withProgress out of loadExternalApiUsages

Author: robertbrignull

extensions/ql-vscode/src/model-editor/model-editor-view.ts

@@ -190,7 +190,10 @@ export class ModelEditorView extends AbstractWebview<
 
         break;
       case "refreshMethods":
-        await this.loadExternalApiUsages();
+        await withProgress((progress) => this.loadExternalApiUsages(progress), {
+          cancellable: false,
+        });
+
         void telemetryListener?.sendUIInteraction(
           "model-editor-refresh-methods",
         );
@@ -212,7 +215,12 @@ export class ModelEditorView extends AbstractWebview<
           this.cliServer,
           this.app.logger,
         );
-        await Promise.all([this.setViewState(), this.loadExternalApiUsages()]);
+        await Promise.all([
+          this.setViewState(),
+          withProgress((progress) => this.loadExternalApiUsages(progress), {
+            cancellable: false,
+          }),
+        ]);
         void telemetryListener?.sendUIInteraction(
           "model-editor-save-modeled-methods",
         );
@@ -249,7 +257,12 @@ export class ModelEditorView extends AbstractWebview<
         break;
       case "switchMode":
         this.mode = msg.mode;
-        await Promise.all([this.setViewState(), this.loadExternalApiUsages()]);
+        await Promise.all([
+          this.setViewState(),
+          withProgress((progress) => this.loadExternalApiUsages(progress), {
+            cancellable: false,
+          }),
+        ]);
         void telemetryListener?.sendUIInteraction("model-editor-switch-modes");
 
         break;
@@ -274,7 +287,9 @@ export class ModelEditorView extends AbstractWebview<
 
     await Promise.all([
       this.setViewState(),
-      this.loadExternalApiUsages(),
+      withProgress((progress) => this.loadExternalApiUsages(progress), {
+        cancellable: false,
+      }),
       this.loadExistingModeledMethods(),
     ]);
   }
@@ -317,48 +332,45 @@ export class ModelEditorView extends AbstractWebview<
     }
   }
 
-  protected async loadExternalApiUsages(): Promise<void> {
-    await withProgress(
-      async (progress) => {
-        try {
-          const cancellationTokenSource = new CancellationTokenSource();
-          const queryResult = await runExternalApiQueries(this.mode, {
-            cliServer: this.cliServer,
-            queryRunner: this.queryRunner,
-            databaseItem: this.databaseItem,
-            queryStorageDir: this.queryStorageDir,
-            queryDir: this.queryDir,
-            progress: (update) => progress({ ...update, maxStep: 1500 }),
-            token: cancellationTokenSource.token,
-          });
-          if (!queryResult) {
-            return;
-          }
-          this.methods = queryResult;
+  protected async loadExternalApiUsages(
+    progress: ProgressCallback,
+  ): Promise<void> {
+    try {
+      const cancellationTokenSource = new CancellationTokenSource();
+      const queryResult = await runExternalApiQueries(this.mode, {
+        cliServer: this.cliServer,
+        queryRunner: this.queryRunner,
+        databaseItem: this.databaseItem,
+        queryStorageDir: this.queryStorageDir,
+        queryDir: this.queryDir,
+        progress: (update) => progress({ ...update, maxStep: 1500 }),
+        token: cancellationTokenSource.token,
+      });
+      if (!queryResult) {
+        return;
+      }
+      this.methods = queryResult;
 
-          await this.postMessage({
-            t: "setMethods",
-            methods: this.methods,
-          });
-          if (this.isMostRecentlyActiveView(this)) {
-            await this.updateMethodsUsagePanelState(
-              this.methods,
-              this.databaseItem,
-              this.hideModeledApis,
-            );
-          }
-        } catch (err) {
-          void showAndLogExceptionWithTelemetry(
-            this.app.logger,
-            this.app.telemetry,
-            redactableError(
-              asError(err),
-            )`Failed to load external API usages: ${getErrorMessage(err)}`,
-          );
-        }
-      },
-      { cancellable: false },
-    );
+      await this.postMessage({
+        t: "setMethods",
+        methods: this.methods,
+      });
+      if (this.isMostRecentlyActiveView(this)) {
+        await this.updateMethodsUsagePanelState(
+          this.methods,
+          this.databaseItem,
+          this.hideModeledApis,
+        );
+      }
+    } catch (err) {
+      void showAndLogExceptionWithTelemetry(
+        this.app.logger,
+        this.app.telemetry,
+        redactableError(
+          asError(err),
+        )`Failed to load external API usages: ${getErrorMessage(err)}`,
+      );
+    }
   }
 
   protected async generateModeledMethods(): Promise<void> {