Skip to content

Commit 484b766

Browse files
authored
Typo fixes in query history methods/properties (#1594)
1 parent 33dd50c commit 484b766

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

extensions/ql-vscode/src/contextual/locationFinder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export async function getLocationsForUriString(
6565
false
6666
);
6767
const results = await qs.compileAndRunQueryAgainstDatabase(db, initialInfo, queryStorageDir, progress, token, templates);
68-
if (results.sucessful) {
68+
if (results.successful) {
6969
links.push(...await getLinksFromResults(results, cli, db, filter));
7070
}
7171
}

extensions/ql-vscode/src/interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ export class ResultsView extends AbstractWebview<IntoResultsViewMsg, FromResults
326326
forceReveal: WebviewReveal,
327327
shouldKeepOldResultsWhileRendering = false
328328
): Promise<void> {
329-
if (!fullQuery.completedQuery.sucessful) {
329+
if (!fullQuery.completedQuery.successful) {
330330
return;
331331
}
332332

extensions/ql-vscode/src/legacy-query-server/run-queries.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ export async function compileAndRunQueryAgainstDatabase(
420420
query: query.queryEvalInfo,
421421
message,
422422
result,
423-
sucessful: result.resultType == messages.QueryResultType.SUCCESS,
423+
successful: result.resultType == messages.QueryResultType.SUCCESS,
424424
logFileLocation: result.logFileLocation,
425425
dispose: () => {
426426
qs.logger.removeAdditionalLogLocation(result.logFileLocation);
@@ -497,14 +497,14 @@ function createSyntheticResult(
497497
return {
498498
query: query.queryEvalInfo,
499499
message,
500-
result:{
501-
evaluationTime:0,
500+
result: {
501+
evaluationTime: 0,
502502
queryId: 0,
503503
resultType: messages.QueryResultType.OTHER_ERROR,
504504
message,
505505
runId: 0,
506506
},
507-
sucessful: false,
507+
successful: false,
508508
dispose: () => { /**/ },
509509
};
510510
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type Counter = {
2626
* @param queryDirectory The directory containing all queries.
2727
* @param ctx The extension context.
2828
*/
29-
export function registerQueryHistoryScubber(
29+
export function registerQueryHistoryScrubber(
3030
wakeInterval: number,
3131
throttleTime: number,
3232
maxQueryTime: number,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ 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 as LocalQueryInfo, QueryHistoryInfo } from './query-results';
3434
import { DatabaseManager } from './databases';
35-
import { registerQueryHistoryScubber } from './query-history-scrubber';
35+
import { registerQueryHistoryScrubber } from './query-history-scrubber';
3636
import { QueryStatus } from './query-status';
3737
import { slurpQueryHistory, splatQueryHistory } from './query-serialization';
3838
import * as fs from 'fs-extra';
@@ -573,7 +573,7 @@ export class QueryHistoryManager extends DisposableObject {
573573
this.queryHistoryScrubber?.dispose();
574574
// Every hour check if we need to re-run the query history scrubber.
575575
this.queryHistoryScrubber = this.push(
576-
registerQueryHistoryScubber(
576+
registerQueryHistoryScrubber(
577577
ONE_HOUR_IN_MS,
578578
TWO_HOURS_IN_MS,
579579
queryHistoryConfigListener.ttlInMillis,
@@ -795,7 +795,7 @@ export class QueryHistoryManager extends DisposableObject {
795795
throw new Error('Please select a local query.');
796796
}
797797

798-
if (!finalSingleItem.completedQuery?.sucessful) {
798+
if (!finalSingleItem.completedQuery?.successful) {
799799
throw new Error('Please select a query that has completed successfully.');
800800
}
801801

@@ -1236,7 +1236,7 @@ the file in the file explorer and dragging it into the workspace.`
12361236
if (!otherQuery.completedQuery) {
12371237
throw new Error('Please select a completed query.');
12381238
}
1239-
if (!otherQuery.completedQuery.sucessful) {
1239+
if (!otherQuery.completedQuery.successful) {
12401240
throw new Error('Please select a successful query.');
12411241
}
12421242
if (otherQuery.initialInfo.databaseInfo.name !== dbName) {
@@ -1256,7 +1256,7 @@ the file in the file explorer and dragging it into the workspace.`
12561256
otherQuery !== singleItem &&
12571257
otherQuery.t === 'local' &&
12581258
otherQuery.completedQuery &&
1259-
otherQuery.completedQuery.sucessful &&
1259+
otherQuery.completedQuery.successful &&
12601260
otherQuery.initialInfo.databaseInfo.name === dbName
12611261
)
12621262
.map((item) => ({

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export interface InitialQueryInfo {
4747
export class CompletedQueryInfo implements QueryWithResults {
4848
readonly query: QueryEvaluationInfo;
4949
readonly message?: string;
50-
readonly sucessful?: boolean;
50+
readonly successful?: boolean;
5151
/**
5252
* The legacy result. This is only set when loading from the query history.
5353
*/
@@ -86,7 +86,7 @@ export class CompletedQueryInfo implements QueryWithResults {
8686
this.result = evaluation.result;
8787

8888
this.message = evaluation.message;
89-
this.sucessful = evaluation.sucessful;
89+
this.successful = evaluation.successful;
9090
// Use the dispose method from the evaluation.
9191
// The dispose will clean up any additional log locations that this
9292
// query may have created.
@@ -301,7 +301,7 @@ export class LocalQueryInfo {
301301
return QueryStatus.Failed;
302302
} else if (!this.completedQuery) {
303303
return QueryStatus.InProgress;
304-
} else if (this.completedQuery.sucessful) {
304+
} else if (this.completedQuery.successful) {
305305
return QueryStatus.Completed;
306306
} else {
307307
return QueryStatus.Failed;

extensions/ql-vscode/src/query-server/run-queries.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,18 @@ export async function compileAndRunQueryAgainstDatabase(
124124
message = result.message ? `failed: ${result.message}` : 'failed';
125125
break;
126126
}
127-
const sucessful = result.resultType === messages.QueryResultType.SUCCESS;
127+
const successful = result.resultType === messages.QueryResultType.SUCCESS;
128128
return {
129129
query,
130130
result: {
131131
evaluationTime: result.evaluationTime,
132132
queryId: 0,
133-
resultType: sucessful ? legacyMessages.QueryResultType.SUCCESS : legacyMessages.QueryResultType.OTHER_ERROR,
133+
resultType: successful ? legacyMessages.QueryResultType.SUCCESS : legacyMessages.QueryResultType.OTHER_ERROR,
134134
runId: 0,
135135
message
136136
},
137137
message,
138-
sucessful,
138+
successful,
139139
dispose: () => {
140140
qs.logger.removeAdditionalLogLocation(undefined);
141141
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ export interface QueryWithResults {
373373
readonly query: QueryEvaluationInfo;
374374
readonly logFileLocation?: string;
375375
readonly dispose: () => void;
376-
readonly sucessful?: boolean;
376+
readonly successful?: boolean;
377377
readonly message?: string;
378378
readonly result: legacyMessages.EvaluationResult;
379379
}

extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ describe('Queries', function() {
112112
);
113113

114114
// just check that the query was successful
115-
expect((await result).sucessful).to.eq(true);
115+
expect((await result).successful).to.eq(true);
116116
} catch (e) {
117117
console.error('Test Failed');
118118
fail(e as Error);
@@ -132,7 +132,7 @@ describe('Queries', function() {
132132
token
133133
);
134134

135-
expect(result.sucessful).to.eq(true);
135+
expect(result.successful).to.eq(true);
136136
} catch (e) {
137137
console.error('Test Failed');
138138
fail(e as Error);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as vscode from 'vscode';
55
import * as sinon from 'sinon';
66

77
import { logger } from '../../logging';
8-
import { registerQueryHistoryScubber } from '../../query-history-scrubber';
8+
import { registerQueryHistoryScrubber } from '../../query-history-scrubber';
99
import { QueryHistoryManager, HistoryTreeDataProvider, SortOrder } from '../../query-history';
1010
import { QueryEvaluationInfo, QueryWithResults } from '../../run-queries-shared';
1111
import { QueryHistoryConfig, QueryHistoryConfigListener } from '../../config';
@@ -581,7 +581,7 @@ describe('query-history', () => {
581581
}
582582
});
583583

584-
function createMockFullQueryInfo(dbName = 'a', queryWitbResults?: QueryWithResults, isFail = false): LocalQueryInfo {
584+
function createMockFullQueryInfo(dbName = 'a', queryWithResults?: QueryWithResults, isFail = false): LocalQueryInfo {
585585
const fqi = new LocalQueryInfo(
586586
{
587587
databaseInfo: { name: dbName },
@@ -593,8 +593,8 @@ describe('query-history', () => {
593593
} as vscode.CancellationTokenSource
594594
);
595595

596-
if (queryWitbResults) {
597-
fqi.completeThisQuery(queryWitbResults);
596+
if (queryWithResults) {
597+
fqi.completeThisQuery(queryWithResults);
598598
}
599599
if (isFail) {
600600
fqi.failureReason = 'failure reason';
@@ -759,7 +759,7 @@ describe('query-history', () => {
759759
}
760760

761761
function registerScrubber(dir: string) {
762-
deregister = registerQueryHistoryScubber(
762+
deregister = registerQueryHistoryScrubber(
763763
ONE_HOUR_IN_MS,
764764
TWO_HOURS_IN_MS,
765765
LESS_THAN_ONE_DAY,
@@ -785,7 +785,7 @@ describe('query-history', () => {
785785
hasInterpretedResults: () => Promise.resolve(hasInterpretedResults),
786786
deleteQuery: sandbox.stub(),
787787
} as unknown as QueryEvaluationInfo,
788-
sucessful: didRunSuccessfully,
788+
successful: didRunSuccessfully,
789789
message: 'foo',
790790
dispose: sandbox.spy(),
791791
result: {

0 commit comments

Comments
 (0)