Skip to content

Use object for pack generation details #3260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charisk merged 1 commit into from
Jan 22, 2024
Merged

Use object for pack generation details #3260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions extensions/ql-vscode/src/variant-analysis/ql-pack-details.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Details about the original QL pack that is used for triggering
* a variant analysis.
*/
export interface QlPackDetails {
queryFile: string;
}
11 changes: 9 additions & 2 deletions extensions/ql-vscode/src/variant-analysis/run-remote-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
import { askForLanguage, findLanguage } from "../codeql-cli/query-language";
import type { QlPackFile } from "../packaging/qlpack-file";
import { expandShortPaths } from "../common/short-paths";
import type { QlPackDetails } from "./ql-pack-details";

/**
* Well-known names for the query pack used by the server.
Expand All @@ -59,9 +60,11 @@ interface GeneratedQueryPack {
*/
async function generateQueryPack(
cliServer: CodeQLCliServer,
queryFile: string,
qlPackDetails: QlPackDetails,
Comment thread
charisk marked this conversation as resolved.
tmpDir: RemoteQueryTempDir,
): Promise<GeneratedQueryPack> {
const queryFile = qlPackDetails.queryFile;

const originalPackRoot = await findPackRoot(queryFile);
const packRelativePath = relative(originalPackRoot, queryFile);
const workspaceFolders = getOnDiskWorkspaceFolders();
Expand Down Expand Up @@ -381,8 +384,12 @@ export async function prepareRemoteQueryRun(

let pack: GeneratedQueryPack;

const qlPackDetails: QlPackDetails = {
queryFile,
};

try {
pack = await generateQueryPack(cliServer, queryFile, tempDir);
pack = await generateQueryPack(cliServer, qlPackDetails, tempDir);
} finally {
await tempDir.remoteQueryDir.cleanup();
}
Expand Down