From 540699dccac493fc29e2fa3914b7d408d147991a Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Fri, 8 May 2026 17:59:21 +0100
Subject: [PATCH] Remove `makeOverlayMatchFeatures` indirection

---
 lib/setup-codeql-action.js |  7 +-----
 src/setup-codeql.test.ts   | 46 +++++++++++---------------------------
 2 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js
index 118f19e37..bda595c5c 100644
--- a/lib/setup-codeql-action.js
+++ b/lib/setup-codeql-action.js
@@ -89533,12 +89533,7 @@ async function run(startedAt) {
       gitHubVersion.type,
       codeQLDefaultVersionInfo,
       rawLanguages,
-      // Only consider the languages for overlay-aware version selection if the
-      // user has told us what they intend to analyze and Code Scanning is among
-      // the configured analysis kinds. Without `languages`, the subsequent
-      // `init` invocation may analyze a different set; without Code Scanning,
-      // overlay analysis is not in use anyway.
-      rawLanguages.length > 0 && analysisKinds.includes("code-scanning" /* CodeScanning */),
+      analysisKinds.includes("code-scanning" /* CodeScanning */),
       features,
       logger
     );
diff --git a/src/setup-codeql.test.ts b/src/setup-codeql.test.ts
index c3acb25ab..0a5fb686e 100644
--- a/src/setup-codeql.test.ts
+++ b/src/setup-codeql.test.ts
@@ -618,26 +618,6 @@ test.serial(
   },
 );
 
-function makeOverlayMatchFeatures(opts: {
-  matchFlagEnabled?: boolean;
-  dryRunFlagEnabled?: boolean;
-}): FeatureEnablement {
-  return {
-    getEnabledDefaultCliVersions: async () => {
-      throw new Error("not implemented");
-    },
-    getValue: async (feature) => {
-      if (feature === Feature.OverlayAnalysisMatchCodeqlVersion) {
-        return opts.matchFlagEnabled ?? false;
-      }
-      if (feature === Feature.OverlayAnalysisMatchCodeqlVersionDryRun) {
-        return opts.dryRunFlagEnabled ?? false;
-      }
-      return false;
-    },
-  };
-}
-
 const overlayMatchEnabledVersions = {
   enabledVersions: [
     { cliVersion: "2.20.2", tagName: "codeql-bundle-v2.20.2" },
@@ -674,7 +654,7 @@ test.serial(
         SAMPLE_DOTCOM_API_DETAILS,
         GitHubVariant.DOTCOM,
         false,
-        makeOverlayMatchFeatures({ matchFlagEnabled: true }),
+        createFeatures([Feature.OverlayAnalysisMatchCodeqlVersion]),
         getRunnerLogger(true),
       );
 
@@ -712,7 +692,7 @@ test.serial(
         SAMPLE_DOTCOM_API_DETAILS,
         GitHubVariant.DOTCOM,
         false,
-        makeOverlayMatchFeatures({ matchFlagEnabled: true }),
+        createFeatures([Feature.OverlayAnalysisMatchCodeqlVersion]),
         getRunnerLogger(true),
       );
 
@@ -744,7 +724,7 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       ["javascript"],
-      makeOverlayMatchFeatures({ matchFlagEnabled: true }),
+      createFeatures([Feature.OverlayAnalysisMatchCodeqlVersion]),
       getRunnerLogger(true),
     );
     t.deepEqual(result, [
@@ -767,7 +747,7 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       ["javascript"],
-      makeOverlayMatchFeatures({ matchFlagEnabled: true }),
+      createFeatures([Feature.OverlayAnalysisMatchCodeqlVersion]),
       getRunnerLogger(true),
     );
     t.deepEqual(result, []);
@@ -782,7 +762,7 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       undefined,
-      makeOverlayMatchFeatures({ matchFlagEnabled: true }),
+      createFeatures([Feature.OverlayAnalysisMatchCodeqlVersion]),
       getRunnerLogger(true),
     );
     t.deepEqual(result, []);
@@ -802,7 +782,7 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       ["javascript"],
-      makeOverlayMatchFeatures({ matchFlagEnabled: true }),
+      createFeatures([Feature.OverlayAnalysisMatchCodeqlVersion]),
       getRunnerLogger(true),
     );
     t.deepEqual(result, []);
@@ -822,7 +802,7 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       ["javascript"],
-      makeOverlayMatchFeatures({ matchFlagEnabled: true }),
+      createFeatures([Feature.OverlayAnalysisMatchCodeqlVersion]),
       getRunnerLogger(true),
     );
     t.deepEqual(result, [
@@ -839,7 +819,7 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       ["javascript"],
-      makeOverlayMatchFeatures({}),
+      createFeatures([]),
       getRunnerLogger(true),
     );
     t.deepEqual(result, []);
@@ -863,7 +843,7 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       ["javascript"],
-      makeOverlayMatchFeatures({ dryRunFlagEnabled: true }),
+      createFeatures([Feature.OverlayAnalysisMatchCodeqlVersionDryRun]),
       getRunnerLogger(true),
     );
     t.deepEqual(
@@ -891,10 +871,10 @@ test.serial(
     const result = await setupCodeql.getEnabledVersionsWithOverlayBaseDatabases(
       overlayMatchEnabledVersions,
       ["javascript"],
-      makeOverlayMatchFeatures({
-        matchFlagEnabled: true,
-        dryRunFlagEnabled: true,
-      }),
+      createFeatures([
+        Feature.OverlayAnalysisMatchCodeqlVersion,
+        Feature.OverlayAnalysisMatchCodeqlVersionDryRun,
+      ]),
       getRunnerLogger(true),
     );
     t.deepEqual(result, [