Skip to content

Commit c8e2271

Browse files
author
Alexander Eyers-Taylor
committed
Adjust name for quick-eval-count-queries
1 parent 7937e97 commit c8e2271

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;
@@ -268,7 +269,9 @@ export class LocalQueryInfo {
268269
* - Otherwise, return the query file name.
269270
*/
270271
getQueryName() {
271-
if (this.initialInfo.quickEvalPosition) {
272+
if (this.initialInfo.isQuickEvalCount) {
273+
return `Quick evaluation counts of ${this.getQueryFileName()}`;
274+
} else if (this.initialInfo.isQuickEval) {
272275
return `Quick evaluation of ${this.getQueryFileName()}`;
273276
} else if (this.completedQuery?.query.metadata?.name) {
274277
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
@@ -591,9 +591,12 @@ export async function createInitialQueryInfo(
591591
databaseInfo: DatabaseInfo,
592592
): Promise<InitialQueryInfo> {
593593
const isQuickEval = selectedQuery.quickEval !== undefined;
594+
const isQuickEvalCount =
595+
selectedQuery.quickEval?.quickEvalCount !== undefined;
594596
return {
595597
queryPath: selectedQuery.queryPath,
596598
isQuickEval,
599+
isQuickEvalCount,
597600
isQuickQuery: isQuickQueryPath(selectedQuery.queryPath),
598601
databaseInfo,
599602
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)