Some improvements to findQlPackRootForQueriesWithNoPack

Author: charisk

extensions/ql-vscode/src/variant-analysis/ql.ts

@@ -1,5 +1,5 @@
 import { dirname } from "path";
-import { findCommonParentDir } from "../common/files";
+import { containsPath, findCommonParentDir } from "../common/files";
 import { findPackRoot } from "../common/ql";
 
 /**
@@ -62,26 +62,15 @@ function findQlPackRootForQueriesWithNoPack(
   queryFiles: string[],
   workspaceFolders: string[],
 ): string {
-  const queryFileWorkspaceFolders = queryFiles.map((queryFile) =>
-    workspaceFolders.find((workspaceFolder) =>
-      queryFile.startsWith(workspaceFolder),
-    ),
-  );
-
-  // Check if any query file is not part of the workspace.
-  if (queryFileWorkspaceFolders.includes(undefined)) {
-    throw Error(
-      "Queries that are not part of a pack need to be part of the workspace",
-    );
-  }
+  const commonParentDir = findCommonParentDir(...queryFiles);
 
-  // Check if query files are not in the same workspace folder.
-  if (new Set(queryFileWorkspaceFolders).size > 1) {
-    throw Error(
-      "Queries that are not part of a pack need to be in the same workspace folder",
-    );
+  for (const workspaceFolder of workspaceFolders) {
+    if (containsPath(workspaceFolder, commonParentDir)) {
+      return commonParentDir;
+    }
   }
 
-  // They're in the same workspace folder, so we can find a common parent dir.
-  return findCommonParentDir(...queryFiles);
+  throw Error(
+    "All queries must be within the workspace and within the same workspace root",
+  );
 }

extensions/ql-vscode/test/unit-tests/variant-analysis/ql.test.ts

@@ -87,7 +87,7 @@ describe("findVariantAnalysisQlPackRoot", () => {
     await expect(
       findVariantAnalysisQlPackRoot(queryFiles, workspaceFolders),
     ).rejects.toThrow(
-      "Queries that are not part of a pack need to be in the same workspace folder",
+      "All queries must be within the workspace and within the same workspace root",
     );
   });
 
@@ -100,7 +100,7 @@ describe("findVariantAnalysisQlPackRoot", () => {
     await expect(
       findVariantAnalysisQlPackRoot(queryFiles, workspaceFolders),
     ).rejects.toThrow(
-      "Queries that are not part of a pack need to be part of the workspace",
+      "All queries must be within the workspace and within the same workspace root",
     );
   });