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

Move some top level files (#2580)

Browse Source 
* Move code-tour.ts to /code-tour

* Move qlpack-generator.ts to /local-queries

* Move query-status.ts to /query-history

* Move skeleton-query-wizard.ts to /local-queries
This commit is contained in:
Charis Kyriakou
2023-07-04 17:08:26 +01:00
committed by GitHub
parent 12e9de85c7
commit 7541b64ec8
25 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/ql-vscode/src/code-tour.ts → extensions/ql-vscode/src/code-tour/code-tour.ts
View File

@@ -1,10 +1,10 @@
import { AppCommandManager } from "./common/commands";
import { AppCommandManager } from "../common/commands";
import { Uri, workspace } from "vscode";
import { join } from "path";
import { pathExists } from "fs-extra";
import { isCodespacesTemplate } from "./config";
import { showBinaryChoiceDialog } from "./common/vscode/dialog";
import { extLogger } from "./common/logging/vscode";
import { isCodespacesTemplate } from "../config";
import { showBinaryChoiceDialog } from "../common/vscode/dialog";
import { extLogger } from "../common/logging/vscode";
/**
* Check if the current workspace is the CodeTour and open the workspace folder.

2
extensions/ql-vscode/src/databases/local-databases/database-manager.ts
View File

@@ -21,7 +21,7 @@ import {
} from "../../common/vscode/workspace-folders";
import { isQueryLanguage } from "../../common/query-language";
import { existsSync } from "fs";
import { QlPackGenerator } from "../../qlpack-generator";
import { QlPackGenerator } from "../../local-queries/qlpack-generator";
import { asError, getErrorMessage } from "../../common/helpers-pure";
import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
import { redactableError } from "../../common/errors";

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

@@ -56,7 +56,7 @@ import {
GithubRateLimitedError,
} from "./codeql-cli/distribution";
import { tmpDir, tmpDirDisposal } from "./tmp-dir";
import { prepareCodeTour } from "./code-tour";
import { prepareCodeTour } from "./code-tour/code-tour";
import {
showBinaryChoiceDialog,
showInformationMessageWithAction,

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

@@ -44,7 +44,7 @@ import { CliVersionConstraint, CodeQLCliServer } from "../codeql-cli/cli";
import { LocalQueryCommands } from "../common/commands";
import { App } from "../common/app";
import { DisposableObject } from "../common/disposable-object";
import { SkeletonQueryWizard } from "../skeleton-query-wizard";
import { SkeletonQueryWizard } from "./skeleton-query-wizard";
import { LocalQueryRun } from "./local-query-run";
import { createMultiSelectionCommand } from "../common/vscode/selection-commands";
import { findLanguage } from "../codeql-cli/query-language";

4
extensions/ql-vscode/src/qlpack-generator.ts → extensions/ql-vscode/src/local-queries/qlpack-generator.ts
View File

@@ -2,8 +2,8 @@ import { mkdir, writeFile } from "fs-extra";
import { dump } from "js-yaml";
import { join } from "path";
import { Uri } from "vscode";
import { CodeQLCliServer } from "./codeql-cli/cli";
import { QueryLanguage } from "./common/query-language";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { QueryLanguage } from "../common/query-language";
export class QlPackGenerator {
private readonly qlpackName: string;

22
extensions/ql-vscode/src/skeleton-query-wizard.ts → extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts
View File

@@ -1,31 +1,31 @@
import { join } from "path";
import { Uri, workspace, window as Window } from "vscode";
import { CodeQLCliServer } from "./codeql-cli/cli";
import { BaseLogger } from "./common/logging";
import { Credentials } from "./common/authentication";
import { QueryLanguage } from "./common/query-language";
import { CodeQLCliServer } from "../codeql-cli/cli";
import { BaseLogger } from "../common/logging";
import { Credentials } from "../common/authentication";
import { QueryLanguage } from "../common/query-language";
import {
getFirstWorkspaceFolder,
isFolderAlreadyInWorkspace,
} from "./common/vscode/workspace-folders";
import { getErrorMessage } from "./common/helpers-pure";
} from "../common/vscode/workspace-folders";
import { getErrorMessage } from "../common/helpers-pure";
import { QlPackGenerator } from "./qlpack-generator";
import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
import {
ProgressCallback,
UserCancellationException,
} from "./common/vscode/progress";
} from "../common/vscode/progress";
import {
askForGitHubRepo,
downloadGitHubDatabase,
} from "./databases/database-fetcher";
} from "../databases/database-fetcher";
import {
getQlPackLocation,
isCodespacesTemplate,
setQlPackLocation,
} from "./config";
} from "../config";
import { existsSync } from "fs-extra";
import { askForLanguage } from "./codeql-cli/query-language";
import { askForLanguage } from "../codeql-cli/query-language";
type QueryLanguagesToDatabaseMap = Record<string, string>;

2
extensions/ql-vscode/src/query-history/history-item-label-provider.ts
View File

@@ -10,7 +10,7 @@ import {
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
import { assertNever } from "../common/helpers-pure";
import { pluralize } from "../common/word";
import { humanizeQueryStatus } from "../query-status";
import { humanizeQueryStatus } from "./query-status";
interface InterpolateReplacements {
t: string; // Start time

2
extensions/ql-vscode/src/query-history/history-tree-data-provider.ts
View File

@@ -11,7 +11,7 @@ import {
import { DisposableObject } from "../common/disposable-object";
import { assertNever } from "../common/helpers-pure";
import { QueryHistoryInfo } from "./query-history-info";
import { QueryStatus } from "../query-status";
import { QueryStatus } from "./query-status";
import { HistoryItemLabelProvider } from "./history-item-label-provider";
export enum SortOrder {

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

@@ -33,7 +33,7 @@ import { registerQueryHistoryScrubber } from "./query-history-scrubber";
import {
QueryStatus,
variantAnalysisStatusToQueryStatus,
} from "../query-status";
} from "./query-status";
import { readQueryHistoryFromFile, writeQueryHistoryToFile } from "./store";
import { pathExists } from "fs-extra";
import { CliVersionConstraint } from "../codeql-cli/cli";

4
extensions/ql-vscode/src/query-status.ts → extensions/ql-vscode/src/query-history/query-status.ts
View File

@@ -1,5 +1,5 @@
import { assertNever } from "./common/helpers-pure";
import { VariantAnalysisStatus } from "./variant-analysis/shared/variant-analysis";
import { assertNever } from "../common/helpers-pure";
import { VariantAnalysisStatus } from "../variant-analysis/shared/variant-analysis";
export enum QueryStatus {
InProgress = "InProgress",

2
extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-domain-mapper.ts
View File

@@ -23,7 +23,7 @@ import {
} from "../../variant-analysis/shared/variant-analysis";
import { assertNever } from "../../common/helpers-pure";
import { QueryLanguage } from "../../common/query-language";
import { QueryStatus } from "../../query-status";
import { QueryStatus } from "../query-status";
import { VariantAnalysisHistoryItem } from "../variant-analysis-history-item";
export function mapQueryHistoryVariantAnalysisToDto(

2
extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-dto-mapper.ts
View File

@@ -23,7 +23,7 @@ import {
} from "../../variant-analysis/shared/variant-analysis";
import { assertNever } from "../../common/helpers-pure";
import { QueryLanguage } from "../../common/query-language";
import { QueryStatus } from "../../query-status";
import { QueryStatus } from "../query-status";
import { VariantAnalysisHistoryItem } from "../variant-analysis-history-item";
export function mapQueryHistoryVariantAnalysisToDomainModel(

2
extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts
View File

@@ -1,4 +1,4 @@
import { QueryStatus } from "../query-status";
import { QueryStatus } from "./query-status";
import { VariantAnalysis } from "../variant-analysis/shared/variant-analysis";
/**

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

@@ -15,7 +15,7 @@ import {
GraphInterpretationData,
DatabaseInfo,
} from "./common/interface-types";
import { QueryStatus } from "./query-status";
import { QueryStatus } from "./query-history/query-status";
import {
EvaluatorLogPaths,
QueryEvaluationInfo,

2
extensions/ql-vscode/test/factories/query-history/variant-analysis-history-item.ts
View File

@@ -1,5 +1,5 @@
import { VariantAnalysisHistoryItem } from "../../../src/query-history/variant-analysis-history-item";
import { QueryStatus } from "../../../src/query-status";
import { QueryStatus } from "../../../src/query-history/query-status";
import {
VariantAnalysis,
VariantAnalysisStatus,

24
extensions/ql-vscode/test/vscode-tests/cli-integration/skeleton-query-wizard.test.ts → extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts
View File

@@ -1,26 +1,26 @@
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import {
QUERY_LANGUAGE_TO_DATABASE_REPO,
SkeletonQueryWizard,
} from "../../../src/skeleton-query-wizard";
import { mockedObject, mockedQuickPickItem } from "../utils/mocking.helpers";
} from "../../../../src/local-queries/skeleton-query-wizard";
import { mockedObject, mockedQuickPickItem } from "../../utils/mocking.helpers";
import * as tmp from "tmp";
import { TextDocument, window, workspace, WorkspaceFolder } from "vscode";
import { extLogger } from "../../../src/common/logging/vscode";
import { QlPackGenerator } from "../../../src/qlpack-generator";
import * as workspaceFolders from "../../../src/common/vscode/workspace-folders";
import { extLogger } from "../../../../src/common/logging/vscode";
import { QlPackGenerator } from "../../../../src/local-queries/qlpack-generator";
import * as workspaceFolders from "../../../../src/common/vscode/workspace-folders";
import { createFileSync, ensureDirSync, removeSync } from "fs-extra";
import { join } from "path";
import { testCredentialsWithStub } from "../../factories/authentication";
import { testCredentialsWithStub } from "../../../factories/authentication";
import {
DatabaseItem,
DatabaseManager,
FullDatabaseOptions,
} from "../../../src/databases/local-databases";
import * as databaseFetcher from "../../../src/databases/database-fetcher";
import { createMockDB } from "../../factories/databases/databases";
import { asError } from "../../../src/common/helpers-pure";
import { Setting } from "../../../src/config";
} from "../../../../src/databases/local-databases";
import * as databaseFetcher from "../../../../src/databases/database-fetcher";
import { createMockDB } from "../../../factories/databases/databases";
import { asError } from "../../../../src/common/helpers-pure";
import { Setting } from "../../../../src/config";
describe("SkeletonQueryWizard", () => {
let mockCli: CodeQLCliServer;

2
extensions/ql-vscode/test/vscode-tests/minimal-workspace/activation.test.ts
View File

@@ -1,6 +1,6 @@
import { resolve } from "path";
import { extensions, workspace } from "vscode";
import { run } from "./determining-selected-query-test";
import { run } from "./local-queries/determining-selected-query-test";
describe("launching with a minimal workspace", () => {
const ext = extensions.getExtension("GitHub.vscode-codeql");

2
extensions/ql-vscode/test/vscode-tests/minimal-workspace/determining-selected-query-test.ts → extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/determining-selected-query-test.ts
View File

@@ -4,7 +4,7 @@ import { Uri } from "vscode";
import {
getQuickEvalContext,
validateQueryUri,
} from "../../../src/run-queries-shared";
} from "../../../../src/run-queries-shared";
async function showQlDocument(name: string): Promise<vscode.TextDocument> {
const folderPath = vscode.workspace.workspaceFolders![0].uri.fsPath;

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

@@ -10,27 +10,27 @@ import {
DatabaseManager,
DatabaseResolver,
FullDatabaseOptions,
} from "../../../src/databases/local-databases";
import { Logger } from "../../../src/common/logging";
import { CodeQLCliServer, DbInfo } from "../../../src/codeql-cli/cli";
} from "../../../../src/databases/local-databases";
import { Logger } from "../../../../src/common/logging";
import { CodeQLCliServer, DbInfo } from "../../../../src/codeql-cli/cli";
import {
encodeArchiveBasePath,
encodeSourceArchiveUri,
} from "../../../src/common/vscode/archive-filesystem-provider";
import { testDisposeHandler } from "../test-dispose-handler";
import { QueryRunner } from "../../../src/query-server/query-runner";
import * as dialog from "../../../src/common/vscode/dialog";
import { Setting } from "../../../src/config";
import { QlPackGenerator } from "../../../src/qlpack-generator";
import { mockedObject } from "../utils/mocking.helpers";
import { createMockApp } from "../../__mocks__/appMock";
} from "../../../../src/common/vscode/archive-filesystem-provider";
import { testDisposeHandler } from "../../test-dispose-handler";
import { QueryRunner } from "../../../../src/query-server/query-runner";
import * as dialog from "../../../../src/common/vscode/dialog";
import { Setting } from "../../../../src/config";
import { QlPackGenerator } from "../../../../src/local-queries/qlpack-generator";
import { mockedObject } from "../../utils/mocking.helpers";
import { createMockApp } from "../../../__mocks__/appMock";
import {
createMockDB,
dbLocationUri,
mockDbOptions,
sourceLocationUri,
} from "../../factories/databases/databases";
import { findSourceArchive } from "../../../src/databases/local-databases/database-resolver";
} from "../../../factories/databases/databases";
import { findSourceArchive } from "../../../../src/databases/local-databases/database-resolver";
describe("local databases", () => {
let databaseManager: DatabaseManager;

2
extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts
View File

@@ -1,6 +1,6 @@
import { join } from "path";
import { existsSync } from "fs";
import { QlPackGenerator } from "../../../src/qlpack-generator";
import { QlPackGenerator } from "../../../src/local-queries/qlpack-generator";
import { QueryLanguage } from "../../../src/common/query-language";
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
import { Uri, workspace } from "vscode";

6
extensions/ql-vscode/test/vscode-tests/no-workspace/code-tour.test.ts → extensions/ql-vscode/test/vscode-tests/no-workspace/code-tour/code-tour.test.ts
View File

@@ -3,9 +3,9 @@ import * as tmp from "tmp";
import { join } from "path";
import { mkdir, writeFile } from "fs-extra";
import { prepareCodeTour } from "../../../src/code-tour";
import { Setting } from "../../../src/config";
import { createMockCommandManager } from "../../__mocks__/commandsMock";
import { prepareCodeTour } from "../../../../src/code-tour/code-tour";
import { Setting } from "../../../../src/config";
import { createMockCommandManager } from "../../../__mocks__/commandsMock";
describe("prepareCodeTour", () => {
let dir: tmp.DirResult;

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

@@ -3,7 +3,7 @@ import { QueryHistoryConfig } from "../../../../src/config";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { createMockLocalQueryInfo } from "../../../factories/query-history/local-query-history-item";
import { createMockVariantAnalysisHistoryItem } from "../../../factories/query-history/variant-analysis-history-item";
import { QueryStatus } from "../../../../src/query-status";
import { QueryStatus } from "../../../../src/query-history/query-status";
import {
VariantAnalysisRepoStatus,
VariantAnalysisStatus,

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

@@ -19,7 +19,7 @@ import {
import { shuffleHistoryItems } from "../../utils/query-history-helpers";
import { createMockVariantAnalysisHistoryItem } from "../../../factories/query-history/variant-analysis-history-item";
import { VariantAnalysisHistoryItem } from "../../../../src/query-history/variant-analysis-history-item";
import { QueryStatus } from "../../../../src/query-status";
import { QueryStatus } from "../../../../src/query-history/query-status";
import { VariantAnalysisStatus } from "../../../../src/variant-analysis/shared/variant-analysis";
import {
HistoryTreeDataProvider,

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

@@ -1,4 +1,4 @@
import { QueryStatus } from "../../../../src/query-status";
import { QueryStatus } from "../../../../src/query-history/query-status";
import {
buildRepoLabel,
getActionsWorkflowRunUrl,

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

@@ -20,7 +20,7 @@ import {
import { shuffleHistoryItems } from "../../utils/query-history-helpers";
import { createMockVariantAnalysisHistoryItem } from "../../../factories/query-history/variant-analysis-history-item";
import { VariantAnalysisHistoryItem } from "../../../../src/query-history/variant-analysis-history-item";
import { QueryStatus } from "../../../../src/query-status";
import { QueryStatus } from "../../../../src/query-history/query-status";
import { VariantAnalysisStatus } from "../../../../src/variant-analysis/shared/variant-analysis";
import * as dialog from "../../../../src/common/vscode/dialog";
import { mockedQuickPickItem } from "../../utils/mocking.helpers";