mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rename some files around local databases (#2093)

Browse Source
This commit is contained in:
Charis Kyriakou
2023-02-20 09:46:10 +00:00
committed by GitHub
parent 146f23f929
commit 90ba3d4f29
38 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/astViewer.ts
View File

@@ -15,7 +15,7 @@ import {
} from "vscode";
import { basename } from "path";
import { DatabaseItem } from "./databases";
import { DatabaseItem } from "./local-databases";
import { UrlValue, BqrsId } from "./pure/bqrs-cli-types";
import { showLocation } from "./interface-utils";
import {

2
extensions/ql-vscode/src/compare/compare-view.ts
View File

@@ -7,7 +7,7 @@ import {
} from "../pure/interface-types";
import { Logger } from "../common";
import { CodeQLCliServer } from "../cli";
import { DatabaseManager } from "../databases";
import { DatabaseManager } from "../local-databases";
import { jumpToLocation } from "../interface-utils";
import {
transformBqrsResultSet,

2
extensions/ql-vscode/src/contextual/astBuilder.ts
View File

@@ -1,6 +1,6 @@
import { CodeQLCliServer } from "../cli";
import { DecodedBqrsChunk, BqrsId, EntityValue } from "../pure/bqrs-cli-types";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
import { ChildAstItem, AstItem } from "../astViewer";
import fileRangeFromURI from "./fileRangeFromURI";
import { Uri } from "vscode";

2
extensions/ql-vscode/src/contextual/fileRangeFromURI.ts
View File

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
import { UrlValue, LineColumnLocation } from "../pure/bqrs-cli-types";
import { isEmptyPath } from "../pure/bqrs-utils";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
export default function fileRangeFromURI(
uri: UrlValue | undefined,

2
extensions/ql-vscode/src/contextual/locationFinder.ts
View File

@@ -9,7 +9,7 @@ import {
ResultSetSchema,
} from "../pure/bqrs-cli-types";
import { CodeQLCliServer } from "../cli";
import { DatabaseManager, DatabaseItem } from "../databases";
import { DatabaseManager, DatabaseItem } from "../local-databases";
import fileRangeFromURI from "./fileRangeFromURI";
import { ProgressCallback } from "../commandRunner";
import { KeyType } from "./keyType";

2
extensions/ql-vscode/src/contextual/queryResolver.ts
View File

@@ -12,7 +12,7 @@ import {
} from "../helpers";
import { KeyType, kindOfKeyType, nameOfKeyType, tagOfKeyType } from "./keyType";
import { CodeQLCliServer } from "../cli";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
import { extLogger } from "../common";
import { createInitialQueryInfo } from "../run-queries-shared";
import { CancellationToken, Uri } from "vscode";

2
extensions/ql-vscode/src/contextual/templateProvider.ts
View File

@@ -17,7 +17,7 @@ import {
zipArchiveScheme,
} from "../archive-filesystem-provider";
import { CodeQLCliServer } from "../cli";
import { DatabaseManager } from "../databases";
import { DatabaseManager } from "../local-databases";
import { CachedOperation } from "../helpers";
import { ProgressCallback, withProgress } from "../commandRunner";
import AstBuilder from "./astBuilder";

2
extensions/ql-vscode/src/databaseFetcher.ts
View File

@@ -16,7 +16,7 @@ import { basename, join } from "path";
import * as Octokit from "@octokit/rest";
import { retry } from "@octokit/plugin-retry";
import { DatabaseManager, DatabaseItem } from "./databases";
import { DatabaseManager, DatabaseItem } from "./local-databases";
import { showAndLogInformationMessage, tmpDir } from "./helpers";
import { reportStreamProgress, ProgressCallback } from "./commandRunner";
import { extLogger } from "./common";

4
extensions/ql-vscode/src/extension.ts
View File

@@ -43,8 +43,8 @@ import {
QueryServerConfigListener,
} from "./config";
import { install } from "./languageSupport";
import { DatabaseItem, DatabaseManager } from "./databases";
import { DatabaseUI } from "./databases-ui";
import { DatabaseItem, DatabaseManager } from "./local-databases";
import { DatabaseUI } from "./local-databases-ui";
import {
TemplatePrintAstProvider,
TemplatePrintCfgProvider,

2
extensions/ql-vscode/src/interface-utils.ts
View File

@@ -15,7 +15,7 @@ import {
ThemeColor,
} from "vscode";
import { tryGetResolvableLocation, isLineColumnLoc } from "./pure/bqrs-utils";
import { DatabaseItem, DatabaseManager } from "./databases";
import { DatabaseItem, DatabaseManager } from "./local-databases";
import { ViewSourceFileMsg } from "./pure/interface-types";
import { Logger } from "./common";
import {

6
extensions/ql-vscode/src/interface.ts
View File

@@ -12,7 +12,11 @@ import {
} from "vscode";
import * as cli from "./cli";
import { CodeQLCliServer } from "./cli";
import { DatabaseEventKind, DatabaseItem, DatabaseManager } from "./databases";
import {
DatabaseEventKind,
DatabaseItem,
DatabaseManager,
} from "./local-databases";
import { showAndLogExceptionWithTelemetry } from "./helpers";
import {
asError,

2
extensions/ql-vscode/src/legacy-query-server/legacyRunner.ts
View File

@@ -1,6 +1,6 @@
import { CancellationToken } from "vscode";
import { ProgressCallback } from "../commandRunner";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
import {
Dataset,
deregisterDatabases,

2
extensions/ql-vscode/src/legacy-query-server/run-queries.ts
View File

@@ -4,7 +4,7 @@ import { CancellationToken, Uri } from "vscode";
import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
import * as cli from "../cli";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
import {
getOnDiskWorkspaceFolders,
showAndLogErrorMessage,

2
extensions/ql-vscode/src/legacy-query-server/upgrades.ts
View File

@@ -10,7 +10,7 @@ import * as messages from "../pure/legacy-messages";
import * as qsClient from "./queryserver-client";
import * as tmp from "tmp-promise";
import { dirname } from "path";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
import { asError, getErrorMessage } from "../pure/helpers-pure";
import { redactableError } from "../pure/errors";

2
extensions/ql-vscode/src/databases-ui.ts → extensions/ql-vscode/src/local-databases-ui.ts
View File

@@ -20,7 +20,7 @@ import {
DatabaseChangedEvent,
DatabaseItem,
DatabaseManager,
} from "./databases";
} from "./local-databases";
import {
commandRunner,
commandRunnerWithProgress,

0
extensions/ql-vscode/src/databases.ts → extensions/ql-vscode/src/local-databases.ts
View File

2
extensions/ql-vscode/src/query-history/query-history-manager.ts
View File

@@ -40,7 +40,7 @@ import {
getQueryText,
QueryHistoryInfo,
} from "./query-history-info";
import { DatabaseManager } from "../databases";
import { DatabaseManager } from "../local-databases";
import { registerQueryHistoryScrubber } from "./query-history-scrubber";
import {
QueryStatus,

2
extensions/ql-vscode/src/query-server/query-runner.ts
View File

@@ -1,6 +1,6 @@
import { CancellationToken } from "vscode";
import { ProgressCallback, UserCancellationException } from "../commandRunner";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
import {
clearCache,
ClearCacheParams,

2
extensions/ql-vscode/src/query-server/run-queries.ts
View File

@@ -2,7 +2,7 @@ import { join } from "path";
import { CancellationToken } from "vscode";
import * as cli from "../cli";
import { ProgressCallback } from "../commandRunner";
import { DatabaseItem } from "../databases";
import { DatabaseItem } from "../local-databases";
import {
getOnDiskWorkspaceFolders,
showAndLogExceptionWithTelemetry,

2
extensions/ql-vscode/src/queryRunner.ts
View File

@@ -1,7 +1,7 @@
import { CancellationToken } from "vscode";
import { CodeQLCliServer } from "./cli";
import { ProgressCallback } from "./commandRunner";
import { DatabaseItem } from "./databases";
import { DatabaseItem } from "./local-databases";
import { InitialQueryInfo, LocalQueryInfo } from "./query-results";
import { QueryWithResults } from "./run-queries-shared";

2
extensions/ql-vscode/src/quick-query.ts
View File

@@ -10,7 +10,7 @@ import {
} from "vscode";
import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
import { CodeQLCliServer } from "./cli";
import { DatabaseUI } from "./databases-ui";
import { DatabaseUI } from "./local-databases-ui";
import {
getInitialQueryContents,
getPrimaryDbscheme,

2
extensions/ql-vscode/src/run-queries-shared.ts
View File

@@ -29,7 +29,7 @@ import { isQuickQueryPath } from "./quick-query";
import { nanoid } from "nanoid";
import { CodeQLCliServer } from "./cli";
import { SELECT_QUERY_NAME } from "./contextual/locationFinder";
import { DatabaseManager } from "./databases";
import { DatabaseManager } from "./local-databases";
import { DecodedBqrsChunk } from "./pure/bqrs-cli-types";
import { extLogger, Logger } from "./common";
import { generateSummarySymbolsFile } from "./log-insights/summary-parser";

2
extensions/ql-vscode/src/test-adapter.ts
View File

@@ -34,7 +34,7 @@ import {
showAndLogWarningMessage,
} from "./helpers";
import { testLogger } from "./common";
import { DatabaseItem, DatabaseManager } from "./databases";
import { DatabaseItem, DatabaseManager } from "./local-databases";
import { asError, getErrorMessage } from "./pure/helpers-pure";
import { redactableError } from "./pure/errors";

2
extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts
View File

@@ -3,7 +3,7 @@ import { extensions, CancellationToken, Uri, window } from "vscode";
import { CodeQLExtensionInterface } from "../../../src/extension";
import { CodeQLCliServer } from "../../../src/cli";
import { DatabaseManager } from "../../../src/databases";
import { DatabaseManager } from "../../../src/local-databases";
import {
importArchiveDatabase,
promptImportInternetDatabase,

2
extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
View File

@@ -15,7 +15,7 @@ import {
} from "fs-extra";
import { load, dump } from "js-yaml";
import { DatabaseItem, DatabaseManager } from "../../../src/databases";
import { DatabaseItem, DatabaseManager } from "../../../src/local-databases";
import { CodeQLExtensionInterface } from "../../../src/extension";
import { cleanDatabases, dbLoc, storagePath } from "../global.helper";
import { importArchiveDatabase } from "../../../src/databaseFetcher";

2
extensions/ql-vscode/test/vscode-tests/global.helper.ts
View File

@@ -2,7 +2,7 @@ import { join } from "path";
import { load, dump } from "js-yaml";
import { realpathSync, readFileSync, writeFileSync } from "fs-extra";
import { commands } from "vscode";
import { DatabaseManager } from "../../src/databases";
import { DatabaseManager } from "../../src/local-databases";
import { CodeQLCliServer } from "../../src/cli";
import { removeWorkspaceRefs } from "../../src/variant-analysis/run-remote-query";

4
extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts → extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
View File

@@ -11,7 +11,7 @@ import {
FullDatabaseOptions,
findSourceArchive,
DatabaseResolver,
} from "../../../src/databases";
} from "../../../src/local-databases";
import { Logger } from "../../../src/common";
import { ProgressCallback } from "../../../src/commandRunner";
import { CodeQLCliServer, DbInfo } from "../../../src/cli";
@@ -25,7 +25,7 @@ import * as helpers from "../../../src/helpers";
import { Setting } from "../../../src/config";
import { QlPackGenerator } from "../../../src/qlpack-generator";
describe("databases", () => {
describe("local databases", () => {
const MOCK_DB_OPTIONS: FullDatabaseOptions = {
dateAdded: 123,
ignoreSourceArchive: false,

2
extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts
View File

@@ -3,7 +3,7 @@ import { load } from "js-yaml";
import { AstViewer, AstItem } from "../../../src/astViewer";
import { commands, Range, Uri } from "vscode";
import { DatabaseItem } from "../../../src/databases";
import { DatabaseItem } from "../../../src/local-databases";
import { testDisposeHandler } from "../test-dispose-handler";
describe("AstViewer", () => {

2
extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts
View File

@@ -2,7 +2,7 @@ import { readFileSync } from "fs-extra";
import AstBuilder from "../../../../src/contextual/astBuilder";
import { CodeQLCliServer } from "../../../../src/cli";
import { DatabaseItem } from "../../../../src/databases";
import { DatabaseItem } from "../../../../src/local-databases";
import { Uri } from "vscode";
import { QueryWithResults } from "../../../../src/run-queries-shared";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts
View File

@@ -1,7 +1,7 @@
import { Uri, Range } from "vscode";
import fileRangeFromURI from "../../../../src/contextual/fileRangeFromURI";
import { DatabaseItem } from "../../../../src/databases";
import { DatabaseItem } from "../../../../src/local-databases";
import {
WholeFileLocation,
LineColumnLocation,

2
extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts
View File

@@ -10,7 +10,7 @@ import {
resolveQueries,
} from "../../../../src/contextual/queryResolver";
import { CodeQLCliServer } from "../../../../src/cli";
import { DatabaseItem } from "../../../../src/databases";
import { DatabaseItem } from "../../../../src/local-databases";
describe("queryResolver", () => {
let getQlPackForDbschemeSpy: jest.SpiedFunction<

2
extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts
View File

@@ -14,7 +14,7 @@ import {
tryResolveLocation,
} from "../../../src/interface-utils";
import { getDefaultResultSetName } from "../../../src/pure/interface-types";
import { DatabaseItem } from "../../../src/databases";
import { DatabaseItem } from "../../../src/local-databases";
describe("interface-utils", () => {
describe("webview uri conversion", () => {

4
extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts → extensions/ql-vscode/test/vscode-tests/no-workspace/local-databases-ui.test.ts
View File

@@ -9,11 +9,11 @@ import {
} from "fs-extra";
import { Uri } from "vscode";
import { DatabaseUI } from "../../../src/databases-ui";
import { DatabaseUI } from "../../../src/local-databases-ui";
import { testDisposeHandler } from "../test-dispose-handler";
import { createMockApp } from "../../__mocks__/appMock";
describe("databases-ui", () => {
describe("local-databases-ui", () => {
describe("fixDbUri", () => {
const fixDbUri = (DatabaseUI.prototype as any).fixDbUri;
it("should choose current directory direcory normally", async () => {

2
extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts
View File

@@ -7,7 +7,7 @@ import {
QueryHistoryConfigListener,
} from "../../../../src/config";
import { LocalQueryInfo } from "../../../../src/query-results";
import { DatabaseManager } from "../../../../src/databases";
import { DatabaseManager } from "../../../../src/local-databases";
import { tmpDir } from "../../../../src/helpers";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { ResultsView } from "../../../../src/interface";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts
View File

@@ -8,7 +8,7 @@ import {
QueryHistoryConfigListener,
} from "../../../../src/config";
import { LocalQueryInfo } from "../../../../src/query-results";
import { DatabaseManager } from "../../../../src/databases";
import { DatabaseManager } from "../../../../src/local-databases";
import { tmpDir } from "../../../../src/helpers";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { ResultsView } from "../../../../src/interface";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts
View File

@@ -10,7 +10,7 @@ import { join } from "path";
import { commands, ExtensionContext, Uri } from "vscode";
import { QueryHistoryConfig } from "../../../../src/config";
import { DatabaseManager } from "../../../../src/databases";
import { DatabaseManager } from "../../../../src/local-databases";
import { tmpDir, walkDirectory } from "../../../../src/helpers";
import { DisposableBucket } from "../../disposable-bucket";
import { testDisposeHandler } from "../../test-dispose-handler";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts
View File

@@ -15,7 +15,7 @@ import { CodeQLCliServer } from "../../../src/cli";
import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder";
import { QueryInProgress } from "../../../src/legacy-query-server/run-queries";
import { LegacyQueryRunner } from "../../../src/legacy-query-server/legacyRunner";
import { DatabaseItem } from "../../../src/databases";
import { DatabaseItem } from "../../../src/local-databases";
describe("run-queries", () => {
let isCanarySpy: jest.SpiedFunction<typeof config.isCanary>;

2
extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts
View File

@@ -8,7 +8,7 @@ import {
DatabaseItemImpl,
DatabaseManager,
FullDatabaseOptions,
} from "../../../src/databases";
} from "../../../src/local-databases";
jest.mock("fs-extra", () => {
const original = jest.requireActual("fs-extra");