Use CliConstraints consistently

koesie10 · koesie10 · commit adb7072cabe3 · 2025-07-11T16:42:18.000+02:00
diff --git a/extensions/ql-vscode/src/codeql-cli/cli-version.ts b/extensions/ql-vscode/src/codeql-cli/cli-version.ts
@@ -10,7 +10,6 @@ interface VersionResult {
 }
 
 export interface CliFeatures {
-  featuresInVersionResult?: boolean;
   queryServerRunQueries?: boolean;
 }
 
diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts
@@ -269,7 +269,7 @@ export class CodeQLCliServer implements Disposable {
   /** Path to current codeQL executable, or undefined if not running yet. */
   codeQlPath: string | undefined;
 
-  cliConstraints = new CliVersionConstraint();
+  cliConstraints = new CliVersionConstraint(this);
 
   /**
    * When set to true, ignore some modal popups and assume user has clicked "yes".
@@ -1902,4 +1902,12 @@ 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.18.4");
+
+  constructor(private readonly cli: CodeQLCliServer) {
+    /**/
+  }
+
+  async supportsQueryServerRunQueries(): Promise<boolean> {
+    return (await this.cli.getFeatures()).queryServerRunQueries === true;
+  }
 }
diff --git a/extensions/ql-vscode/src/query-server/query-server-client.ts b/extensions/ql-vscode/src/query-server/query-server-client.ts
@@ -100,7 +100,7 @@ export class QueryServerClient extends DisposableObject {
    * queries at once.
    */
   async supportsRunQueriesMethod(): Promise<boolean> {
-    return (await this.cliServer.getFeatures()).queryServerRunQueries === true;
+    return await this.cliServer.cliConstraints.supportsQueryServerRunQueries();
   }
 
   /** Stops the query server by disposing of the current server process. */

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ interface VersionResult {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`export interface CliFeatures {`
`13`		`- featuresInVersionResult?: boolean;`
`14`	`13`	`queryServerRunQueries?: boolean;`
`15`	`14`	`}`
`16`	`15`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ export class QueryServerClient extends DisposableObject {`
`100`	`100`	`* queries at once.`
`101`	`101`	`*/`
`102`	`102`	`async supportsRunQueriesMethod(): Promise<boolean> {`
`103`		`- return (await this.cliServer.getFeatures()).queryServerRunQueries === true;`
	`103`	`+ return await this.cliServer.cliConstraints.supportsQueryServerRunQueries();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/** Stops the query server by disposing of the current server process. */`