Skip to content

Commit 0dd8051

Browse files
author
Alexander Eyers-Taylor
committed
Adjust name for quick-eval-count-queries
1 parent 352ffd4 commit 0dd8051

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export interface InitialQueryInfo {
4141
readonly queryText: string; // text of the selected file, or the selected text when doing quick eval
4242
readonly isQuickQuery: boolean;
4343
readonly isQuickEval: boolean;
44+
readonly isQuickEvalCount?: boolean; // Missing is false for backwards compatibility
4445
readonly quickEvalPosition?: messages.Position;
4546
readonly queryPath: string;
4647
readonly databaseInfo: DatabaseInfo;
@@ -270,7 +271,9 @@ export class LocalQueryInfo {
270271
* - Otherwise, return the query file name.
271272
*/
272273
getQueryName() {
273-
if (this.initialInfo.quickEvalPosition) {
274+
if (this.initialInfo.isQuickEvalCount) {
275+
return `Quick evaluation counts of ${this.getQueryFileName()}`;
276+
} else if (this.initialInfo.isQuickEval) {
274277
return `Quick evaluation of ${this.getQueryFileName()}`;
275278
} else if (this.completedQuery?.query.metadata?.name) {
276279
return this.completedQuery?.query.metadata?.name;

extensions/ql-vscode/src/run-queries-shared.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,12 @@ export async function createInitialQueryInfo(
585585
databaseInfo: DatabaseInfo,
586586
): Promise<InitialQueryInfo> {
587587
const isQuickEval = selectedQuery.quickEval !== undefined;
588+
const isQuickEvalCount =
589+
selectedQuery.quickEval?.quickEvalCount !== undefined;
588590
return {
589591
queryPath: selectedQuery.queryPath,
590592
isQuickEval,
593+
isQuickEvalCount,
591594
isQuickQuery: isQuickQueryPath(selectedQuery.queryPath),
592595
databaseInfo,
593596
id: `${basename(selectedQuery.queryPath)}-${nanoid()}`,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ describe("query-results", () => {
5858
endLine: 2,
5959
fileName: "/home/users/yz",
6060
};
61+
(fqi.initialInfo as any).isQuickEval = true;
6162
expect(fqi.getQueryName()).toBe("Quick evaluation of yz:1-2");
6263
(fqi.initialInfo as any).quickEvalPosition.endLine = 1;
6364
expect(fqi.getQueryName()).toBe("Quick evaluation of yz:1");

0 commit comments

Comments
 (0)