bqrsDiff does not set retain-result-sets if option is not given

Author: paldepind

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

@@ -1276,8 +1276,9 @@ export class CodeQLCliServer implements Disposable {
         uniquePath1,
         "--right",
         uniquePath2,
-        "--retain-result-sets",
-        options?.retainResultSets?.join(",") ?? "",
+        ...(options?.retainResultSets
+          ? ["--retain-result-sets", options.retainResultSets.join(",")]
+          : []),
         bqrsPath1,
         bqrsPath2,
       ],

extensions/ql-vscode/src/compare/compare-view.ts

@@ -408,7 +408,9 @@ export class CompareView extends AbstractWebview<
     // comparing different result sets.
     if (fromResultSetName === toResultSetName) {
       const { uniquePath1, uniquePath2, cleanup } =
-        await this.cliServer.bqrsDiff(fromPath, toPath);
+        await this.cliServer.bqrsDiff(fromPath, toPath, {
+          retainResultSets: [],
+        });
       try {
         const uniqueInfo1 = await this.cliServer.bqrsInfo(uniquePath1);
         const uniqueInfo2 = await this.cliServer.bqrsInfo(uniquePath2);
@@ -476,7 +478,6 @@ export class CompareView extends AbstractWebview<
       await this.cliServer.bqrsDiff(
         fromQuery.completedQuery.query.resultsPath,
         toQuery.completedQuery.query.resultsPath,
-        { retainResultSets: ["nodes", "edges", "subpaths"] },
       );
     try {
       const sarifOutput1 = join(path, "from.sarif");