Refactor CLI feature checks

Author: paldepind

extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -41,6 +41,12 @@ import { ExitCodeError, getCliError } from "./cli-errors";
 import { UserCancellationException } from "../common/vscode/progress";
 import type { LanguageClient } from "vscode-languageclient/node";
 
+/**
+ * The oldest version of the CLI that we support. This is used to determine
+ * whether to show a warning about the CLI being too old on startup.
+ */
+export const OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.20.7");
+
 /**
  * The version of the SARIF format that we are using.
  */
@@ -273,8 +279,6 @@ export class CodeQLCliServer implements Disposable {
   /** Path to current codeQL executable, or undefined if not running yet. */
   codeQlPath: string | undefined;
 
-  cliConstraints = new CliVersionConstraint(this);
-
   /**
    * When set to true, ignore some modal popups and assume user has clicked "yes".
    */
@@ -1816,6 +1820,11 @@ export class CodeQLCliServer implements Disposable {
   public async setUseExtensionPacks(useExtensionPacks: boolean) {
     await this.cliConfig.setUseExtensionPacks(useExtensionPacks);
   }
+
+  /** Checks if the CLI supports a specific feature. */
+  public async supportsFeature(feature: keyof CliFeatures): Promise<boolean> {
+    return (await this.getFeatures())[feature] === true;
+  }
 }
 
 /**
@@ -1922,17 +1931,3 @@ export function shouldDebugQueryServer() {
 function shouldDebugCliServer() {
   return isEnvTrue("CLI_SERVER_JAVA_DEBUG");
 }
-
-export class CliVersionConstraint {
-  // The oldest version of the CLI that we support. This is used to determine
-  // whether to show a warning about the CLI being too old on startup.
-  public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.20.7");
-
-  constructor(private readonly cli: CodeQLCliServer) {
-    /**/
-  }
-
-  async supportsQueryServerRunQueries(): Promise<boolean> {
-    return (await this.cli.getFeatures()).queryServerRunQueries === true;
-  }
-}

extensions/ql-vscode/src/extension.ts

@@ -21,7 +21,10 @@ import {
   activate as archiveFilesystemProvider_activate,
   zipArchiveScheme,
 } from "./common/vscode/archive-filesystem-provider";
-import { CliVersionConstraint, CodeQLCliServer } from "./codeql-cli/cli";
+import {
+  CodeQLCliServer,
+  OLDEST_SUPPORTED_CLI_VERSION,
+} from "./codeql-cli/cli";
 import {
   ADD_DATABASE_SOURCE_TO_WORKSPACE_SETTING,
   addDatabaseSourceToWorkspace,
@@ -451,29 +454,19 @@ export async function activate(
 
     let unsupportedWarningShown = false;
     codeQlExtension.cliServer.addVersionChangedListener((ver) => {
-      if (!ver) {
-        return;
-      }
-
-      if (unsupportedWarningShown) {
-        return;
-      }
-
       if (
-        CliVersionConstraint.OLDEST_SUPPORTED_CLI_VERSION.compare(
-          ver.version,
-        ) <= 0
+        ver &&
+        !unsupportedWarningShown &&
+        OLDEST_SUPPORTED_CLI_VERSION.compare(ver.version) === 1
       ) {
-        return;
+        void showAndLogWarningMessage(
+          extLogger,
+          `You are using an unsupported version of the CodeQL CLI (${ver.version.toString()}). ` +
+            `The minimum supported version is ${OLDEST_SUPPORTED_CLI_VERSION.toString()}. ` +
+            `Please upgrade to a newer version of the CodeQL CLI.`,
+        );
+        unsupportedWarningShown = true;
       }
-
-      void showAndLogWarningMessage(
-        extLogger,
-        `You are using an unsupported version of the CodeQL CLI (${ver.version.toString()}). ` +
-          `The minimum supported version is ${CliVersionConstraint.OLDEST_SUPPORTED_CLI_VERSION.toString()}. ` +
-          `Please upgrade to a newer version of the CodeQL CLI.`,
-      );
-      unsupportedWarningShown = true;
     });
 
     // Expose the CodeQL CLI features to the extension context under `codeQL.cliFeatures.*`.

extensions/ql-vscode/src/query-server/query-server-client.ts

@@ -101,7 +101,7 @@ export class QueryServerClient extends DisposableObject {
    * queries at once.
    */
   async supportsRunQueriesMethod(): Promise<boolean> {
-    return await this.cliServer.cliConstraints.supportsQueryServerRunQueries();
+    return await this.cliServer.supportsFeature("queryServerRunQueries");
   }
 
   /** Stops the query server by disposing of the current server process. */