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

Use include instructions for suite file

Browse Source
This commit is contained in:
Koen Vlaswinkel
2024-03-12 11:44:30 +01:00
parent 0feef365d9
commit b71a536e00
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/common/query-metadata.ts
View File

@@ -1,4 +1,4 @@
const SARIF_RESULTS_QUERY_KINDS = [ export const SARIF_RESULTS_QUERY_KINDS = [
"problem", "problem",
"alert", "alert",
"path-problem", "path-problem",

12
extensions/ql-vscode/src/variant-analysis/code-scanning-pack.ts
View File

@@ -8,6 +8,7 @@ import type { CodeQLCliServer } from "../codeql-cli/cli";
import type { QlPackDetails } from "./ql-pack-details"; import type { QlPackDetails } from "./ql-pack-details";
import { getQlPackFilePath } from "../common/ql"; import { getQlPackFilePath } from "../common/ql";
import type { SuiteInstruction } from "../packaging/suite-instruction"; import type { SuiteInstruction } from "../packaging/suite-instruction";
import { SARIF_RESULTS_QUERY_KINDS } from "../common/query-metadata";
export async function resolveCodeScanningQueryPack( export async function resolveCodeScanningQueryPack(
logger: BaseLogger, logger: BaseLogger,
@@ -34,10 +35,15 @@ export async function resolveCodeScanningQueryPack(
import: `codeql-suites/${language}-code-scanning.qls`, import: `codeql-suites/${language}-code-scanning.qls`,
from: `${downloadedPack.name}@${downloadedPack.version}`, from: `${downloadedPack.name}@${downloadedPack.version}`,
}, },
// Exclude any non-problem queries
{ {
exclude: { // This is necessary to ensure that the next import filter
kind: ["diagnostic", "metric"], // is applied correctly
exclude: {},
},
{
// Only include problem queries
include: {
kind: SARIF_RESULTS_QUERY_KINDS,
}, },
}, },
]; ];