Skip to content

Commit 0419782

Browse files
committed
Revert src/config-utils.ts
These hunks were related to another hunk elsewhere, that has since now been reverted in favor of a separate/distinct PR.
1 parent d4b99ad commit 0419782

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

src/config-utils.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ async function getSupportedLanguageMap(
134134
const resolveSupportedLanguagesUsingCli = await codeql.supportsFeature(
135135
ToolsFeature.BuiltinExtractorsSpecifyDefaultQueries,
136136
);
137-
const resolveResult = await codeql.resolveLanguages();
137+
const resolveResult = await codeql.resolveLanguages({
138+
filterToLanguagesWithQueries: resolveSupportedLanguagesUsingCli,
139+
});
138140
if (resolveSupportedLanguagesUsingCli) {
139141
logger.debug(
140142
`The CodeQL CLI supports the following languages: ${Object.keys(resolveResult.extractors).join(", ")}`,
@@ -143,9 +145,9 @@ async function getSupportedLanguageMap(
143145
const supportedLanguages: Record<string, string> = {};
144146
// Populate canonical language names
145147
for (const extractor of Object.keys(resolveResult.extractors)) {
146-
// TODO: Delete this `if` condition once CODEQL_MINIMUM_VERSION
147-
// is at least v2.23.0 — the first version to support the
148-
// BuiltinExtractorsSpecifyDefaultQueries feature.
148+
// If the CLI supports resolving languages with default queries, use these
149+
// as the set of supported languages. Otherwise, require the language to be
150+
// a built-in language.
149151
if (
150152
resolveSupportedLanguagesUsingCli ||
151153
BuiltInLanguage[extractor] !== undefined

0 commit comments

Comments
 (0)