Skip to content

Commit 28aadb1

Browse files
authored
Use object for pack generation details (#3260)
1 parent 83148f6 commit 28aadb1

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/**
2+
* Details about the original QL pack that is used for triggering
3+
* a variant analysis.
4+
*/
5+
export interface QlPackDetails {
6+
queryFile: string;
7+
}

extensions/ql-vscode/src/variant-analysis/run-remote-query.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
3939
import { askForLanguage, findLanguage } from "../codeql-cli/query-language";
4040
import type { QlPackFile } from "../packaging/qlpack-file";
4141
import { expandShortPaths } from "../common/short-paths";
42+
import type { QlPackDetails } from "./ql-pack-details";
4243

4344
/**
4445
* Well-known names for the query pack used by the server.
@@ -59,9 +60,11 @@ interface GeneratedQueryPack {
5960
*/
6061
async function generateQueryPack(
6162
cliServer: CodeQLCliServer,
62-
queryFile: string,
63+
qlPackDetails: QlPackDetails,
6364
tmpDir: RemoteQueryTempDir,
6465
): Promise<GeneratedQueryPack> {
66+
const queryFile = qlPackDetails.queryFile;
67+
6568
const originalPackRoot = await findPackRoot(queryFile);
6669
const packRelativePath = relative(originalPackRoot, queryFile);
6770
const workspaceFolders = getOnDiskWorkspaceFolders();
@@ -381,8 +384,12 @@ export async function prepareRemoteQueryRun(
381384

382385
let pack: GeneratedQueryPack;
383386

387+
const qlPackDetails: QlPackDetails = {
388+
queryFile,
389+
};
390+
384391
try {
385-
pack = await generateQueryPack(cliServer, queryFile, tempDir);
392+
pack = await generateQueryPack(cliServer, qlPackDetails, tempDir);
386393
} finally {
387394
await tempDir.remoteQueryDir.cleanup();
388395
}

0 commit comments

Comments
 (0)