mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Use object for pack generation details (#3260)

Browse Source
This commit is contained in:
Charis Kyriakou
2024-01-22 13:59:41 +00:00
committed by GitHub
parent 83148f6d57
commit 28aadb183b
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/ql-vscode/src/variant-analysis/ql-pack-details.ts Normal file
View File

@@ -0,0 +1,7 @@
/**
* Details about the original QL pack that is used for triggering
* a variant analysis.
*/
export interface QlPackDetails {
queryFile: string;
}

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

@@ -39,6 +39,7 @@ import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
import { askForLanguage, findLanguage } from "../codeql-cli/query-language"; import { askForLanguage, findLanguage } from "../codeql-cli/query-language";
import type { QlPackFile } from "../packaging/qlpack-file"; import type { QlPackFile } from "../packaging/qlpack-file";
import { expandShortPaths } from "../common/short-paths"; import { expandShortPaths } from "../common/short-paths";
import type { QlPackDetails } from "./ql-pack-details";
/** /**
* Well-known names for the query pack used by the server. * Well-known names for the query pack used by the server.
@@ -59,9 +60,11 @@ interface GeneratedQueryPack {
*/ */
async function generateQueryPack( async function generateQueryPack(
cliServer: CodeQLCliServer, cliServer: CodeQLCliServer,
queryFile: string, qlPackDetails: QlPackDetails,
tmpDir: RemoteQueryTempDir, tmpDir: RemoteQueryTempDir,
): Promise<GeneratedQueryPack> { ): Promise<GeneratedQueryPack> {
const queryFile = qlPackDetails.queryFile;
const originalPackRoot = await findPackRoot(queryFile); const originalPackRoot = await findPackRoot(queryFile);
const packRelativePath = relative(originalPackRoot, queryFile); const packRelativePath = relative(originalPackRoot, queryFile);
const workspaceFolders = getOnDiskWorkspaceFolders(); const workspaceFolders = getOnDiskWorkspaceFolders();
@@ -381,8 +384,12 @@ export async function prepareRemoteQueryRun(
let pack: GeneratedQueryPack; let pack: GeneratedQueryPack;
const qlPackDetails: QlPackDetails = {
queryFile,
};
try { try {
pack = await generateQueryPack(cliServer, queryFile, tempDir); pack = await generateQueryPack(cliServer, qlPackDetails, tempDir);
} finally { } finally {
await tempDir.remoteQueryDir.cleanup(); await tempDir.remoteQueryDir.cleanup();
} }