Move some top level files (#2580)

charisk · web-flow · commit 7541b64ec800 · 2023-07-04T16:08:26.000Z
* 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
diff --git a/extensions/ql-vscode/src/code-tour/code-tour.ts b/extensions/ql-vscode/src/code-tour/code-tour.ts
@@ -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.
diff --git a/extensions/ql-vscode/src/databases/local-databases/database-manager.ts b/extensions/ql-vscode/src/databases/local-databases/database-manager.ts
@@ -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";
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
@@ -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,
diff --git a/extensions/ql-vscode/src/local-queries/local-queries.ts b/extensions/ql-vscode/src/local-queries/local-queries.ts
@@ -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";
diff --git a/extensions/ql-vscode/src/local-queries/qlpack-generator.ts b/extensions/ql-vscode/src/local-queries/qlpack-generator.ts
@@ -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;
diff --git a/extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts b/extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts
@@ -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>;
 
diff --git a/extensions/ql-vscode/src/query-history/history-item-label-provider.ts b/extensions/ql-vscode/src/query-history/history-item-label-provider.ts
@@ -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
diff --git a/extensions/ql-vscode/src/query-history/history-tree-data-provider.ts b/extensions/ql-vscode/src/query-history/history-tree-data-provider.ts
@@ -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 {
diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts
@@ -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";
diff --git a/extensions/ql-vscode/src/query-history/query-status.ts b/extensions/ql-vscode/src/query-history/query-status.ts
@@ -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",
diff --git a/extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-domain-mapper.ts b/extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-domain-mapper.ts
@@ -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(
diff --git a/extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-dto-mapper.ts b/extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-dto-mapper.ts
@@ -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(
diff --git a/extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts b/extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts
@@ -1,4 +1,4 @@
-import { QueryStatus } from "../query-status";
+import { QueryStatus } from "./query-status";
 import { VariantAnalysis } from "../variant-analysis/shared/variant-analysis";
 
 /**
diff --git a/extensions/ql-vscode/src/query-results.ts b/extensions/ql-vscode/src/query-results.ts
@@ -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,
diff --git a/extensions/ql-vscode/test/factories/query-history/variant-analysis-history-item.ts b/extensions/ql-vscode/test/factories/query-history/variant-analysis-history-item.ts
@@ -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,
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts
@@ -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;
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/activation.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/activation.test.ts
@@ -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");
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/determining-selected-query-test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/determining-selected-query-test.ts
@@ -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;
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/local-databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/local-databases.test.ts
@@ -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;
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts
@@ -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";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/code-tour/code-tour.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/code-tour/code-tour.test.ts
@@ -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;
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-item-label-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-item-label-provider.test.ts
@@ -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,
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts
@@ -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,
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-info.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-info.test.ts
@@ -1,4 +1,4 @@
-import { QueryStatus } from "../../../../src/query-status";
+import { QueryStatus } from "../../../../src/query-history/query-status";
 import {
   buildRepoLabel,
   getActionsWorkflowRunUrl,
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts
@@ -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";
