Add support for bqrs diff --result-sets option

Author: paldepind

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

@@ -11,6 +11,7 @@ interface VersionResult {
 
 export interface CliFeatures {
   queryServerRunQueries?: boolean;
+  bqrsDiffResultSets?: boolean;
 }
 
 export interface VersionAndFeatures {

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

@@ -211,6 +211,7 @@ interface BqrsDecodeOptions {
 
 interface BqrsDiffOptions {
   retainResultSets?: string[];
+  resultSets?: Array<[string, string]>;
 }
 
 type OnLineCallback = (line: string) => Promise<string | undefined>;
@@ -1283,6 +1284,12 @@ export class CodeQLCliServer implements Disposable {
         ...(options?.retainResultSets
           ? ["--retain-result-sets", options.retainResultSets.join(",")]
           : []),
+        ...(options?.resultSets
+          ? options.resultSets.flatMap(([left, right]) => [
+              "--result-sets",
+              `${left},${right}`,
+            ])
+          : []),
         bqrsPath1,
         bqrsPath2,
       ],