Skip to content

Commit 0413b01

Browse files
committed
Implement getQueryText for variant analysis items
Also moved this to the `query-history-info` helper file
1 parent 6b27a42 commit 0413b01

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,16 @@ export function getQueryHistoryItemId(item: QueryHistoryInfo): string {
3030
assertNever(item);
3131
}
3232
}
33+
34+
export function getQueryText(item: QueryHistoryInfo): string {
35+
switch (item.t) {
36+
case 'local':
37+
return item.initialInfo.queryText;
38+
case 'remote':
39+
return item.remoteQuery.queryText;
40+
case 'variant-analysis':
41+
return item.variantAnalysis.query.text;
42+
default:
43+
assertNever(item);
44+
}
45+
}

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { commandRunner } from './commandRunner';
3131
import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from './pure/time';
3232
import { assertNever, getErrorMessage, getErrorStack } from './pure/helpers-pure';
3333
import { CompletedLocalQueryInfo, LocalQueryInfo } from './query-results';
34-
import { getQueryHistoryItemId, QueryHistoryInfo } from './query-history-info';
34+
import { getQueryHistoryItemId, getQueryText, QueryHistoryInfo } from './query-history-info';
3535
import { DatabaseManager } from './databases';
3636
import { registerQueryHistoryScrubber } from './query-history-scrubber';
3737
import { QueryStatus } from './query-status';
@@ -1067,7 +1067,7 @@ export class QueryHistoryManager extends DisposableObject {
10671067

10681068
const params = new URLSearchParams({
10691069
isQuickEval: String(!!(finalSingleItem.t === 'local' && finalSingleItem.initialInfo.quickEvalPosition)),
1070-
queryText: encodeURIComponent(await this.getQueryText(finalSingleItem)),
1070+
queryText: encodeURIComponent(getQueryText(finalSingleItem)),
10711071
});
10721072

10731073
const queryId = getQueryHistoryItemId(finalSingleItem);
@@ -1191,19 +1191,6 @@ export class QueryHistoryManager extends DisposableObject {
11911191
await commands.executeCommand('codeQL.copyRepoList', finalSingleItem.queryId);
11921192
}
11931193

1194-
async getQueryText(item: QueryHistoryInfo): Promise<string> {
1195-
switch (item.t) {
1196-
case 'local':
1197-
return item.initialInfo.queryText;
1198-
case 'remote':
1199-
return item.remoteQuery.queryText;
1200-
case 'variant-analysis':
1201-
return 'TODO';
1202-
default:
1203-
assertNever(item);
1204-
}
1205-
}
1206-
12071194
async handleExportResults(): Promise<void> {
12081195
await commands.executeCommand('codeQL.exportVariantAnalysisResults');
12091196
}

0 commit comments

Comments
 (0)