Use QueryLanguage where possible

Author: robertbrignull

extensions/ql-vscode/src/common/query-language.ts

@@ -25,15 +25,15 @@ export const PACKS_BY_QUERY_LANGUAGE = {
   [QueryLanguage.Ruby]: ["codeql/ruby-queries"],
 };
 
-export const dbSchemeToLanguage: Record<string, string> = {
-  "semmlecode.javascript.dbscheme": "javascript",
-  "semmlecode.cpp.dbscheme": "cpp",
-  "semmlecode.dbscheme": "java",
-  "semmlecode.python.dbscheme": "python",
-  "semmlecode.csharp.dbscheme": "csharp",
-  "go.dbscheme": "go",
-  "ruby.dbscheme": "ruby",
-  "swift.dbscheme": "swift",
+export const dbSchemeToLanguage: Record<string, QueryLanguage> = {
+  "semmlecode.javascript.dbscheme": QueryLanguage.Javascript,
+  "semmlecode.cpp.dbscheme": QueryLanguage.Cpp,
+  "semmlecode.dbscheme": QueryLanguage.Java,
+  "semmlecode.python.dbscheme": QueryLanguage.Python,
+  "semmlecode.csharp.dbscheme": QueryLanguage.CSharp,
+  "go.dbscheme": QueryLanguage.Go,
+  "ruby.dbscheme": QueryLanguage.Ruby,
+  "swift.dbscheme": QueryLanguage.Swift,
 };
 
 export function isQueryLanguage(language: string): language is QueryLanguage {

extensions/ql-vscode/src/queries-panel/query-discovery.ts

@@ -10,17 +10,18 @@ import { QueryDiscoverer } from "./query-tree-data-provider";
 import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
 import { containsPath } from "../pure/files";
 import { getOnDiskWorkspaceFoldersObjects } from "../common/vscode/workspace-folders";
+import { QueryLanguage } from "../common/query-language";
 
 const QUERY_FILE_EXTENSION = ".ql";
 
 export interface QueryPackDiscoverer {
-  getLanguageForQueryFile(queryPath: string): string | undefined;
+  getLanguageForQueryFile(queryPath: string): QueryLanguage | undefined;
   onDidChangeQueryPacks: Event<void>;
 }
 
 interface Query {
   path: string;
-  language: string | undefined;
+  language: QueryLanguage | undefined;
 }
 
 /**
@@ -110,7 +111,7 @@ export class QueryDiscovery
     this.onDidChangePathsEmitter.fire();
   }
 
-  private determineQueryLanguage(path: string): string | undefined {
+  private determineQueryLanguage(path: string): QueryLanguage | undefined {
     return this.queryPackDiscovery.getLanguageForQueryFile(path);
   }
 }

extensions/ql-vscode/src/queries-panel/query-pack-discovery.ts

@@ -1,7 +1,7 @@
 import { basename, dirname } from "path";
 import { CodeQLCliServer, QuerySetup } from "../codeql-cli/cli";
 import { Event } from "vscode";
-import { dbSchemeToLanguage } from "../common/query-language";
+import { QueryLanguage, dbSchemeToLanguage } from "../common/query-language";
 import { FALLBACK_QLPACK_FILENAME, QLPACK_FILENAMES } from "../pure/ql";
 import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
 import { getErrorMessage } from "../pure/helpers-pure";
@@ -12,7 +12,7 @@ import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
 
 export interface QueryPack {
   path: string;
-  language: string | undefined;
+  language: QueryLanguage | undefined;
 }
 
 /**
@@ -35,7 +35,7 @@ export class QueryPackDiscovery extends FilePathDiscovery<QueryPack> {
    * return the language of that pack. Returns undefined if no pack is found
    * or the pack's language is unknown.
    */
-  public getLanguageForQueryFile(queryPath: string): string | undefined {
+  public getLanguageForQueryFile(queryPath: string): QueryLanguage | undefined {
     // Find all packs in a higher directory than the query
     const packs = this.paths.filter((queryPack) =>
       containsPath(dirname(queryPack.path), queryPath),
@@ -70,7 +70,7 @@ export class QueryPackDiscovery extends FilePathDiscovery<QueryPack> {
 
   private async determinePackLanguage(
     path: string,
-  ): Promise<string | undefined> {
+  ): Promise<QueryLanguage | undefined> {
     let packInfo: QuerySetup | undefined = undefined;
     try {
       packInfo = await this.cliServer.resolveLibraryPath(

extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts

@@ -11,6 +11,7 @@ import {
   FileTreeLeaf,
 } from "../../../../src/common/file-tree-nodes";
 import { mkdirSync, writeFileSync } from "fs";
+import { QueryLanguage } from "../../../../src/common/query-language";
 
 describe("Query pack discovery", () => {
   let tmpDir: string;
@@ -40,7 +41,7 @@ describe("Query pack discovery", () => {
       .mockReturnValue([workspaceFolder]);
 
     queryPackDiscoverer = {
-      getLanguageForQueryFile: () => "java",
+      getLanguageForQueryFile: () => QueryLanguage.Java,
       onDidChangeQueryPacks: onDidChangeQueryPacks.event,
     };
     discovery = new QueryDiscovery(env, queryPackDiscoverer);
@@ -168,7 +169,7 @@ describe("Query pack discovery", () => {
         ]),
       ]);
 
-      queryPackDiscoverer.getLanguageForQueryFile = () => "python";
+      queryPackDiscoverer.getLanguageForQueryFile = () => QueryLanguage.Python;
       onDidChangeQueryPacks.fire();
 
       expect(discovery.buildQueryTree()).toEqual([