Merge branch 'main' into koesie10/replace-faker-uuid

Author: koesie10

extensions/ql-vscode/src/data-extensions-editor/bqrs.ts

@@ -47,17 +47,5 @@ export function decodeBqrsToExternalApiUsages(
     method.usages.push(usage);
   });
 
-  const externalApiUsages = Array.from(methodsByApiName.values());
-  externalApiUsages.sort((a, b) => {
-    // Sort first by supported, putting unmodeled methods first.
-    if (a.supported && !b.supported) {
-      return 1;
-    }
-    if (!a.supported && b.supported) {
-      return -1;
-    }
-    // Then sort by number of usages descending
-    return b.usages.length - a.usages.length;
-  });
-  return externalApiUsages;
+  return Array.from(methodsByApiName.values());
 }

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

@@ -300,7 +300,6 @@ export class DataExtensionsEditorView extends AbstractWebview<
       this.app.workspaceStoragePath ?? this.app.globalStoragePath,
       this.app.credentials,
       (update) => this.showProgress(update),
-      tokenSource.token,
       this.cliServer,
     );
     if (!database) {
@@ -354,16 +353,12 @@ export class DataExtensionsEditorView extends AbstractWebview<
 
     // After the flow model has been generated, we can remove the temporary database
     // which we used for generating the flow model.
-    await this.databaseManager.removeDatabaseItem(
-      () =>
-        this.showProgress({
-          step: 3900,
-          maxStep: 4000,
-          message: "Removing temporary database",
-        }),
-      tokenSource.token,
-      database,
-    );
+    await this.showProgress({
+      step: 3900,
+      maxStep: 4000,
+      message: "Removing temporary database",
+    });
+    await this.databaseManager.removeDatabaseItem(database);
 
     await this.clearProgress();
   }

extensions/ql-vscode/src/databases/database-fetcher.ts

@@ -1,7 +1,7 @@
 import fetch, { Response } from "node-fetch";
 import { zip } from "zip-a-folder";
 import { Open } from "unzipper";
