Remove default location values in withProgress calls

Author: koesie10

extensions/ql-vscode/src/contextual/templateProvider.ts

@@ -4,7 +4,6 @@ import {
   Location,
   LocationLink,
   Position,
-  ProgressLocation,
   ReferenceContext,
   ReferenceProvider,
   TextDocument,
@@ -87,7 +86,6 @@ export class TemplateQueryDefinitionProvider implements DefinitionProvider {
         );
       },
       {
-        location: ProgressLocation.Notification,
         cancellable: true,
         title: "Finding definitions",
       },
@@ -150,7 +148,6 @@ export class TemplateQueryReferenceProvider implements ReferenceProvider {
         );
       },
       {
-        location: ProgressLocation.Notification,
         cancellable: true,
         title: "Finding references",
       },

extensions/ql-vscode/src/extension.ts

@@ -329,7 +329,6 @@ export async function activate(
               ),
             {
               title: progressTitle,
-              location: ProgressLocation.Notification,
             },
           );
 

extensions/ql-vscode/src/local-databases.ts

@@ -794,74 +794,66 @@ export class DatabaseManager extends DisposableObject {
   }
 
   public async loadPersistedState(): Promise<void> {
-    return withProgress(
-      async (progress, token) => {
-        const currentDatabaseUri =
-          this.ctx.workspaceState.get<string>(CURRENT_DB);
-        const databases = this.ctx.workspaceState.get<PersistedDatabaseItem[]>(
-          DB_LIST,
-          [],
+    return withProgress(async (progress, token) => {
+      const currentDatabaseUri =
+        this.ctx.workspaceState.get<string>(CURRENT_DB);
+      const databases = this.ctx.workspaceState.get<PersistedDatabaseItem[]>(
+        DB_LIST,
+        [],
+      );
+      let step = 0;
+      progress({
+        maxStep: databases.length,
+        message: "Loading persisted databases",
+        step,
+      });
+      try {
+        void this.logger.log(
+          `Found ${databases.length} persisted databases: ${databases
+            .map((db) => db.uri)
+            .join(", ")}`,
         );
-        let step = 0;
-        progress({
-          maxStep: databases.length,
-          message: "Loading persisted databases",
-          step,
-        });
-        try {
-          void this.logger.log(
-            `Found ${databases.length} persisted databases: ${databases
-              .map((db) => db.uri)
-              .join(", ")}`,
+        for (const database of databases) {
+          progress({
+            maxStep: databases.length,
+            message: `Loading ${database.options?.displayName || "databases"}`,
+            step: ++step,
+          });
+
+          const databaseItem = await this.createDatabaseItemFromPersistedState(
+            progress,
+            token,
+            database,
           );
-          for (const database of databases) {
-            progress({
-              maxStep: databases.length,
-              message: `Loading ${
-                database.options?.displayName || "databases"
-              }`,
-              step: ++step,
-            });
-
-            const databaseItem =
-              await this.createDatabaseItemFromPersistedState(
-                progress,
-                token,
-                database,
-              );
-            try {
-              await databaseItem.refresh();
-              await this.registerDatabase(progress, token, databaseItem);
-              if (currentDatabaseUri === database.uri) {
-                await this.setCurrentDatabaseItem(databaseItem, true);
-              }
-              void this.logger.log(
-                `Loaded database ${databaseItem.name} at URI ${database.uri}.`,
-              );
-            } catch (e) {
-              // When loading from persisted state, leave invalid databases in the list. They will be
-              // marked as invalid, and cannot be set as the current database.
-              void this.logger.log(
-                `Error loading database ${database.uri}: ${e}.`,
-              );
+          try {
+            await databaseItem.refresh();
+            await this.registerDatabase(progress, token, databaseItem);
+            if (currentDatabaseUri === database.uri) {
+              await this.setCurrentDatabaseItem(databaseItem, true);
             }
+            void this.logger.log(
+              `Loaded database ${databaseItem.name} at URI ${database.uri}.`,
+            );
+          } catch (e) {
+            // When loading from persisted state, leave invalid databases in the list. They will be
+            // marked as invalid, and cannot be set as the current database.
+            void this.logger.log(
+              `Error loading database ${database.uri}: ${e}.`,
+            );
           }
-          await this.updatePersistedDatabaseList();
-        } catch (e) {
-          // database list had an unexpected type - nothing to be done?
-          void showAndLogExceptionWithTelemetry(
-            redactableError(
-              asError(e),
-            )`Database list loading failed: ${getErrorMessage(e)}`,
-          );
         }
+        await this.updatePersistedDatabaseList();
+      } catch (e) {
+        // database list had an unexpected type - nothing to be done?
+        void showAndLogExceptionWithTelemetry(
+          redactableError(
+            asError(e),
+          )`Database list loading failed: ${getErrorMessage(e)}`,
+        );
+      }
 
-        void this.logger.log("Finished loading persisted databases.");
-      },
-      {
-        location: vscode.ProgressLocation.Notification,
-      },
-    );
+      void this.logger.log("Finished loading persisted databases.");
+    });
   }
 
   public get databaseItems(): readonly DatabaseItem[] {