From b71a536e0024db4cd58f9905f8820c306e41ec5a Mon Sep 17 00:00:00 2001
From: Koen Vlaswinkel <koesie10@github.com>
Date: Tue, 12 Mar 2024 11:44:30 +0100
Subject: [PATCH] Use include instructions for suite file

---
 extensions/ql-vscode/src/common/query-metadata.ts    |  2 +-
 .../src/variant-analysis/code-scanning-pack.ts       | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/extensions/ql-vscode/src/common/query-metadata.ts b/extensions/ql-vscode/src/common/query-metadata.ts
index 89644bccb..69c416a4a 100644
--- a/extensions/ql-vscode/src/common/query-metadata.ts
+++ b/extensions/ql-vscode/src/common/query-metadata.ts
@@ -1,4 +1,4 @@
-const SARIF_RESULTS_QUERY_KINDS = [
+export const SARIF_RESULTS_QUERY_KINDS = [
   "problem",
   "alert",
   "path-problem",
diff --git a/extensions/ql-vscode/src/variant-analysis/code-scanning-pack.ts b/extensions/ql-vscode/src/variant-analysis/code-scanning-pack.ts
index 01b258493..68650710c 100644
--- a/extensions/ql-vscode/src/variant-analysis/code-scanning-pack.ts
+++ b/extensions/ql-vscode/src/variant-analysis/code-scanning-pack.ts
@@ -8,6 +8,7 @@ import type { CodeQLCliServer } from "../codeql-cli/cli";
 import type { QlPackDetails } from "./ql-pack-details";
 import { getQlPackFilePath } from "../common/ql";
 import type { SuiteInstruction } from "../packaging/suite-instruction";
+import { SARIF_RESULTS_QUERY_KINDS } from "../common/query-metadata";
 
 export async function resolveCodeScanningQueryPack(
   logger: BaseLogger,
@@ -34,10 +35,15 @@ export async function resolveCodeScanningQueryPack(
       import: `codeql-suites/${language}-code-scanning.qls`,
       from: `${downloadedPack.name}@${downloadedPack.version}`,
     },
-    // Exclude any non-problem queries
     {
-      exclude: {
-        kind: ["diagnostic", "metric"],
+      // This is necessary to ensure that the next import filter
+      // is applied correctly
+      exclude: {},
+    },
+    {
+      // Only include problem queries
+      include: {
+        kind: SARIF_RESULTS_QUERY_KINDS,
       },
     },
   ];