mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rename search methods

Browse Source 
To be consistent with other database item search methods, we're renaming
ours:

`digForDatabaseItem` -> `findDatabaseItemByNwo`
and
`digForDatabaseItemSameLanguage` -> `findDatabaseItemByLanguage`
This commit is contained in:
Elena Tanasoiu
2023-04-11 08:56:54 +00:00
parent 6b26323ee0
commit 72b2080b02
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/ql-vscode/src/skeleton-query-wizard.ts
View File

@@ -239,7 +239,7 @@ export class SkeletonQueryWizard {
const databaseNwo = QUERY_LANGUAGE_TO_DATABASE_REPO[this.language];
const existingDatabaseItem = await this.digForDatabaseItem(
const existingDatabaseItem = await this.findDatabaseItemByNwo(
this.language,
databaseNwo,
this.databaseManager.databaseItems,
@@ -249,11 +249,10 @@ export class SkeletonQueryWizard {
// select the found database
await this.databaseManager.setCurrentDatabaseItem(existingDatabaseItem);
} else {
const sameLanguageDatabaseItem =
await this.digForDatabaseWithSameLanguage(
this.language,
this.databaseManager.databaseItems,
);
const sameLanguageDatabaseItem = await this.findDatabaseItemByLanguage(
this.language,
this.databaseManager.databaseItems,
);
if (sameLanguageDatabaseItem) {
// select the found database
@@ -267,7 +266,7 @@ export class SkeletonQueryWizard {
}
}
public async digForDatabaseItem(
public async findDatabaseItemByNwo(
language: string,
databaseNwo: string,
databaseItems: readonly DatabaseItem[],
@@ -282,7 +281,7 @@ export class SkeletonQueryWizard {
return dbs[0];
}
public async digForDatabaseWithSameLanguage(
public async findDatabaseItemByLanguage(
language: string,
databaseItems: readonly DatabaseItem[],
): Promise<DatabaseItem | undefined> {

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

@@ -347,13 +347,13 @@ describe("SkeletonQueryWizard", () => {
});
});
describe("digForDatabaseItem", () => {
describe("findDatabaseItemByNwo", () => {
describe("when the item exists", () => {
it("should return the database item", async () => {
const mockDbItem = createMockDB(dir);
const mockDbItem2 = createMockDB(dir);
const databaseItem = await wizard.digForDatabaseItem(
const databaseItem = await wizard.findDatabaseItemByNwo(
mockDbItem.language,
mockDbItem.name,
[mockDbItem, mockDbItem2],
@@ -369,9 +369,9 @@ describe("SkeletonQueryWizard", () => {
const mockDbItem = createMockDB(dir);
const mockDbItem2 = createMockDB(dir);
const databaseItem = await wizard.digForDatabaseItem(
const databaseItem = await wizard.findDatabaseItemByNwo(
"ruby",
"mock-database-name",
"mock-nwo",
[mockDbItem, mockDbItem2],
);
@@ -380,7 +380,7 @@ describe("SkeletonQueryWizard", () => {
});
});
describe("digForDatabaseWithSameLanguage", () => {
describe("findDatabaseItemByLanguage", () => {
describe("when the item exists", () => {
it("should return the database item", async () => {
const mockDbItem = createMockDB(dir, {
@@ -390,10 +390,10 @@ describe("SkeletonQueryWizard", () => {
language: "javascript",
} as FullDatabaseOptions);
const databaseItem = await wizard.digForDatabaseWithSameLanguage(
"ruby",
[mockDbItem, mockDbItem2],
);
const databaseItem = await wizard.findDatabaseItemByLanguage("ruby", [
mockDbItem,
mockDbItem2,
]);
expect(databaseItem).toEqual(mockDbItem);
});
@@ -404,10 +404,10 @@ describe("SkeletonQueryWizard", () => {
const mockDbItem = createMockDB(dir);
const mockDbItem2 = createMockDB(dir);
const databaseItem = await wizard.digForDatabaseWithSameLanguage(
"ruby",
[mockDbItem, mockDbItem2],
);
const databaseItem = await wizard.findDatabaseItemByLanguage("ruby", [
mockDbItem,
mockDbItem2,
]);
expect(databaseItem).toBeUndefined();
});