Call getSupportedLanguageMap() outside getLanguages()

Author: cklin

src/config-utils.test.ts

@@ -1163,14 +1163,18 @@ const mockRepositoryNwo = parseRepositoryNwo("owner/repo");
           }),
       });
 
+      const languageMap = await configUtils.getSupportedLanguageMap(
+        codeQL,
+        features,
+        mockLogger,
+      );
       if (args.expectedLanguages) {
         // happy path
         const actualLanguages = await configUtils.getLanguages(
-          codeQL,
+          languageMap,
           args.languagesInput,
           mockRepositoryNwo,
           ".",
-          features,
           mockLogger,
         );
 
@@ -1180,11 +1184,10 @@ const mockRepositoryNwo = parseRepositoryNwo("owner/repo");
         await t.throwsAsync(
           async () =>
             await configUtils.getLanguages(
-              codeQL,
+              languageMap,
               args.languagesInput,
               mockRepositoryNwo,
               ".",
-              features,
               mockLogger,
             ),
           { message: args.expectedError },

src/config-utils.ts

@@ -443,11 +443,10 @@ export async function getRawLanguagesInRepo(
  * then throw an error.
  */
 export async function getLanguages(
-  codeql: CodeQL,
+  languageMap: Record<string, string>,
   languagesInput: string | undefined,
   repository: RepositoryNwo,
   sourceRoot: string,
-  features: FeatureEnablement,
   logger: Logger,
 ): Promise<Language[]> {
   // Obtain languages without filtering them.
@@ -457,8 +456,6 @@ export async function getLanguages(
     sourceRoot,
     logger,
   );
-
-  const languageMap = await getSupportedLanguageMap(codeql, features, logger);
   const languagesSet = new Set<Language>();
   const unknownLanguages: string[] = [];
 
@@ -600,12 +597,12 @@ export async function initActionState(
     analysisKinds.push(AnalysisKind.CodeQuality);
   }
 
+  const languageMap = await getSupportedLanguageMap(codeql, features, logger);
   const languages = await getLanguages(
-    codeql,
+    languageMap,
     languagesInput,
     repository,
     sourceRoot,
-    features,
     logger,
   );