Create QL pack in workspace instead of global storage

We were initially using the storage path of the extension.

We'd like to create these QL packs in the workspace instead.

Author: elenatanasoiu

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

@@ -2,7 +2,6 @@ import { ProgressCallback, ProgressUpdate, withProgress } from "./progress";
 import {
   CancellationToken,
   CancellationTokenSource,
-  ExtensionContext,
   QuickPickItem,
   Range,
   Uri,
@@ -222,7 +221,6 @@ export class LocalQueries extends DisposableObject {
     private readonly databaseUI: DatabaseUI,
     private readonly localQueryResultsView: ResultsView,
     private readonly queryStorageDir: string,
-    private readonly ctx: ExtensionContext,
   ) {
     super();
   }
@@ -385,7 +383,6 @@ export class LocalQueries extends DisposableObject {
         const credentials = isCanary() ? this.app.credentials : undefined;
         const skeletonQueryWizard = new SkeletonQueryWizard(
           this.cliServer,
-          this.ctx.storageUri?.fsPath,
           progress,
           credentials,
           extLogger,

extensions/ql-vscode/src/skeleton-query.ts

@@ -1,5 +1,5 @@
 import { join } from "path";
-import { CancellationToken, Uri, workspace } from "vscode";
+import { CancellationToken, Uri, workspace, window as Window } from "vscode";
 import { CodeQLCliServer } from "./cli";
 import { OutputChannelLogger } from "./common";
 import { Credentials } from "./common/authentication";
@@ -19,6 +19,7 @@ export class SkeletonQueryWizard {
   private language: string | undefined;
   private folderName: string | undefined;
   private fileName = "example.ql";
+  private storagePath: string | undefined;
 
   QUERY_LANGUAGE_TO_DATABASE_REPO: QueryLanguagesToDatabaseMap = {
     csharp: "github/codeql",
@@ -30,13 +31,14 @@ export class SkeletonQueryWizard {
 
   constructor(
     private readonly cliServer: CodeQLCliServer,
-    private readonly storagePath: string | undefined,
     private readonly progress: ProgressCallback,
     private readonly credentials: Credentials | undefined,
     private readonly extLogger: OutputChannelLogger,
     private readonly databaseManager: DatabaseManager,
     private readonly token: CancellationToken,
-  ) {}
+  ) {
+    this.storagePath = this.workoutStoragePath();
+  }
 
   public async execute() {
     // show quick pick to choose language
@@ -80,6 +82,18 @@ export class SkeletonQueryWizard {
     });
   }
 
+  private workoutStoragePath() {
+    const workspaceFolders = workspace.workspaceFolders;
+
+    if (!workspaceFolders || workspaceFolders.length === 0) {
+      throw new Error("No workspace folders found");
+    }
+
+    const firstFolder = workspaceFolders[0];
+
+    return firstFolder.uri.path;
+  }
+
   private async chooseLanguage() {
     this.progress({
       message: "Choose language",

extensions/ql-vscode/test/vscode-tests/cli-integration/skeleton-query.test.ts

@@ -2,7 +2,7 @@ import { CodeQLCliServer } from "../../../src/cli";
 import { SkeletonQueryWizard } from "../../../src/skeleton-query";
 import { mockedObject, mockedQuickPickItem } from "../utils/mocking.helpers";
 import * as tmp from "tmp";
-import { TextDocument, window, workspace } from "vscode";
+import { TextDocument, window, workspace, WorkspaceFolder } from "vscode";
 import { extLogger } from "../../../src/common";
 import { QlPackGenerator } from "../../../src/qlpack-generator";
 import * as helpers from "../../../src/helpers";
@@ -99,7 +99,6 @@ describe("SkeletonQueryWizard", () => {
 
     wizard = new SkeletonQueryWizard(
       mockCli,
-      storagePath,
       jest.fn(),
       credentials,
       extLogger,