Tweak language parsing to improve clarity

github · Oct 5, 2023 · 8f0e8b0 · 8f0e8b0
1 parent f243294
commit 8f0e8b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/lib/resolve-environment.js b/lib/resolve-environment.js
diff --git a/lib/resolve-environment.js.map b/lib/resolve-environment.js.map
diff --git a/src/resolve-environment.ts b/src/resolve-environment.ts
@@ -20,10 +20,11 @@ export async function runResolveBuildEnvironment(
   const codeql = await getCodeQL(cmd);
 
   let language = languageInput;
-  if (await util.codeQlVersionAbove(codeql, CODEQL_VERSION_LANGUAGE_ALIASING)) {
-    // Delegate to the CodeQL CLI to handle aliasing.
-  } else {
-    // Handle aliasing in the Action using `parseLanguage`.
+  // If the CodeQL CLI version in use supports language aliasing, give the CLI the raw language
+  // input. Otherwise, parse the language input and give the CLI the parsed language.
+  if (
+    !(await util.codeQlVersionAbove(codeql, CODEQL_VERSION_LANGUAGE_ALIASING))
+  ) {
     const parsedLanguage = parseLanguage(languageInput)?.toString();
     if (parsedLanguage === undefined) {
       throw new Error(`Did not recognize the language '${languageInput}'.`);