From abbc13033d1315c7a1292a3bdff52daedc05aeaf Mon Sep 17 00:00:00 2001
From: Elena Tanasoiu <elenatanasoiu@github.com>
Date: Mon, 13 Feb 2023 20:55:46 +0000
Subject: [PATCH] Use new type in `dbSchemeToLanguage`

---
 extensions/ql-vscode/src/cli.ts                        | 10 ++++++----
 .../test/vscode-tests/no-workspace/helpers.test.ts     |  9 +++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/extensions/ql-vscode/src/cli.ts b/extensions/ql-vscode/src/cli.ts
index 7145d042e..7f76bb04d 100644
--- a/extensions/ql-vscode/src/cli.ts
+++ b/extensions/ql-vscode/src/cli.ts
@@ -26,9 +26,9 @@ import { QueryMetadata, SortDirection } from "./pure/interface-types";
 import { Logger, ProgressReporter } from "./common";
 import { CompilationMessage } from "./pure/legacy-messages";
 import { sarifParser } from "./sarif-parser";
-import { dbSchemeToLanguage, walkDirectory } from "./helpers";
+import { walkDirectory } from "./helpers";
 import { App } from "./common/app";
-import { QueryLanguage } from "./qlpack-generator";
+import { QueryLanguage } from "./types/query-language";
 
 /**
  * The version of the SARIF format that we are using.
@@ -1179,9 +1179,11 @@ export class CodeQLCliServer implements Disposable {
    */
   public async getSupportedLanguages(): Promise<string[]> {
     if (!this._supportedLanguages) {
-      // Get the intersection of resolveLanguages with the list of hardcoded languages in dbSchemeToLanguage.
+      // Get the intersection of resolveLanguages with the list of languages in QueryLanguage.
       const resolvedLanguages = Object.keys(await this.resolveLanguages());
-      const hardcodedLanguages = Object.values(dbSchemeToLanguage);
+      const hardcodedLanguages = Object.values(QueryLanguage).map((s) =>
+        s.toString(),
+      );
 
       this._supportedLanguages = resolvedLanguages.filter((lang) =>
         hardcodedLanguages.includes(lang),
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts
index 509b972e8..c2cc85939 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts
@@ -30,6 +30,7 @@ import {
   walkDirectory,
 } from "../../../src/helpers";
 import { reportStreamProgress } from "../../../src/commandRunner";
+import { QueryLanguage } from "../../../src/types/query-language";
 
 describe("helpers", () => {
   describe("Invocation rate limiter", () => {
@@ -146,10 +147,14 @@ describe("helpers", () => {
 
   describe("codeql-database.yml tests", () => {
     let dir: tmp.DirResult;
+    let language: QueryLanguage;
+
     beforeEach(() => {
       dir = tmp.dirSync();
+      language = QueryLanguage.Cpp;
+
       const contents = dump({
-        primaryLanguage: "cpp",
+        primaryLanguage: language,
       });
       writeFileSync(join(dir.name, "codeql-database.yml"), contents, "utf8");
     });
@@ -159,7 +164,7 @@ describe("helpers", () => {
     });
 
     it("should get initial query contents when language is known", () => {
-      expect(getInitialQueryContents("cpp", "hucairz")).toBe(
+      expect(getInitialQueryContents(language, "hucairz")).toBe(
         'import cpp\n\nselect ""',
       );
     });