Skip to content

Commit 72b2080

Browse files
committed
Rename search methods
To be consistent with other database item search methods, we're renaming ours: `digForDatabaseItem` -> `findDatabaseItemByNwo` and `digForDatabaseItemSameLanguage` -> `findDatabaseItemByLanguage`
1 parent 6b26323 commit 72b2080

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

extensions/ql-vscode/src/skeleton-query-wizard.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export class SkeletonQueryWizard {
239239

240240
const databaseNwo = QUERY_LANGUAGE_TO_DATABASE_REPO[this.language];
241241

242-
const existingDatabaseItem = await this.digForDatabaseItem(
242+
const existingDatabaseItem = await this.findDatabaseItemByNwo(
243243
this.language,
244244
databaseNwo,
245245
this.databaseManager.databaseItems,
@@ -249,11 +249,10 @@ export class SkeletonQueryWizard {
249249
// select the found database
250250
await this.databaseManager.setCurrentDatabaseItem(existingDatabaseItem);
251251
} else {
252-
const sameLanguageDatabaseItem =
253-
await this.digForDatabaseWithSameLanguage(
254-
this.language,
255-
this.databaseManager.databaseItems,
256-
);
252+
const sameLanguageDatabaseItem = await this.findDatabaseItemByLanguage(
253+
this.language,
254+
this.databaseManager.databaseItems,
255+
);
257256

258257
if (sameLanguageDatabaseItem) {
259258
// select the found database
@@ -267,7 +266,7 @@ export class SkeletonQueryWizard {
267266
}
268267
}
269268

270-
public async digForDatabaseItem(
269+
public async findDatabaseItemByNwo(
271270
language: string,
272271
databaseNwo: string,
273272
databaseItems: readonly DatabaseItem[],
@@ -282,7 +281,7 @@ export class SkeletonQueryWizard {
282281
return dbs[0];
283282
}
284283

285-
public async digForDatabaseWithSameLanguage(
284+
public async findDatabaseItemByLanguage(
286285
language: string,
287286
databaseItems: readonly DatabaseItem[],
288287
): Promise<DatabaseItem | undefined> {

extensions/ql-vscode/test/vscode-tests/cli-integration/skeleton-query-wizard.test.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -347,13 +347,13 @@ describe("SkeletonQueryWizard", () => {
347347
});
348348
});
349349

350-
describe("digForDatabaseItem", () => {
350+
describe("findDatabaseItemByNwo", () => {
351351
describe("when the item exists", () => {
352352
it("should return the database item", async () => {
353353
const mockDbItem = createMockDB(dir);
354354
const mockDbItem2 = createMockDB(dir);
355355

356-
const databaseItem = await wizard.digForDatabaseItem(
356+
const databaseItem = await wizard.findDatabaseItemByNwo(
357357
mockDbItem.language,
358358
mockDbItem.name,
359359
[mockDbItem, mockDbItem2],
@@ -369,9 +369,9 @@ describe("SkeletonQueryWizard", () => {
369369
const mockDbItem = createMockDB(dir);
370370
const mockDbItem2 = createMockDB(dir);
371371

372-
const databaseItem = await wizard.digForDatabaseItem(
372+
const databaseItem = await wizard.findDatabaseItemByNwo(
373373
"ruby",
374-
"mock-database-name",
374+
"mock-nwo",
375375
[mockDbItem, mockDbItem2],
376376
);
377377

@@ -380,7 +380,7 @@ describe("SkeletonQueryWizard", () => {
380380
});
381381
});
382382

383-
describe("digForDatabaseWithSameLanguage", () => {
383+
describe("findDatabaseItemByLanguage", () => {
384384
describe("when the item exists", () => {
385385
it("should return the database item", async () => {
386386
const mockDbItem = createMockDB(dir, {
@@ -390,10 +390,10 @@ describe("SkeletonQueryWizard", () => {
390390
language: "javascript",
391391
} as FullDatabaseOptions);
392392

393-
const databaseItem = await wizard.digForDatabaseWithSameLanguage(
394-
"ruby",
395-
[mockDbItem, mockDbItem2],
396-
);
393+
const databaseItem = await wizard.findDatabaseItemByLanguage("ruby", [
394+
mockDbItem,
395+
mockDbItem2,
396+
]);
397397

398398
expect(databaseItem).toEqual(mockDbItem);
399399
});
@@ -404,10 +404,10 @@ describe("SkeletonQueryWizard", () => {
404404
const mockDbItem = createMockDB(dir);
405405
const mockDbItem2 = createMockDB(dir);
406406

407-
const databaseItem = await wizard.digForDatabaseWithSameLanguage(
408-
"ruby",
409-
[mockDbItem, mockDbItem2],
410-
);
407+
const databaseItem = await wizard.findDatabaseItemByLanguage("ruby", [
408+
mockDbItem,
409+
mockDbItem2,
410+
]);
411411

412412
expect(databaseItem).toBeUndefined();
413413
});

0 commit comments

Comments
 (0)