Skip to content

Commit 9508b62

Browse files
committed
Organise required packs by query language
1 parent aabeba0 commit 9508b62

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

extensions/ql-vscode/src/packaging.ts

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,23 @@ import { ProgressCallback, UserCancellationException } from "./commandRunner";
99
import { extLogger } from "./common";
1010
import { asError, getErrorStack } from "./pure/helpers-pure";
1111
import { redactableError } from "./pure/errors";
12+
import { QueryLanguage } from "./types/query-language";
1213

13-
const QUERY_PACKS = [
14-
"codeql/cpp-queries",
15-
"codeql/csharp-queries",
16-
"codeql/go-queries",
17-
"codeql/java-queries",
18-
"codeql/javascript-queries",
19-
"codeql/python-queries",
20-
"codeql/ruby-queries",
21-
"codeql/csharp-solorigate-queries",
22-
"codeql/javascript-experimental-atm-queries",
23-
];
14+
const PACKS_BY_QUERY_LANGUAGE = {
15+
[QueryLanguage.Cpp]: ["codeql/cpp-queries"],
16+
[QueryLanguage.CSharp]: [
17+
"codeql/csharp-queries",
18+
"codeql/csharp-solorigate-queries",
19+
],
20+
[QueryLanguage.Go]: ["codeql/go-queries"],
21+
[QueryLanguage.Java]: ["codeql/java-queries"],
22+
[QueryLanguage.Javascript]: [
23+
"codeql/javascript-queries",
24+
"codeql/javascript-experimental-atm-queries",
25+
],
26+
[QueryLanguage.Python]: ["codeql/python-queries"],
27+
[QueryLanguage.Ruby]: ["codeql/ruby-queries"],
28+
};
2429

2530
/**
2631
* Prompts user to choose packs to download, and downloads them.
@@ -45,7 +50,7 @@ export async function handleDownloadPacks(
4550
{ ignoreFocusOut: true },
4651
);
4752
if (quickpick === queryPackOption) {
48-
packsToDownload = QUERY_PACKS;
53+
packsToDownload = Object.values(PACKS_BY_QUERY_LANGUAGE).flat();
4954
} else if (quickpick === customPackOption) {
5055
const customPack = await window.showInputBox({
5156
prompt:

0 commit comments

Comments
 (0)