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

Make conditional easier to read

Browse Source
This commit is contained in:
Robert
2023-06-16 12:33:21 +01:00
parent 6504e46011
commit 18e7431a44
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/ql-vscode/src/queries-panel/query-pack-discovery.ts
View File

@@ -48,19 +48,21 @@ export class QueryPackDiscovery extends FilePathDiscovery<QueryPack> {
return undefined;
}
// If the first two packs are from the same directory then look at the filenames
if (
packs.length >= 2 &&
dirname(packs[0].path) === dirname(packs[1].path)
) {
if (basename(packs[0].path) === FALLBACK_QLPACK_FILENAME) {
return packs[0].language;
} else {
return packs[1].language;
}
} else {
if (packs.length === 1) {
return packs[0].language;
}
// If the first two packs are from a different directory, then the first one is the nearest
if (dirname(packs[0].path) !== dirname(packs[1].path)) {
return packs[0].language;
}
// If the first two packs are from the same directory then look at the filenames
if (basename(packs[0].path) === FALLBACK_QLPACK_FILENAME) {
return packs[0].language;
} else {
return packs[1].language;
}
}
protected async getDataForPath(path: string): Promise<QueryPack> {