Skip to content

Commit f7caf01

Browse files
authored
Merge pull request #3806 from asgerf/hackathon/compare-perf
Fix CI for hackathon branch
2 parents c4578a9 + 93da37d commit f7caf01

File tree

6 files changed

+17
-2
lines changed

6 files changed

+17
-2
lines changed

extensions/ql-vscode/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,6 +1738,10 @@
17381738
"command": "codeQLQueryHistory.compareWith",
17391739
"when": "false"
17401740
},
1741+
{
1742+
"command": "codeQLQueryHistory.comparePerformanceWith",
1743+
"when": "false"
1744+
},
17411745
{
17421746
"command": "codeQLQueryHistory.sortByName",
17431747
"when": "false"

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,13 @@ export class LocalQueryInfo {
200200
private cancellationSource?: CancellationTokenSource, // used to cancel in progress queries
201201
public failureReason?: string,
202202
public completedQuery?: CompletedQueryInfo,
203-
public evalutorLogPaths?: EvaluatorLogPaths,
203+
public evalutorLogPaths: EvaluatorLogPaths = {
204+
log: undefined,
205+
humanReadableSummary: undefined,
206+
endSummary: undefined,
207+
jsonSummary: undefined,
208+
summarySymbols: undefined,
209+
},
204210
) {
205211
/**/
206212
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* A set of names, for generating unambiguous abbreviations.
33
*/
4-
export class NameSet {
4+
class NameSet {
55
private readonly abbreviations = new Map<string, string>();
66

77
constructor(readonly names: string[]) {

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ describe("HistoryTreeDataProvider", () => {
3838
let app: App;
3939
let configListener: QueryHistoryConfigListener;
4040
const doCompareCallback = jest.fn();
41+
const doComparePerformanceCallback = jest.fn();
4142

4243
let queryHistoryManager: QueryHistoryManager;
4344

@@ -506,6 +507,7 @@ describe("HistoryTreeDataProvider", () => {
506507
}),
507508
languageContext,
508509
doCompareCallback,
510+
doComparePerformanceCallback,
509511
);
510512
(qhm.treeDataProvider as any).history = [...allHistory];
511513
await workspace.saveAll();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ describe("QueryHistoryManager", () => {
4040
typeof variantAnalysisManagerStub.cancelVariantAnalysis
4141
>;
4242
const doCompareCallback = jest.fn();
43+
const doComparePerformanceCallback = jest.fn();
4344

4445
let executeCommand: jest.MockedFn<
4546
(commandName: string, ...args: any[]) => Promise<any>
@@ -939,6 +940,7 @@ describe("QueryHistoryManager", () => {
939940
}),
940941
new LanguageContextStore(mockApp),
941942
doCompareCallback,
943+
doComparePerformanceCallback,
942944
);
943945
(qhm.treeDataProvider as any).history = [...allHistory];
944946
await workspace.saveAll();

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ describe("Variant Analyses and QueryHistoryManager", () => {
105105
}),
106106
new LanguageContextStore(app),
107107
asyncNoop,
108+
asyncNoop,
108109
);
109110
disposables.push(qhm);
110111

0 commit comments

Comments
 (0)