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

aeisenberg · aeisenberg · commit de06ed148dfc · 2022-03-29T14:21:15.000-07:00
diff --git a/extensions/ql-vscode/src/query-history.ts b/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 + '?');
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as path from 'path';`
`2`		`-import * as fs from 'fs-extra';`
`3`	`2`	`import {`
`4`	`3`	`commands,`
`5`	`4`	`Disposable,`
`@@ -777,7 +776,7 @@ export class QueryHistoryManager extends DisposableObject {`
`777`	`776`	`}`
`778`	`777`	`}`
`779`	`778`	`}`
`780`		`-`
	`779`	`+`
`781`	`780`	`private warnNoEvalLog() {`
`782`	`781`	`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 + '?');`
`783`	`782`	`}`