Merge remote-tracking branch 'origin/main' into koesie10/split-helpers-3

Author: koesie10

extensions/ql-vscode/src/common/app.ts

@@ -4,11 +4,6 @@ import { AppEventEmitter } from "./events";
 import { Logger } from "./logging";
 import { Memento } from "./memento";
 import { AppCommandManager } from "./commands";
-import type {
-  WorkspaceFolder,
-  Event,
-  WorkspaceFoldersChangeEvent,
-} from "vscode";
 
 export interface App {
   createEventEmitter<T>(): AppEventEmitter<T>;
@@ -19,8 +14,6 @@ export interface App {
   readonly globalStoragePath: string;
   readonly workspaceStoragePath?: string;
   readonly workspaceState: Memento;
-  readonly workspaceFolders: readonly WorkspaceFolder[] | undefined;
-  readonly onDidChangeWorkspaceFolders: Event<WorkspaceFoldersChangeEvent>;
   readonly credentials: Credentials;
   readonly commands: AppCommandManager;
   readonly environment: EnvironmentContext;

extensions/ql-vscode/src/common/vscode/vscode-app.ts

@@ -40,14 +40,6 @@ export class ExtensionApp implements App {
     return this.extensionContext.workspaceState;
   }
 
-  public get workspaceFolders(): readonly vscode.WorkspaceFolder[] | undefined {
-    return vscode.workspace.workspaceFolders;
-  }
-
-  public get onDidChangeWorkspaceFolders(): vscode.Event<vscode.WorkspaceFoldersChangeEvent> {
-    return vscode.workspace.onDidChangeWorkspaceFolders;
-  }
-
   public get subscriptions(): Disposable[] {
     return this.extensionContext.subscriptions;
   }

extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts

@@ -14,6 +14,7 @@ import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";
 import { showAndLogErrorMessage } from "../common/vscode/log";
+import { containsPath } from "../pure/files";
 
 const maxStep = 3;
 
@@ -347,11 +348,7 @@ async function pickNewModelFile(
           return "File already exists";
         }
 
-        const notInExtensionPack = relative(
-          extensionPack.path,
-          path,
-        ).startsWith("..");
-        if (notInExtensionPack) {
+        if (!containsPath(extensionPack.path, path)) {
           return "File must be in the extension pack";
         }
 

extensions/ql-vscode/src/databases/config/db-config-store.ts

@@ -147,14 +147,10 @@ export class DbConfigStore extends DisposableObject {
     await this.writeConfig(config);
   }
 
-  /**
-   * Adds a list of remote repositories to an existing repository list and removes duplicates.
-   * @returns a list of repositories that were not added because the list reached 1000 entries.
-   */
   public async addRemoteReposToList(
     repoNwoList: string[],
     parentList: string,
-  ): Promise<string[]> {
+  ): Promise<void> {
     if (!this.config) {
       throw Error("Cannot add variant analysis repos if config is not loaded");
     }
@@ -172,21 +168,15 @@ export class DbConfigStore extends DisposableObject {
       ...new Set([...parent.repositories, ...repoNwoList]),
     ];
 
-    parent.repositories = newRepositoriesList.slice(0, 1000);
-    const truncatedRepositories = newRepositoriesList.slice(1000);
+    parent.repositories = newRepositoriesList;
 
     await this.writeConfig(config);
-    return truncatedRepositories;
   }
 
-  /**
-   * Adds one remote repository
-   * @returns either nothing, or, if a parentList is given AND the number of repos on that list reaches 1000 returns the repo that was not added.
-   */
   public async addRemoteRepo(
     repoNwo: string,
     parentList?: string,
-  ): Promise<string[]> {
+  ): Promise<void> {
     if (!this.config) {
       throw Error("Cannot add variant analysis repo if config is not loaded");
     }
@@ -201,7 +191,6 @@ export class DbConfigStore extends DisposableObject {
       );
     }
 
-    const truncatedRepositories = [];
     const config = cloneDbConfig(this.config);
     if (parentList) {
       const parent = config.databases.variantAnalysis.repositoryLists.find(
@@ -210,15 +199,12 @@ export class DbConfigStore extends DisposableObject {
       if (!parent) {
         throw Error(`Cannot find parent list '${parentList}'`);
       } else {
-        const newRepositories = [...parent.repositories, repoNwo];
-        parent.repositories = newRepositories.slice(0, 1000);
-        truncatedRepositories.push(...newRepositories.slice(1000));
+        parent.repositories = [...parent.repositories, repoNwo];
       }
     } else {
       config.databases.variantAnalysis.repositories.push(repoNwo);
     }
     await this.writeConfig(config);
-    return truncatedRepositories;
   }
 
   public async addRemoteOwner(owner: string): Promise<void> {

extensions/ql-vscode/src/databases/db-manager.ts

@@ -101,15 +101,15 @@ export class DbManager extends DisposableObject {
   public async addNewRemoteRepo(
     nwo: string,
     parentList?: string,
-  ): Promise<string[]> {
-    return await this.dbConfigStore.addRemoteRepo(nwo, parentList);
+  ): Promise<void> {
+    await this.dbConfigStore.addRemoteRepo(nwo, parentList);
   }
 
   public async addNewRemoteReposToList(
     nwoList: string[],
     parentList: string,
-  ): Promise<string[]> {
-    return await this.dbConfigStore.addRemoteReposToList(nwoList, parentList);
+  ): Promise<void> {
+    await this.dbConfigStore.addRemoteReposToList(nwoList, parentList);
   }
 
   public async addNewRemoteOwner(owner: string): Promise<void> {

extensions/ql-vscode/src/databases/local-databases/database-item-impl.ts

@@ -2,7 +2,7 @@
 import * as cli from "../../codeql-cli/cli";
 import vscode from "vscode";
 import { FullDatabaseOptions } from "./database-options";
-import { basename, dirname, extname, join, relative } from "path";
+import { basename, dirname, extname, join } from "path";
 import {
   decodeSourceArchiveUri,
   encodeArchiveBasePath,
@@ -12,7 +12,7 @@ import {
 import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
 import { isLikelyDatabaseRoot } from "./db-contents-heuristics";
 import { stat } from "fs-extra";
-import { pathsEqual } from "../../pure/files";
+import { containsPath, pathsEqual } from "../../pure/files";
 import { DatabaseContents } from "./database-contents";
 
 export class DatabaseItemImpl implements DatabaseItem {
@@ -199,15 +199,14 @@ export class DatabaseItemImpl implements DatabaseItem {
     try {
       const stats = await stat(testPath);
       if (stats.isDirectory()) {
-        return !relative(testPath, databasePath).startsWith("..");
+        return containsPath(testPath, databasePath);
       } else {
         // database for /one/two/three/test.ql is at /one/two/three/three.testproj
         const testdir = dirname(testPath);
         const testdirbase = basename(testdir);
         return pathsEqual(
           databasePath,
           join(testdir, `${testdirbase}.testproj`),
-          process.platform,
         );
       }
     } catch {

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

@@ -652,7 +652,7 @@ export class DatabaseManager extends DisposableObject {
   private isExtensionControlledLocation(uri: vscode.Uri) {
     const storageUri = this.ctx.storageUri || this.ctx.globalStorageUri;
     if (storageUri) {
-      return containsPath(storageUri.fsPath, uri.fsPath, process.platform);
+      return containsPath(storageUri.fsPath, uri.fsPath);
     }
     return false;
   }

extensions/ql-vscode/src/databases/ui/db-panel.ts

@@ -183,14 +183,7 @@ export class DbPanel extends DisposableObject {
       return;
     }
 
-    const truncatedRepositories = await this.dbManager.addNewRemoteRepo(
-      nwo,
-      parentList,
-    );
-
-    if (parentList) {
-      this.reportAnyTruncatedRepos(truncatedRepositories, parentList);
-    }
+    await this.dbManager.addNewRemoteRepo(nwo, parentList);
   }
 
   private async addNewRemoteOwner(): Promise<void> {
@@ -415,26 +408,11 @@ export class DbPanel extends DisposableObject {
 
         progress.report({ increment: 10, message: "Processing results..." });
 
-        const truncatedRepositories =
-          await this.dbManager.addNewRemoteReposToList(repositories, listName);
-        this.reportAnyTruncatedRepos(truncatedRepositories, listName);
+        await this.dbManager.addNewRemoteReposToList(repositories, listName);
       },
     );
   }
 
-  private reportAnyTruncatedRepos(
-    truncatedRepositories: string[],
-    listName: string,
-  ) {
-    if (truncatedRepositories.length > 0) {
-      void showAndLogErrorMessage(
-        `Some repositories were not added to '${listName}' because a list can only have 1000 entries. Excluded repositories: ${truncatedRepositories.join(
-          ", ",
-        )}`,
-      );
-    }
-  }
-
   private async onDidCollapseElement(
     event: TreeViewExpansionEvent<DbTreeViewItem>,
   ): Promise<void> {

extensions/ql-vscode/src/pure/files.ts

@@ -1,5 +1,5 @@
 import { pathExists, stat, readdir, opendir } from "fs-extra";
-import { join, resolve } from "path";
+import { isAbsolute, join, relative, resolve } from "path";
 
 /**
  * Recursively finds all .ql files in this set of Uris.
@@ -51,36 +51,32 @@ export async function getDirectoryNamesInsidePath(
   return dirNames;
 }
 
-function normalizePath(path: string, platform: NodeJS.Platform): string {
+function normalizePath(path: string): string {
   // On Windows, "C:/", "C:\", and "c:/" are all equivalent. We need
   // to normalize the paths to ensure they all get resolved to the
   // same format. On Windows, we also need to do the comparison
   // case-insensitively.
   path = resolve(path);
-  if (platform === "win32") {
+  if (process.platform === "win32") {
     path = path.toLowerCase();
   }
   return path;
 }
 
-export function pathsEqual(
-  path1: string,
-  path2: string,
-  platform: NodeJS.Platform,
-): boolean {
-  return normalizePath(path1, platform) === normalizePath(path2, platform);
+export function pathsEqual(path1: string, path2: string): boolean {
+  return normalizePath(path1) === normalizePath(path2);
 }
 
 /**
- * Returns true if path1 contains path2.
+ * Returns true if `parent` contains `child`, or if they are equal.
  */
-export function containsPath(
-  path1: string,
-  path2: string,
-  platform: NodeJS.Platform,
-): boolean {
-  return normalizePath(path2, platform).startsWith(
-    normalizePath(path1, platform),
+export function containsPath(parent: string, child: string): boolean {
+  const relativePath = relative(parent, child);
+  return (
+    !relativePath.startsWith("..") &&
+    // On windows, if the two paths are in different drives, then the
+    // relative path will be an absolute path to the other drive.
+    !isAbsolute(relativePath)
   );
 }
 

extensions/ql-vscode/src/queries-panel/queries-module.ts

@@ -19,7 +19,7 @@ export class QueriesModule extends DisposableObject {
     }
     void extLogger.log("Initializing queries panel.");
 
-    const queryDiscovery = new QueryDiscovery(app, cliServer);
+    const queryDiscovery = new QueryDiscovery(app.environment, cliServer);
     this.push(queryDiscovery);
     void queryDiscovery.refresh();