diff --git a/extensions/ql-vscode/src/common/query-language.ts b/extensions/ql-vscode/src/common/query-language.ts index acbe09018..3f3a81024 100644 --- a/extensions/ql-vscode/src/common/query-language.ts +++ b/extensions/ql-vscode/src/common/query-language.ts @@ -35,3 +35,7 @@ export const dbSchemeToLanguage = { "ruby.dbscheme": "ruby", "swift.dbscheme": "swift", }; + +export function isQueryLanguage(language: string): language is QueryLanguage { + return Object.values(QueryLanguage).includes(language as QueryLanguage); +} diff --git a/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts b/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts index 0070c96ef..69d513947 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts @@ -4,10 +4,10 @@ import { writeFile } from "fs-extra"; import { dump as dumpYaml } from "js-yaml"; import { getOnDiskWorkspaceFolders, - isQueryLanguage, showAndLogExceptionWithTelemetry, } from "../helpers"; import { TeeLogger } from "../common"; +import { isQueryLanguage } from "../common/query-language"; import { CancellationToken } from "vscode"; import { CodeQLCliServer } from "../codeql-cli/cli"; import { DatabaseItem } from "../databases/local-databases"; diff --git a/extensions/ql-vscode/src/databases/local-databases/database-manager.ts b/extensions/ql-vscode/src/databases/local-databases/database-manager.ts index 587c4b7bb..68e2b5319 100644 --- a/extensions/ql-vscode/src/databases/local-databases/database-manager.ts +++ b/extensions/ql-vscode/src/databases/local-databases/database-manager.ts @@ -16,10 +16,10 @@ import { DatabaseItemImpl } from "./database-item-impl"; import { getFirstWorkspaceFolder, isFolderAlreadyInWorkspace, - isQueryLanguage, showAndLogExceptionWithTelemetry, showNeverAskAgainDialog, } from "../../helpers"; +import { isQueryLanguage } from "../../common/query-language"; import { existsSync } from "fs"; import { QlPackGenerator } from "../../qlpack-generator"; import { asError, getErrorMessage } from "../../pure/helpers-pure"; diff --git a/extensions/ql-vscode/src/helpers.ts b/extensions/ql-vscode/src/helpers.ts index feafa0211..bb944ebb5 100644 --- a/extensions/ql-vscode/src/helpers.ts +++ b/extensions/ql-vscode/src/helpers.ts @@ -14,7 +14,7 @@ import { extLogger, OutputChannelLogger } from "./common"; import { QueryMetadata } from "./pure/interface-types"; import { telemetryListener } from "./telemetry"; import { RedactableError } from "./pure/errors"; -import { QueryLanguage } from "./common/query-language"; +import { isQueryLanguage, QueryLanguage } from "./common/query-language"; import { isCodespacesTemplate } from "./config"; import { AppCommandManager } from "./common/commands"; @@ -352,10 +352,6 @@ export async function prepareCodeTour( } } -export function isQueryLanguage(language: string): language is QueryLanguage { - return Object.values(QueryLanguage).includes(language as QueryLanguage); -} - /** * Finds the language that a query targets. * If it can't be autodetected, prompt the user to specify the language manually.