-import { Uri, CancellationToken, window, InputBoxOptions } from "vscode";
+import { Uri, window, InputBoxOptions } from "vscode";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import {
   ensureDir,
@@ -44,7 +44,6 @@ export async function promptImportInternetDatabase(
   databaseManager: DatabaseManager,
   storagePath: string,
   progress: ProgressCallback,
-  token: CancellationToken,
   cli?: CodeQLCliServer,
 ): Promise<DatabaseItem | undefined> {
   const databaseUrl = await window.showInputBox({
@@ -63,7 +62,6 @@ export async function promptImportInternetDatabase(
     storagePath,
     undefined,
     progress,
-    token,
     cli,
   );
 
@@ -86,7 +84,6 @@ export async function promptImportInternetDatabase(
  * @param storagePath where to store the unzipped database.
  * @param credentials the credentials to use to authenticate with GitHub
  * @param progress the progress callback
- * @param token the cancellation token
  * @param cli the CodeQL CLI server
  */
 export async function promptImportGithubDatabase(
@@ -95,7 +92,6 @@ export async function promptImportGithubDatabase(
   storagePath: string,
   credentials: Credentials | undefined,
   progress: ProgressCallback,
-  token: CancellationToken,
   cli?: CodeQLCliServer,
 ): Promise<DatabaseItem | undefined> {
   const githubRepo = await askForGitHubRepo(progress);
@@ -109,7 +105,6 @@ export async function promptImportGithubDatabase(
     storagePath,
     credentials,
     progress,
-    token,
     cli,
   );
 
@@ -157,7 +152,6 @@ export async function askForGitHubRepo(
  * @param storagePath where to store the unzipped database.
  * @param credentials the credentials to use to authenticate with GitHub
  * @param progress the progress callback
- * @param token the cancellation token
  * @param cli the CodeQL CLI server
  * @param language the language to download. If undefined, the user will be prompted to choose a language.
  **/
@@ -167,7 +161,6 @@ export async function downloadGitHubDatabase(
   storagePath: string,
   credentials: Credentials | undefined,
   progress: ProgressCallback,
-  token: CancellationToken,
   cli?: CodeQLCliServer,
   language?: string,
 ): Promise<DatabaseItem | undefined> {
@@ -213,7 +206,6 @@ export async function downloadGitHubDatabase(
     storagePath,
     `${owner}/${name}`,
     progress,
-    token,
     cli,
   );
 }
@@ -231,7 +223,6 @@ export async function importArchiveDatabase(
   databaseManager: DatabaseManager,
   storagePath: string,
   progress: ProgressCallback,
-  token: CancellationToken,
   cli?: CodeQLCliServer,
 ): Promise<DatabaseItem | undefined> {
   try {
@@ -242,7 +233,6 @@ export async function importArchiveDatabase(
       storagePath,
       undefined,
       progress,
-      token,
       cli,
     );
     if (item) {
@@ -275,7 +265,6 @@ export async function importArchiveDatabase(
  * @param storagePath where to store the unzipped database.
  * @param nameOverride a name for the database that overrides the default
  * @param progress callback to send progress messages to
- * @param token cancellation token
  */
 async function databaseArchiveFetcher(
   databaseUrl: string,
@@ -284,7 +273,6 @@ async function databaseArchiveFetcher(
   storagePath: string,
   nameOverride: string | undefined,
   progress: ProgressCallback,
-  token: CancellationToken,
   cli?: CodeQLCliServer,
 ): Promise<DatabaseItem> {
   progress({
@@ -327,8 +315,6 @@ async function databaseArchiveFetcher(
     const makeSelected = true;
 
     const item = await databaseManager.openDatabase(
-      progress,
-      token,
       Uri.file(dbPath),
       makeSelected,
       nameOverride,

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

@@ -314,7 +314,7 @@ export class DatabaseUI extends DisposableObject {
 
   private async handleSetDefaultTourDatabase(): Promise<void> {
     return withProgress(
-      async (progress, token) => {
+      async () => {
         try {
           if (!workspace.workspaceFolders?.length) {
             throw new Error("No workspace folder is open.");
@@ -332,8 +332,6 @@ export class DatabaseUI extends DisposableObject {
               const isTutorialDatabase = true;
 
               await this.databaseManager.openDatabase(
-                progress,
-                token,
                 uri,
                 makeSelected,
                 nameOverride,
@@ -485,13 +483,12 @@ export class DatabaseUI extends DisposableObject {
 
   private async handleChooseDatabaseInternet(): Promise<void> {
     return withProgress(
-      async (progress, token) => {
+      async (progress) => {
         await promptImportInternetDatabase(
           this.app.commands,
           this.databaseManager,
           this.storagePath,
           progress,
-          token,
           this.queryServer?.cliServer,
         );
       },
@@ -503,7 +500,7 @@ export class DatabaseUI extends DisposableObject {
 
   private async handleChooseDatabaseGithub(): Promise<void> {
     return withProgress(
-      async (progress, token) => {
+      async (progress) => {
         const credentials = isCanary() ? this.app.credentials : undefined;
 
         await promptImportGithubDatabase(
@@ -512,7 +509,6 @@ export class DatabaseUI extends DisposableObject {
           this.storagePath,
           credentials,
           progress,
-          token,
           this.queryServer?.cliServer,
         );
       },
@@ -608,14 +604,13 @@ export class DatabaseUI extends DisposableObject {
 
   private async handleClearCache(): Promise<void> {
     return withProgress(
-      async (progress, token) => {
+      async (_progress, token) => {
         if (
           this.queryServer !== undefined &&
           this.databaseManager.currentDatabaseItem !== undefined
         ) {
           await this.queryServer.clearCacheInDatabase(
             this.databaseManager.currentDatabaseItem,
-            progress,
             token,
           );
         }
@@ -633,7 +628,7 @@ export class DatabaseUI extends DisposableObject {
 
   private async handleSetCurrentDatabase(uri: Uri): Promise<void> {
     return withProgress(
-      async (progress, token) => {
+      async (progress) => {
         try {
           // Assume user has selected an archive if the file has a .zip extension
           if (uri.path.endsWith(".zip")) {
@@ -643,11 +638,10 @@ export class DatabaseUI extends DisposableObject {
               this.databaseManager,
               this.storagePath,
               progress,
-              token,
               this.queryServer?.cliServer,
             );
           } else {
-            await this.databaseManager.openDatabase(progress, token, uri);
+            await this.databaseManager.openDatabase(uri);
           }
         } catch (e) {
           // rethrow and let this be handled by default error handling.
@@ -668,10 +662,10 @@ export class DatabaseUI extends DisposableObject {
     databaseItems: DatabaseItem[],
   ): Promise<void> {
     return withProgress(
-      async (progress, token) => {
+      async () => {
         await Promise.all(
           databaseItems.map((dbItem) =>
-            this.databaseManager.removeDatabaseItem(progress, token, dbItem),
+            this.databaseManager.removeDatabaseItem(dbItem),
           ),
         );
       },
@@ -758,15 +752,11 @@ export class DatabaseUI extends DisposableObject {
 
     return await withInheritedProgress(
       progress,
-      async (progress, token) => {
+      async (progress) => {
         if (byFolder) {
           const fixedUri = await this.fixDbUri(uri);
           // we are selecting a database folder
-          return await this.databaseManager.openDatabase(
-            progress,
-            token,
-            fixedUri,
-          );
+          return await this.databaseManager.openDatabase(fixedUri);
         } else {
           // we are selecting a database archive. Must unzip into a workspace-controlled area
           // before importing.
@@ -776,7 +766,6 @@ export class DatabaseUI extends DisposableObject {
             this.databaseManager,
             this.storagePath,
             progress,
-            token,
             this.queryServer?.cliServer,
           );
         }