Mark progress bars as cancellable where it appears we are respecting the token

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

@@ -673,6 +673,7 @@ export class DatabaseUI extends DisposableObject {
       },
       {
         title: "Clearing cache",
+        cancellable: true,
       },
     );
   }
@@ -692,6 +693,7 @@ export class DatabaseUI extends DisposableObject {
       },
       {
         title: "Trimming cache",
+        cancellable: true,
       },
     );
   }

extensions/ql-vscode/src/extension.ts

@@ -203,6 +203,7 @@ function getCommands(
       },
       {
         title: "Restarting Query Server",
+        cancellable: true,
       },
     );
 

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

@@ -810,57 +810,60 @@ export class ModelEditorView extends AbstractWebview<
   }
 
   private async modelDependency(): Promise<void> {
-    return withProgress(async (progress, token) => {
+    return withProgress(
-      const addedDatabase =
+      async (progress, token) => {
-        await this.promptChooseNewOrExistingDatabase(progress);
+        const addedDatabase =
-      if (!addedDatabase || token.isCancellationRequested) {
+          await this.promptChooseNewOrExistingDatabase(progress);
-        return;
+        if (!addedDatabase || token.isCancellationRequested) {
-      }
+          return;
+        }
 
-      const addedDbUri = addedDatabase.databaseUri.toString();
+        const addedDbUri = addedDatabase.databaseUri.toString();
-      if (this.modelingStore.isDbOpen(addedDbUri)) {
+        if (this.modelingStore.isDbOpen(addedDbUri)) {
-        this.modelingEvents.fireFocusModelEditorEvent(addedDbUri);
+          this.modelingEvents.fireFocusModelEditorEvent(addedDbUri);
-        return;
+          return;
-      }
+        }
 
-      const modelFile = await pickExtensionPack(
+        const modelFile = await pickExtensionPack(
-        this.cliServer,
+          this.cliServer,
-        addedDatabase,
+          addedDatabase,
-        this.modelConfig,
+          this.modelConfig,
-        this.app.logger,
+          this.app.logger,
-        progress,
+          progress,
-        token,
+          token,
-        3,
+          3,
-      );
+        );
-      if (!modelFile) {
+        if (!modelFile) {
-        return;
+          return;
-      }
+        }
 
-      // Check again just before opening the editor to ensure no model editor has been opened between
+        // Check again just before opening the editor to ensure no model editor has been opened between
-      // our first check and now.
+        // our first check and now.
-      if (this.modelingStore.isDbOpen(addedDbUri)) {
+        if (this.modelingStore.isDbOpen(addedDbUri)) {
-        this.modelingEvents.fireFocusModelEditorEvent(addedDbUri);
+          this.modelingEvents.fireFocusModelEditorEvent(addedDbUri);
-        return;
+          return;
-      }
+        }
 
-      const view = new ModelEditorView(
+        const view = new ModelEditorView(
-        this.app,
+          this.app,
-        this.modelingStore,
+          this.modelingStore,
-        this.modelingEvents,
+          this.modelingEvents,
-        this.modelConfig,
+          this.modelConfig,
-        this.databaseManager,
+          this.databaseManager,
-        this.variantAnalysisManager,
+          this.variantAnalysisManager,
-        this.cliServer,
+          this.cliServer,
-        this.queryRunner,
+          this.queryRunner,
-        this.queryStorageDir,
+          this.queryStorageDir,
-        this.queryDir,
+          this.queryDir,
-        addedDatabase,
+          addedDatabase,
-        modelFile,
+          modelFile,
-        this.language,
+          this.language,
-        Mode.Framework,
+          Mode.Framework,
-      );
+        );
-      await view.openView();
+        await view.openView();
-    });
+      },
+      { cancellable: true },
+    );
   }
 
   private async promptChooseNewOrExistingDatabase(

extensions/ql-vscode/src/query-server/query-server-client.ts

@@ -125,6 +125,7 @@ export class QueryServerClient extends DisposableObject {
           this.restartQueryServerInternal(progress, token),
         {
           title: "Restarting CodeQL query server due to unexpected termination",
+          cancellable: true,
         },
       );
     } else {