Rename getFirstStoragePath -> getFirstWorkspaceFolder

extensions/ql-vscode/src/helpers.ts

@@ -786,7 +786,7 @@ export async function* walkDirectory(
   }
 }
 
-export function getFirstStoragePath() {
+export function getFirstWorkspaceFolder() {
   const workspaceFolders = workspace.workspaceFolders;
 
   if (!workspaceFolders || workspaceFolders.length === 0) {

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

@@ -11,7 +11,7 @@ import {
   showAndLogExceptionWithTelemetry,
   isFolderAlreadyInWorkspace,
   showBinaryChoiceDialog,
-  getFirstStoragePath,
+  getFirstWorkspaceFolder,
 } from "./helpers";
 import { ProgressCallback, withProgress } from "./progress";
 import {
@@ -677,7 +677,7 @@ export class DatabaseManager extends DisposableObject {
     }
 
     try {
-      const workspaceStorage = getFirstStoragePath();
+      const workspaceStorage = getFirstWorkspaceFolder();
 
       const qlPackGenerator = new QlPackGenerator(
         folderName,

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

@@ -6,7 +6,7 @@ import { Credentials } from "./common/authentication";
 import { QueryLanguage } from "./common/query-language";
 import {
   askForLanguage,
-  getFirstStoragePath,
+  getFirstWorkspaceFolder,
   isFolderAlreadyInWorkspace,
 } from "./helpers";
 import { getErrorMessage } from "./pure/helpers-pure";
@@ -54,7 +54,7 @@ export class SkeletonQueryWizard {
       return;
     }
 
-    this.qlPackStoragePath = getFirstStoragePath();
+    this.qlPackStoragePath = getFirstWorkspaceFolder();
 
     const skeletonPackAlreadyExists = isFolderAlreadyInWorkspace(
       this.folderName,

extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts

@@ -26,7 +26,7 @@ import {
 import { DirResult } from "tmp";
 
 import {
-  getFirstStoragePath,
+  getFirstWorkspaceFolder,
   getInitialQueryContents,
   InvocationRateLimiter,
   isFolderAlreadyInWorkspace,
@@ -673,16 +673,16 @@ describe("prepareCodeTour", () => {
   });
 });
 
-describe("getFirstStoragePath", () => {
+describe("getFirstWorkspaceFolder", () => {
   it("should return the first workspace folder", async () => {
     jest.spyOn(workspace, "workspaceFolders", "get").mockReturnValue([
       {
         name: "codespaces-codeql",
-        uri: { fsPath: "codespaces-codeql" },
+        uri: { fsPath: "codespaces-codeql", scheme: "file" },
       },
     ] as WorkspaceFolder[]);
 
-    expect(getFirstStoragePath()).toEqual("codespaces-codeql");
+    expect(getFirstWorkspaceFolder()).toEqual("codespaces-codeql");
   });
 
   describe("if user is in vscode-codeql-starter workspace", () => {
@@ -692,6 +692,7 @@ describe("getFirstStoragePath", () => {
           name: "codeql-custom-queries-cpp",
           uri: {
             fsPath: join("vscode-codeql-starter", "codeql-custom-queries-cpp"),
+            scheme: "file",
           },
         },
         {
@@ -701,11 +702,12 @@ describe("getFirstStoragePath", () => {
               "vscode-codeql-starter",
               "codeql-custom-queries-csharp",
             ),
+            scheme: "file",
           },
         },
       ] as WorkspaceFolder[]);
 
-      expect(getFirstStoragePath()).toEqual("vscode-codeql-starter");
+      expect(getFirstWorkspaceFolder()).toEqual("vscode-codeql-starter");
     });
   });
 });