Merge branch 'main' into aeisenberg/analysis-results-on-restart

Author: aeisenberg

extensions/ql-vscode/src/query-history.ts

@@ -1,5 +1,4 @@
 import * as path from 'path';
-import * as fs from 'fs-extra';
 import {
   commands,
   Disposable,
@@ -777,7 +776,7 @@ export class QueryHistoryManager extends DisposableObject {
       }
     }
   }
-  
+
   private warnNoEvalLog() {
     void showAndLogWarningMessage('No evaluator log is available for this run. Perhaps it failed before evaluation, or you are running with a version of CodeQL before ' + CliVersionConstraint.CLI_VERSION_WITH_PER_QUERY_EVAL_LOG + '?');
   }

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts

@@ -337,13 +337,13 @@ describe('Remote queries and query history manager', function() {
       // Load remoteQueryResult0.analysisSummaries[1] into memory
       await arm.downloadAnalysisResults(remoteQueryResult0.analysisSummaries[1], () => Promise.resolve());
 
-      expect(await (arm as any).isDownloadedNotInMemory(remoteQueryResult0.analysisSummaries[0])).to.be.true;
+      expect(await (arm as any).isAnalysisDownloadedNotInMemory(remoteQueryResult0.analysisSummaries[0])).to.be.true;
 
       // in memory
-      expect(await (arm as any).isDownloadedNotInMemory(remoteQueryResult0.analysisSummaries[1])).to.be.false;
+      expect(await (arm as any).isAnalysisDownloadedNotInMemory(remoteQueryResult0.analysisSummaries[1])).to.be.false;
 
       // not downloaded
-      expect(await (arm as any).isDownloadedNotInMemory(remoteQueryResult0.analysisSummaries[2])).to.be.false;
+      expect(await (arm as any).isAnalysisDownloadedNotInMemory(remoteQueryResult0.analysisSummaries[2])).to.be.false;
     });
 
     it('should load downloaded artifacts', async () => {