From 39d91788dc00a8ed1f8b6daf011e3991680f2e05 Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Fri, 17 Feb 2023 11:38:24 +0100 Subject: [PATCH] Rename `remote-queries` directories to `variant-analysis` --- .../scripts/add-fields-to-scenarios.ts | 4 ++-- .../ql-vscode/src/databases/ui/db-panel.ts | 2 +- extensions/ql-vscode/src/extension.ts | 14 +++++------ .../ql-vscode/src/mocks/gh-api-request.ts | 4 ++-- .../ql-vscode/src/pure/interface-types.ts | 2 +- .../ql-vscode/src/pure/location-link-utils.ts | 2 +- extensions/ql-vscode/src/pure/sarif-utils.ts | 2 +- .../src/pure/variant-analysis-filter-sort.ts | 2 +- .../src/query-history/query-history-info.ts | 2 +- .../query-history/query-history-manager.ts | 4 ++-- .../variant-analysis-history-item.ts | 2 +- extensions/ql-vscode/src/query-status.ts | 2 +- .../src/stories/common/CodePaths.stories.tsx | 2 +- .../AnalysisAlertResult.stories.tsx | 2 +- .../FailureReasonAlert.stories.tsx | 2 +- .../variant-analysis/RepoRow.stories.tsx | 6 ++--- .../VariantAnalysis.stories.tsx | 6 ++--- .../VariantAnalysisActions.stories.tsx | 2 +- .../VariantAnalysisAnalyzedRepos.stories.tsx | 10 ++++---- .../VariantAnalysisHeader.stories.tsx | 6 ++--- .../VariantAnalysisOutcomePanels.stories.tsx | 8 +++---- ...AnalysisSkippedRepositoriesTab.stories.tsx | 2 +- .../VariantAnalysisStats.stories.tsx | 2 +- .../bqrs-processing.ts | 0 .../export-results.ts | 0 .../gh-api/gh-actions-api-client.ts | 0 .../gh-api/gh-api-client.ts | 0 .../gh-api/repository.ts | 0 .../gh-api/variant-analysis.ts | 0 .../markdown-generation.ts | 0 .../repository-selection.ts | 0 .../run-remote-query.ts | 0 .../sarif-processing.ts | 0 .../shared/analysis-result.ts | 0 .../shared/repository.ts | 0 .../shared/result-limits.ts | 0 .../shared/variant-analysis.ts | 0 .../variant-analysis-content-provider.ts | 0 .../variant-analysis-manager.ts | 0 .../variant-analysis-monitor.ts | 0 .../variant-analysis-processor.ts | 0 .../variant-analysis-results-manager.ts | 0 .../variant-analysis-view-manager.ts | 0 .../variant-analysis-view-serializer.ts | 0 .../variant-analysis-view.ts | 0 .../common/CodePaths/CodeFlowsDropdown.tsx | 2 +- .../src/view/common/CodePaths/CodePath.tsx | 2 +- .../src/view/common/CodePaths/CodePaths.tsx | 2 +- .../common/CodePaths/CodePathsOverlay.tsx | 2 +- .../src/view/common/CodePaths/ThreadPath.tsx | 2 +- .../CodePaths/__tests__/CodePaths.spec.tsx | 4 ++-- .../FileCodeSnippet/CodeSnippetCode.tsx | 2 +- .../FileCodeSnippet/CodeSnippetLine.tsx | 2 +- .../FileCodeSnippet/CodeSnippetMessage.tsx | 2 +- .../FileCodeSnippet/FileCodeSnippet.tsx | 2 +- .../variant-analysis/AnalysisAlertResult.tsx | 2 +- .../AnalyzedRepoItemContent.tsx | 4 ++-- .../variant-analysis/FailureReasonAlert.tsx | 2 +- .../src/view/variant-analysis/RepoRow.tsx | 6 ++--- .../view/variant-analysis/VariantAnalysis.tsx | 2 +- .../VariantAnalysisActions.tsx | 2 +- .../VariantAnalysisAnalyzedRepos.tsx | 2 +- .../VariantAnalysisHeader.tsx | 2 +- .../VariantAnalysisOutcomePanels.tsx | 2 +- .../VariantAnalysisRepositoriesStats.tsx | 2 +- .../VariantAnalysisSkippedRepositoriesTab.tsx | 2 +- .../variant-analysis/VariantAnalysisStats.tsx | 2 +- .../VariantAnalysisStatusStats.tsx | 2 +- .../AnalyzedRepoItemContent.spec.tsx | 2 +- .../__tests__/RepoRow.spec.tsx | 4 ++-- .../__tests__/VariantAnalysis.spec.tsx | 4 ++-- .../__tests__/VariantAnalysisActions.spec.tsx | 2 +- .../VariantAnalysisAnalyzedRepos.spec.tsx | 8 +++---- .../VariantAnalysisOutcomePanels.spec.tsx | 8 +++---- .../__tests__/VariantAnalysisStats.spec.tsx | 2 +- .../VariantAnalysisStatusStats.spec.tsx | 2 +- .../variant-analysis-history-item.ts | 4 ++-- .../gh-api/repository.ts | 2 +- .../gh-api/scanned-repositories.ts | 2 +- .../gh-api/skipped-repositories.ts | 2 +- .../gh-api/variant-analysis-api-response.ts | 4 ++-- .../gh-api/variant-analysis-repo-task.ts | 4 ++-- .../shared/AnalysisMessage.ts | 2 +- .../shared/CodeFlow.ts | 2 +- .../shared/repository.ts | 2 +- .../shared/scanned-repositories.ts | 2 +- .../shared/skipped-repositories.ts | 2 +- .../shared/variant-analysis-repo-tasks.ts | 2 +- .../shared/variant-analysis-submission.ts | 2 +- .../shared/variant-analysis.ts | 2 +- .../test/unit-tests/sarif-processing.test.ts | 4 ++-- .../test/unit-tests/variant-analysis.test.ts | 6 ++--- .../gh-api/gh-api-client.test.ts | 4 ++-- .../markdown-generation.test.ts | 6 ++--- .../variant-analysis-processor.test.ts | 16 ++++++------- .../variant-analysis-manager.test.ts | 24 +++++++++---------- .../variant-analysis-monitor.test.ts | 18 +++++++------- .../variant-analysis-results-manager.test.ts | 6 ++--- ...nt-analysis-submission-integration.test.ts | 0 .../test/vscode-tests/global.helper.ts | 2 +- .../history-item-label-provider.test.ts | 6 ++--- .../history-tree-data-provider.test.ts | 4 ++-- .../query-history/query-history-info.test.ts | 6 ++--- .../query-history-manager.test.ts | 4 ++-- .../variant-analysis-history.test.ts | 2 +- .../repository-selection.test.ts | 2 +- 106 files changed, 160 insertions(+), 160 deletions(-) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/bqrs-processing.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/export-results.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/gh-api/gh-actions-api-client.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/gh-api/gh-api-client.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/gh-api/repository.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/gh-api/variant-analysis.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/markdown-generation.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/repository-selection.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/run-remote-query.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/sarif-processing.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/shared/analysis-result.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/shared/repository.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/shared/result-limits.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/shared/variant-analysis.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-content-provider.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-manager.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-monitor.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-processor.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-results-manager.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-view-manager.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-view-serializer.ts (100%) rename extensions/ql-vscode/src/{remote-queries => variant-analysis}/variant-analysis-view.ts (100%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/gh-api/repository.ts (89%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/gh-api/scanned-repositories.ts (93%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/gh-api/skipped-repositories.ts (94%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/gh-api/variant-analysis-api-response.ts (90%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/gh-api/variant-analysis-repo-task.ts (69%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/AnalysisMessage.ts (64%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/CodeFlow.ts (85%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/repository.ts (89%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/scanned-repositories.ts (93%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/skipped-repositories.ts (93%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/variant-analysis-repo-tasks.ts (91%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/variant-analysis-submission.ts (89%) rename extensions/ql-vscode/test/factories/{remote-queries => variant-analysis}/shared/variant-analysis.ts (95%) rename extensions/ql-vscode/test/unit-tests/{remote-queries => variant-analysis}/gh-api/gh-api-client.test.ts (93%) rename extensions/ql-vscode/test/unit-tests/{remote-queries => variant-analysis}/markdown-generation.test.ts (97%) rename extensions/ql-vscode/test/unit-tests/{remote-queries => variant-analysis}/variant-analysis-processor.test.ts (92%) rename extensions/ql-vscode/test/vscode-tests/cli-integration/{remote-queries => variant-analysis}/variant-analysis-manager.test.ts (97%) rename extensions/ql-vscode/test/vscode-tests/cli-integration/{remote-queries => variant-analysis}/variant-analysis-monitor.test.ts (92%) rename extensions/ql-vscode/test/vscode-tests/cli-integration/{remote-queries => variant-analysis}/variant-analysis-results-manager.test.ts (98%) rename extensions/ql-vscode/test/vscode-tests/cli-integration/{remote-queries => variant-analysis}/variant-analysis-submission-integration.test.ts (100%) rename extensions/ql-vscode/test/vscode-tests/no-workspace/{remote-queries => variant-analysis}/repository-selection.test.ts (99%) diff --git a/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts b/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts index 4a5e7b533..f80e20ceb 100644 --- a/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts +++ b/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts @@ -20,8 +20,8 @@ import { throttling } from "@octokit/plugin-throttling"; import { getFiles } from "./util/files"; import type { GitHubApiRequest } from "../src/mocks/gh-api-request"; import { isGetVariantAnalysisRequest } from "../src/mocks/gh-api-request"; -import { VariantAnalysis } from "../src/remote-queries/gh-api/variant-analysis"; -import { RepositoryWithMetadata } from "../src/remote-queries/gh-api/repository"; +import { VariantAnalysis } from "../src/variant-analysis/gh-api/variant-analysis"; +import { RepositoryWithMetadata } from "../src/variant-analysis/gh-api/repository"; const extensionDirectory = resolve(__dirname, ".."); const scenariosDirectory = resolve(extensionDirectory, "src/mocks/scenarios"); diff --git a/extensions/ql-vscode/src/databases/ui/db-panel.ts b/extensions/ql-vscode/src/databases/ui/db-panel.ts index 0300bb494..f9eccc5fc 100644 --- a/extensions/ql-vscode/src/databases/ui/db-panel.ts +++ b/extensions/ql-vscode/src/databases/ui/db-panel.ts @@ -29,7 +29,7 @@ import { DbManager } from "../db-manager"; import { DbTreeDataProvider } from "./db-tree-data-provider"; import { DbTreeViewItem } from "./db-tree-view-item"; import { getGitHubUrl } from "./db-tree-view-item-action"; -import { getControllerRepo } from "../../remote-queries/run-remote-query"; +import { getControllerRepo } from "../../variant-analysis/run-remote-query"; import { getErrorMessage } from "../../pure/helpers-pure"; import { Credentials } from "../../common/authentication"; diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index 881f260df..9956d786d 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -108,7 +108,7 @@ import { HistoryItemLabelProvider } from "./query-history/history-item-label-pro import { exportSelectedVariantAnalysisResults, exportVariantAnalysisResults, -} from "./remote-queries/export-results"; +} from "./variant-analysis/export-results"; import { EvalLogViewer } from "./eval-log-viewer"; import { SummaryLanguageSupport } from "./log-insights/summary-language-support"; import { JoinOrderScannerProvider } from "./log-insights/join-order"; @@ -117,16 +117,16 @@ import { createInitialQueryInfo } from "./run-queries-shared"; import { LegacyQueryRunner } from "./legacy-query-server/legacyRunner"; import { NewQueryRunner } from "./query-server/query-runner"; import { QueryRunner } from "./queryRunner"; -import { VariantAnalysisView } from "./remote-queries/variant-analysis-view"; -import { VariantAnalysisViewSerializer } from "./remote-queries/variant-analysis-view-serializer"; +import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view"; +import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer"; import { VariantAnalysis, VariantAnalysisScannedRepository, -} from "./remote-queries/shared/variant-analysis"; -import { VariantAnalysisManager } from "./remote-queries/variant-analysis-manager"; -import { createVariantAnalysisContentProvider } from "./remote-queries/variant-analysis-content-provider"; +} from "./variant-analysis/shared/variant-analysis"; +import { VariantAnalysisManager } from "./variant-analysis/variant-analysis-manager"; +import { createVariantAnalysisContentProvider } from "./variant-analysis/variant-analysis-content-provider"; import { VSCodeMockGitHubApiServer } from "./mocks/vscode-mock-gh-api-server"; -import { VariantAnalysisResultsManager } from "./remote-queries/variant-analysis-results-manager"; +import { VariantAnalysisResultsManager } from "./variant-analysis/variant-analysis-results-manager"; import { ExtensionApp } from "./common/vscode/vscode-app"; import { RepositoriesFilterSortStateWithIds } from "./pure/variant-analysis-filter-sort"; import { DbModule } from "./databases/db-module"; diff --git a/extensions/ql-vscode/src/mocks/gh-api-request.ts b/extensions/ql-vscode/src/mocks/gh-api-request.ts index 710f868e2..39dfd113f 100644 --- a/extensions/ql-vscode/src/mocks/gh-api-request.ts +++ b/extensions/ql-vscode/src/mocks/gh-api-request.ts @@ -1,8 +1,8 @@ -import { Repository } from "../remote-queries/gh-api/repository"; +import { Repository } from "../variant-analysis/gh-api/repository"; import { VariantAnalysis, VariantAnalysisRepoTask, -} from "../remote-queries/gh-api/variant-analysis"; +} from "../variant-analysis/gh-api/variant-analysis"; // Types that represent requests/responses from the GitHub API // that we need to mock. diff --git a/extensions/ql-vscode/src/pure/interface-types.ts b/extensions/ql-vscode/src/pure/interface-types.ts index 8e472e1b7..bbc4b0903 100644 --- a/extensions/ql-vscode/src/pure/interface-types.ts +++ b/extensions/ql-vscode/src/pure/interface-types.ts @@ -10,7 +10,7 @@ import { VariantAnalysis, VariantAnalysisScannedRepositoryResult, VariantAnalysisScannedRepositoryState, -} from "../remote-queries/shared/variant-analysis"; +} from "../variant-analysis/shared/variant-analysis"; import { RepositoriesFilterSortStateWithIds } from "./variant-analysis-filter-sort"; /** diff --git a/extensions/ql-vscode/src/pure/location-link-utils.ts b/extensions/ql-vscode/src/pure/location-link-utils.ts index b7c954d20..85aaeb073 100644 --- a/extensions/ql-vscode/src/pure/location-link-utils.ts +++ b/extensions/ql-vscode/src/pure/location-link-utils.ts @@ -1,4 +1,4 @@ -import { FileLink } from "../remote-queries/shared/analysis-result"; +import { FileLink } from "../variant-analysis/shared/analysis-result"; export function createRemoteFileRef( fileLink: FileLink, diff --git a/extensions/ql-vscode/src/pure/sarif-utils.ts b/extensions/ql-vscode/src/pure/sarif-utils.ts index 82723e54b..8af512f6f 100644 --- a/extensions/ql-vscode/src/pure/sarif-utils.ts +++ b/extensions/ql-vscode/src/pure/sarif-utils.ts @@ -1,5 +1,5 @@ import * as Sarif from "sarif"; -import type { HighlightedRegion } from "../remote-queries/shared/analysis-result"; +import type { HighlightedRegion } from "../variant-analysis/shared/analysis-result"; import { ResolvableLocationValue } from "./bqrs-cli-types"; export interface SarifLink { diff --git a/extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts b/extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts index 623f3e3be..93fe0504c 100644 --- a/extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts +++ b/extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts @@ -1,7 +1,7 @@ import { Repository, RepositoryWithMetadata, -} from "../remote-queries/shared/repository"; +} from "../variant-analysis/shared/repository"; import { parseDate } from "./date"; export enum SortKey { diff --git a/extensions/ql-vscode/src/query-history/query-history-info.ts b/extensions/ql-vscode/src/query-history/query-history-info.ts index 5a67a018e..3fb9d5080 100644 --- a/extensions/ql-vscode/src/query-history/query-history-info.ts +++ b/extensions/ql-vscode/src/query-history/query-history-info.ts @@ -5,7 +5,7 @@ import { pluralize } from "../pure/word"; import { hasRepoScanCompleted, getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl, -} from "../remote-queries/shared/variant-analysis"; +} from "../variant-analysis/shared/variant-analysis"; export type QueryHistoryInfo = LocalQueryInfo | VariantAnalysisHistoryItem; diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts index 03411e027..647bb425c 100644 --- a/extensions/ql-vscode/src/query-history/query-history-manager.ts +++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts @@ -60,9 +60,9 @@ import EvalLogTreeBuilder from "../eval-log-tree-builder"; import { EvalLogData, parseViewerData } from "../pure/log-summary-parser"; import { QueryWithResults } from "../run-queries-shared"; import { QueryRunner } from "../queryRunner"; -import { VariantAnalysisManager } from "../remote-queries/variant-analysis-manager"; +import { VariantAnalysisManager } from "../variant-analysis/variant-analysis-manager"; import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item"; -import { getTotalResultCount } from "../remote-queries/shared/variant-analysis"; +import { getTotalResultCount } from "../variant-analysis/shared/variant-analysis"; import { HistoryTreeDataProvider } from "./history-tree-data-provider"; import { redactableError } from "../pure/errors"; 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 index 6cbb7cea9..18ce81838 100644 --- 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,5 +1,5 @@ import { QueryStatus } from "../query-status"; -import { VariantAnalysis } from "../remote-queries/shared/variant-analysis"; +import { VariantAnalysis } from "../variant-analysis/shared/variant-analysis"; /** * Information about a variant analysis. diff --git a/extensions/ql-vscode/src/query-status.ts b/extensions/ql-vscode/src/query-status.ts index 769b20aa4..96d8e342b 100644 --- a/extensions/ql-vscode/src/query-status.ts +++ b/extensions/ql-vscode/src/query-status.ts @@ -1,5 +1,5 @@ import { assertNever } from "./pure/helpers-pure"; -import { VariantAnalysisStatus } from "./remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "./variant-analysis/shared/variant-analysis"; export enum QueryStatus { InProgress = "InProgress", diff --git a/extensions/ql-vscode/src/stories/common/CodePaths.stories.tsx b/extensions/ql-vscode/src/stories/common/CodePaths.stories.tsx index 2e62a594f..5b68f1c2d 100644 --- a/extensions/ql-vscode/src/stories/common/CodePaths.stories.tsx +++ b/extensions/ql-vscode/src/stories/common/CodePaths.stories.tsx @@ -4,7 +4,7 @@ import { ComponentStory, ComponentMeta } from "@storybook/react"; import { ThemeProvider } from "@primer/react"; import { CodePaths } from "../../view/common"; -import type { CodeFlow } from "../../remote-queries/shared/analysis-result"; +import type { CodeFlow } from "../../variant-analysis/shared/analysis-result"; export default { title: "Code Paths", diff --git a/extensions/ql-vscode/src/stories/variant-analysis/AnalysisAlertResult.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/AnalysisAlertResult.stories.tsx index 8a8e9a683..7afd3a8cf 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/AnalysisAlertResult.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/AnalysisAlertResult.stories.tsx @@ -3,7 +3,7 @@ import * as React from "react"; import { ComponentStory, ComponentMeta } from "@storybook/react"; import AnalysisAlertResult from "../../view/variant-analysis/AnalysisAlertResult"; -import type { AnalysisAlert } from "../../remote-queries/shared/analysis-result"; +import type { AnalysisAlert } from "../../variant-analysis/shared/analysis-result"; export default { title: "Variant Analysis/Analysis Alert Result", diff --git a/extensions/ql-vscode/src/stories/variant-analysis/FailureReasonAlert.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/FailureReasonAlert.stories.tsx index a19144a1c..24fb4831e 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/FailureReasonAlert.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/FailureReasonAlert.stories.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; -import { VariantAnalysisFailureReason } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisFailureReason } from "../../variant-analysis/shared/variant-analysis"; import { FailureReasonAlert } from "../../view/variant-analysis/FailureReasonAlert"; export default { diff --git a/extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx index a57cbcc24..c51fe9f6a 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx @@ -6,12 +6,12 @@ import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAna import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepositoryDownloadStatus, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../variant-analysis/shared/variant-analysis"; import { AnalysisAlert, AnalysisRawResults, -} from "../../remote-queries/shared/analysis-result"; -import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; +} from "../../variant-analysis/shared/analysis-result"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository"; import * as analysesResults from "../data/analysesResultsMessage.json"; import * as rawResults from "../data/rawResults.json"; diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx index 3ca84c2ef..2c75e2ba8 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx @@ -11,9 +11,9 @@ import { VariantAnalysisScannedRepositoryResult, VariantAnalysisScannedRepositoryState, VariantAnalysisStatus, -} from "../../remote-queries/shared/variant-analysis"; -import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; -import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; +} from "../../variant-analysis/shared/variant-analysis"; +import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository"; export default { title: "Variant Analysis/Variant Analysis", diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisActions.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisActions.stories.tsx index 613438609..4817b483d 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisActions.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisActions.stories.tsx @@ -3,7 +3,7 @@ import * as React from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer"; -import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisActions } from "../../view/variant-analysis/VariantAnalysisActions"; export default { diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx index 3405e2f58..ab82de001 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx @@ -10,11 +10,11 @@ import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepositoryDownloadStatus, VariantAnalysisStatus, -} from "../../remote-queries/shared/variant-analysis"; -import { AnalysisAlert } from "../../remote-queries/shared/analysis-result"; -import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; -import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; -import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories"; +} from "../../variant-analysis/shared/variant-analysis"; +import { AnalysisAlert } from "../../variant-analysis/shared/analysis-result"; +import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository"; +import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories"; import * as analysesResults from "../data/analysesResultsMessage.json"; diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx index 30920a5f9..9473c6b82 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx @@ -7,9 +7,9 @@ import { VariantAnalysisHeader } from "../../view/variant-analysis/VariantAnalys import { VariantAnalysisRepoStatus, VariantAnalysisStatus, -} from "../../remote-queries/shared/variant-analysis"; -import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; -import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories"; +} from "../../variant-analysis/shared/variant-analysis"; +import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis"; +import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories"; export default { title: "Variant Analysis/Variant Analysis Header", diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx index 9241bf183..be9ee2224 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx @@ -8,10 +8,10 @@ import { VariantAnalysisOutcomePanels } from "../../view/variant-analysis/Varian import { VariantAnalysisRepoStatus, VariantAnalysisStatus, -} from "../../remote-queries/shared/variant-analysis"; -import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories"; -import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; -import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; +} from "../../variant-analysis/shared/variant-analysis"; +import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository"; import { defaultFilterSortState, RepositoriesFilterSortState, diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx index 26d5bb970..a1bd18ce2 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx @@ -4,7 +4,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer"; import { VariantAnalysisSkippedRepositoriesTab } from "../../view/variant-analysis/VariantAnalysisSkippedRepositoriesTab"; -import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository"; export default { title: "Variant Analysis/Variant Analysis Skipped Repositories Tab", diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisStats.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisStats.stories.tsx index 1ca7e1bc0..90ff4c5e8 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisStats.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisStats.stories.tsx @@ -4,7 +4,7 @@ import { ComponentStory, ComponentMeta } from "@storybook/react"; import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer"; import { VariantAnalysisStats } from "../../view/variant-analysis/VariantAnalysisStats"; -import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis"; export default { title: "Variant Analysis/Variant Analysis Stats", diff --git a/extensions/ql-vscode/src/remote-queries/bqrs-processing.ts b/extensions/ql-vscode/src/variant-analysis/bqrs-processing.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/bqrs-processing.ts rename to extensions/ql-vscode/src/variant-analysis/bqrs-processing.ts diff --git a/extensions/ql-vscode/src/remote-queries/export-results.ts b/extensions/ql-vscode/src/variant-analysis/export-results.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/export-results.ts rename to extensions/ql-vscode/src/variant-analysis/export-results.ts diff --git a/extensions/ql-vscode/src/remote-queries/gh-api/gh-actions-api-client.ts b/extensions/ql-vscode/src/variant-analysis/gh-api/gh-actions-api-client.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/gh-api/gh-actions-api-client.ts rename to extensions/ql-vscode/src/variant-analysis/gh-api/gh-actions-api-client.ts diff --git a/extensions/ql-vscode/src/remote-queries/gh-api/gh-api-client.ts b/extensions/ql-vscode/src/variant-analysis/gh-api/gh-api-client.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/gh-api/gh-api-client.ts rename to extensions/ql-vscode/src/variant-analysis/gh-api/gh-api-client.ts diff --git a/extensions/ql-vscode/src/remote-queries/gh-api/repository.ts b/extensions/ql-vscode/src/variant-analysis/gh-api/repository.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/gh-api/repository.ts rename to extensions/ql-vscode/src/variant-analysis/gh-api/repository.ts diff --git a/extensions/ql-vscode/src/remote-queries/gh-api/variant-analysis.ts b/extensions/ql-vscode/src/variant-analysis/gh-api/variant-analysis.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/gh-api/variant-analysis.ts rename to extensions/ql-vscode/src/variant-analysis/gh-api/variant-analysis.ts diff --git a/extensions/ql-vscode/src/remote-queries/markdown-generation.ts b/extensions/ql-vscode/src/variant-analysis/markdown-generation.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/markdown-generation.ts rename to extensions/ql-vscode/src/variant-analysis/markdown-generation.ts diff --git a/extensions/ql-vscode/src/remote-queries/repository-selection.ts b/extensions/ql-vscode/src/variant-analysis/repository-selection.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/repository-selection.ts rename to extensions/ql-vscode/src/variant-analysis/repository-selection.ts diff --git a/extensions/ql-vscode/src/remote-queries/run-remote-query.ts b/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/run-remote-query.ts rename to extensions/ql-vscode/src/variant-analysis/run-remote-query.ts diff --git a/extensions/ql-vscode/src/remote-queries/sarif-processing.ts b/extensions/ql-vscode/src/variant-analysis/sarif-processing.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/sarif-processing.ts rename to extensions/ql-vscode/src/variant-analysis/sarif-processing.ts diff --git a/extensions/ql-vscode/src/remote-queries/shared/analysis-result.ts b/extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/shared/analysis-result.ts rename to extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts diff --git a/extensions/ql-vscode/src/remote-queries/shared/repository.ts b/extensions/ql-vscode/src/variant-analysis/shared/repository.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/shared/repository.ts rename to extensions/ql-vscode/src/variant-analysis/shared/repository.ts diff --git a/extensions/ql-vscode/src/remote-queries/shared/result-limits.ts b/extensions/ql-vscode/src/variant-analysis/shared/result-limits.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/shared/result-limits.ts rename to extensions/ql-vscode/src/variant-analysis/shared/result-limits.ts diff --git a/extensions/ql-vscode/src/remote-queries/shared/variant-analysis.ts b/extensions/ql-vscode/src/variant-analysis/shared/variant-analysis.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/shared/variant-analysis.ts rename to extensions/ql-vscode/src/variant-analysis/shared/variant-analysis.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-content-provider.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-content-provider.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-monitor.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-monitor.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-monitor.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-monitor.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-processor.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-processor.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-processor.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-processor.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-results-manager.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-results-manager.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-view-manager.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-view-manager.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-view-serializer.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-serializer.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-view-serializer.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-view-serializer.ts diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-view.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts similarity index 100% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-view.ts rename to extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts diff --git a/extensions/ql-vscode/src/view/common/CodePaths/CodeFlowsDropdown.tsx b/extensions/ql-vscode/src/view/common/CodePaths/CodeFlowsDropdown.tsx index 934552f32..743713aef 100644 --- a/extensions/ql-vscode/src/view/common/CodePaths/CodeFlowsDropdown.tsx +++ b/extensions/ql-vscode/src/view/common/CodePaths/CodeFlowsDropdown.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import { ChangeEvent, SetStateAction, useCallback } from "react"; import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react"; -import { CodeFlow } from "../../../remote-queries/shared/analysis-result"; +import { CodeFlow } from "../../../variant-analysis/shared/analysis-result"; const getCodeFlowName = (codeFlow: CodeFlow) => { const filePath = diff --git a/extensions/ql-vscode/src/view/common/CodePaths/CodePath.tsx b/extensions/ql-vscode/src/view/common/CodePaths/CodePath.tsx index 78e3b7bb1..1e83dbe52 100644 --- a/extensions/ql-vscode/src/view/common/CodePaths/CodePath.tsx +++ b/extensions/ql-vscode/src/view/common/CodePaths/CodePath.tsx @@ -4,7 +4,7 @@ import { AnalysisMessage, CodeFlow, ResultSeverity, -} from "../../../remote-queries/shared/analysis-result"; +} from "../../../variant-analysis/shared/analysis-result"; import { ThreadPath } from "./ThreadPath"; type CodePathProps = { diff --git a/extensions/ql-vscode/src/view/common/CodePaths/CodePaths.tsx b/extensions/ql-vscode/src/view/common/CodePaths/CodePaths.tsx index 717cde2f8..90bd3b44e 100644 --- a/extensions/ql-vscode/src/view/common/CodePaths/CodePaths.tsx +++ b/extensions/ql-vscode/src/view/common/CodePaths/CodePaths.tsx @@ -9,7 +9,7 @@ import { AnalysisMessage, CodeFlow, ResultSeverity, -} from "../../../remote-queries/shared/analysis-result"; +} from "../../../variant-analysis/shared/analysis-result"; import { CodePathsOverlay } from "./CodePathsOverlay"; import { useTelemetryOnChange } from "../telemetry"; diff --git a/extensions/ql-vscode/src/view/common/CodePaths/CodePathsOverlay.tsx b/extensions/ql-vscode/src/view/common/CodePaths/CodePathsOverlay.tsx index 9672e8fe1..7ba11898a 100644 --- a/extensions/ql-vscode/src/view/common/CodePaths/CodePathsOverlay.tsx +++ b/extensions/ql-vscode/src/view/common/CodePaths/CodePathsOverlay.tsx @@ -6,7 +6,7 @@ import { AnalysisMessage, CodeFlow, ResultSeverity, -} from "../../../remote-queries/shared/analysis-result"; +} from "../../../variant-analysis/shared/analysis-result"; import { useTelemetryOnChange } from "../telemetry"; import { SectionTitle } from "../SectionTitle"; import { VerticalSpace } from "../VerticalSpace"; diff --git a/extensions/ql-vscode/src/view/common/CodePaths/ThreadPath.tsx b/extensions/ql-vscode/src/view/common/CodePaths/ThreadPath.tsx index 4aa6340b0..e923a86dd 100644 --- a/extensions/ql-vscode/src/view/common/CodePaths/ThreadPath.tsx +++ b/extensions/ql-vscode/src/view/common/CodePaths/ThreadPath.tsx @@ -6,7 +6,7 @@ import { AnalysisMessage, ResultSeverity, ThreadFlow, -} from "../../../remote-queries/shared/analysis-result"; +} from "../../../variant-analysis/shared/analysis-result"; import { SectionTitle } from "../SectionTitle"; import { FileCodeSnippet } from "../FileCodeSnippet"; diff --git a/extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx b/extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx index c650dbb7d..a45ed417b 100644 --- a/extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx +++ b/extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx @@ -3,8 +3,8 @@ import { render as reactRender, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { CodePaths, CodePathsProps } from "../CodePaths"; -import { createMockCodeFlows } from "../../../../../test/factories/remote-queries/shared/CodeFlow"; -import { createMockAnalysisMessage } from "../../../../../test/factories/remote-queries/shared/AnalysisMessage"; +import { createMockCodeFlows } from "../../../../../test/factories/variant-analysis/shared/CodeFlow"; +import { createMockAnalysisMessage } from "../../../../../test/factories/variant-analysis/shared/AnalysisMessage"; describe(CodePaths.name, () => { const render = (props?: CodePathsProps) => diff --git a/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetCode.tsx b/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetCode.tsx index 4a23826f9..7182f1bce 100644 --- a/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetCode.tsx +++ b/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetCode.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import styled from "styled-components"; -import { HighlightedRegion } from "../../../remote-queries/shared/analysis-result"; +import { HighlightedRegion } from "../../../variant-analysis/shared/analysis-result"; import { parseHighlightedLine, shouldHighlightLine, diff --git a/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetLine.tsx b/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetLine.tsx index 9b161bb56..e14773585 100644 --- a/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetLine.tsx +++ b/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetLine.tsx @@ -5,7 +5,7 @@ import { AnalysisMessage, HighlightedRegion, ResultSeverity, -} from "../../../remote-queries/shared/analysis-result"; +} from "../../../variant-analysis/shared/analysis-result"; import { CodeSnippetCode } from "./CodeSnippetCode"; import { CodeSnippetMessage } from "./CodeSnippetMessage"; diff --git a/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetMessage.tsx b/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetMessage.tsx index dade5e036..f3635b2df 100644 --- a/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetMessage.tsx +++ b/extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetMessage.tsx @@ -5,7 +5,7 @@ import { VSCodeLink } from "@vscode/webview-ui-toolkit/react"; import { AnalysisMessage, ResultSeverity, -} from "../../../remote-queries/shared/analysis-result"; +} from "../../../variant-analysis/shared/analysis-result"; import { createRemoteFileRef } from "../../../pure/location-link-utils"; import { VerticalSpace } from "../VerticalSpace"; import { sendTelemetry } from "../telemetry"; diff --git a/extensions/ql-vscode/src/view/common/FileCodeSnippet/FileCodeSnippet.tsx b/extensions/ql-vscode/src/view/common/FileCodeSnippet/FileCodeSnippet.tsx index 444dea093..3dbb4f868 100644 --- a/extensions/ql-vscode/src/view/common/FileCodeSnippet/FileCodeSnippet.tsx +++ b/extensions/ql-vscode/src/view/common/FileCodeSnippet/FileCodeSnippet.tsx @@ -8,7 +8,7 @@ import { FileLink, HighlightedRegion, ResultSeverity, -} from "../../../remote-queries/shared/analysis-result"; +} from "../../../variant-analysis/shared/analysis-result"; import { createRemoteFileRef } from "../../../pure/location-link-utils"; import { CodeSnippetMessage } from "./CodeSnippetMessage"; import { CodeSnippetLine } from "./CodeSnippetLine"; diff --git a/extensions/ql-vscode/src/view/variant-analysis/AnalysisAlertResult.tsx b/extensions/ql-vscode/src/view/variant-analysis/AnalysisAlertResult.tsx index df91e487a..7f54ae310 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/AnalysisAlertResult.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/AnalysisAlertResult.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import { AnalysisAlert } from "../../remote-queries/shared/analysis-result"; +import { AnalysisAlert } from "../../variant-analysis/shared/analysis-result"; import { CodePaths, FileCodeSnippet } from "../common"; const AnalysisAlertResult = ({ alert }: { alert: AnalysisAlert }) => { diff --git a/extensions/ql-vscode/src/view/variant-analysis/AnalyzedRepoItemContent.tsx b/extensions/ql-vscode/src/view/variant-analysis/AnalyzedRepoItemContent.tsx index 264c96c69..9d5d630be 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/AnalyzedRepoItemContent.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/AnalyzedRepoItemContent.tsx @@ -3,13 +3,13 @@ import styled from "styled-components"; import { AnalysisAlert, AnalysisRawResults, -} from "../../remote-queries/shared/analysis-result"; +} from "../../variant-analysis/shared/analysis-result"; import AnalysisAlertResult from "./AnalysisAlertResult"; import RawResultsTable from "./RawResultsTable"; import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepositoryDownloadStatus, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../variant-analysis/shared/variant-analysis"; import { Alert } from "../common"; const ContentContainer = styled.div` diff --git a/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx b/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx index 1965d8a4d..2c5f947be 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx @@ -3,7 +3,7 @@ import { ReactNode } from "react"; import { VSCodeLink } from "@vscode/webview-ui-toolkit/react"; import { Alert } from "../common"; import { vscode } from "../vscode-api"; -import { VariantAnalysisFailureReason } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisFailureReason } from "../../variant-analysis/shared/variant-analysis"; type Props = { failureReason: VariantAnalysisFailureReason; diff --git a/extensions/ql-vscode/src/view/variant-analysis/RepoRow.tsx b/extensions/ql-vscode/src/view/variant-analysis/RepoRow.tsx index 2a54fca0e..15334f0da 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/RepoRow.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/RepoRow.tsx @@ -7,7 +7,7 @@ import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepositoryDownloadStatus, VariantAnalysisScannedRepositoryState, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../variant-analysis/shared/variant-analysis"; import { formatDecimal } from "../../pure/number"; import { Codicon, @@ -16,11 +16,11 @@ import { SuccessIcon, WarningIcon, } from "../common"; -import { RepositoryWithMetadata } from "../../remote-queries/shared/repository"; +import { RepositoryWithMetadata } from "../../variant-analysis/shared/repository"; import { AnalysisAlert, AnalysisRawResults, -} from "../../remote-queries/shared/analysis-result"; +} from "../../variant-analysis/shared/analysis-result"; import { vscode } from "../vscode-api"; import { AnalyzedRepoItemContent } from "./AnalyzedRepoItemContent"; import StarCount from "../common/StarCount"; diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx index 55c564d10..cf4a0df25 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx @@ -6,7 +6,7 @@ import { VariantAnalysisScannedRepositoryResult, VariantAnalysisScannedRepositoryState, VariantAnalysisStatus, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisHeader } from "./VariantAnalysisHeader"; import { VariantAnalysisOutcomePanels } from "./VariantAnalysisOutcomePanels"; import { VariantAnalysisLoading } from "./VariantAnalysisLoading"; diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisActions.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisActions.tsx index d6a2588a0..4df2a9157 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisActions.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisActions.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import styled from "styled-components"; import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"; -import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis"; export type VariantAnalysisActionsProps = { variantAnalysisStatus: VariantAnalysisStatus; diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx index 0fa7ec783..2e787641d 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx @@ -6,7 +6,7 @@ import { VariantAnalysis, VariantAnalysisScannedRepositoryResult, VariantAnalysisScannedRepositoryState, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../variant-analysis/shared/variant-analysis"; import { filterAndSortRepositoriesWithResultsByName, RepositoriesFilterSortState, diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisHeader.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisHeader.tsx index ec3fd41b1..9661acc56 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisHeader.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisHeader.tsx @@ -8,7 +8,7 @@ import { VariantAnalysis, VariantAnalysisScannedRepositoryDownloadStatus, VariantAnalysisScannedRepositoryState, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../variant-analysis/shared/variant-analysis"; import { QueryDetails } from "./QueryDetails"; import { VariantAnalysisActions } from "./VariantAnalysisActions"; import { VariantAnalysisStats } from "./VariantAnalysisStats"; diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx index 8e36aee32..7d57e6cf4 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx @@ -13,7 +13,7 @@ import { VariantAnalysisScannedRepositoryResult, VariantAnalysisScannedRepositoryState, VariantAnalysisStatus, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisAnalyzedRepos } from "./VariantAnalysisAnalyzedRepos"; import { Alert } from "../common"; import { VariantAnalysisSkippedRepositoriesTab } from "./VariantAnalysisSkippedRepositoriesTab"; diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisRepositoriesStats.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisRepositoriesStats.tsx index cd91fcffe..bd6cbf488 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisRepositoriesStats.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisRepositoriesStats.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis"; import { formatDecimal } from "../../pure/number"; import { ErrorIcon, diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx index 8aec2166a..84d19c4c6 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { useMemo } from "react"; import styled from "styled-components"; -import { VariantAnalysisSkippedRepositoryGroup } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisSkippedRepositoryGroup } from "../../variant-analysis/shared/variant-analysis"; import { Alert } from "../common"; import { RepoRow } from "./RepoRow"; import { diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStats.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStats.tsx index f0883de7d..25802d20e 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStats.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStats.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { useMemo } from "react"; import styled from "styled-components"; -import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis"; import { StatItem } from "./StatItem"; import { formatDecimal } from "../../pure/number"; import { humanizeUnit } from "../../pure/time"; diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx index 5444f54d1..cd0d0c429 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import styled from "styled-components"; import { VSCodeLink } from "@vscode/webview-ui-toolkit/react"; import { formatDate } from "../../pure/date"; -import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis"; export type VariantAnalysisStatusStatsProps = { variantAnalysisStatus: VariantAnalysisStatus; diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/AnalyzedRepoItemContent.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/AnalyzedRepoItemContent.spec.tsx index 67315381c..848f2eed2 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/AnalyzedRepoItemContent.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/AnalyzedRepoItemContent.spec.tsx @@ -3,7 +3,7 @@ import { render as reactRender, screen } from "@testing-library/react"; import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepositoryDownloadStatus, -} from "../../../remote-queries/shared/variant-analysis"; +} from "../../../variant-analysis/shared/variant-analysis"; import { AnalyzedRepoItemContent, AnalyzedRepoItemContentProps, diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx index 570be30b7..8e740307d 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx @@ -3,10 +3,10 @@ import { render as reactRender, screen, waitFor } from "@testing-library/react"; import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepositoryDownloadStatus, -} from "../../../remote-queries/shared/variant-analysis"; +} from "../../../variant-analysis/shared/variant-analysis"; import userEvent from "@testing-library/user-event"; import { RepoRow, RepoRowProps } from "../RepoRow"; -import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository"; +import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository"; describe(RepoRow.name, () => { const render = (props: Partial = {}) => { diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx index 2f1fb3dd4..af20b11ca 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx @@ -3,9 +3,9 @@ import { render as reactRender, screen } from "@testing-library/react"; import { VariantAnalysisFailureReason, VariantAnalysisStatus, -} from "../../../remote-queries/shared/variant-analysis"; +} from "../../../variant-analysis/shared/variant-analysis"; import { VariantAnalysis, VariantAnalysisProps } from "../VariantAnalysis"; -import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis"; +import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis"; describe(VariantAnalysis.name, () => { const render = (props: Partial = {}) => diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisActions.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisActions.spec.tsx index 20c291128..a655f7d1c 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisActions.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisActions.spec.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { render as reactRender, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisActions, VariantAnalysisActionsProps, diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx index da2b9096c..a1cc2ad6b 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx @@ -5,14 +5,14 @@ import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepositoryDownloadStatus, VariantAnalysisStatus, -} from "../../../remote-queries/shared/variant-analysis"; +} from "../../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisAnalyzedRepos, VariantAnalysisAnalyzedReposProps, } from "../VariantAnalysisAnalyzedRepos"; -import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis"; -import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository"; -import { createMockScannedRepo } from "../../../../test/factories/remote-queries/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository"; +import { createMockScannedRepo } from "../../../../test/factories/variant-analysis/shared/scanned-repositories"; import { defaultFilterSortState, SortKey, diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx index d52777d36..39eb209f2 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx @@ -5,17 +5,17 @@ import { VariantAnalysisFailureReason, VariantAnalysisRepoStatus, VariantAnalysisStatus, -} from "../../../remote-queries/shared/variant-analysis"; +} from "../../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisOutcomePanelProps, VariantAnalysisOutcomePanels, } from "../VariantAnalysisOutcomePanels"; -import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis"; -import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository"; +import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository"; import { createMockScannedRepo, createMockScannedRepos, -} from "../../../../test/factories/remote-queries/shared/scanned-repositories"; +} from "../../../../test/factories/variant-analysis/shared/scanned-repositories"; import { defaultFilterSortState } from "../../../pure/variant-analysis-filter-sort"; describe(VariantAnalysisOutcomePanels.name, () => { diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx index 77381cfe0..30cf29b98 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { render as reactRender, screen } from "@testing-library/react"; -import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisStats, VariantAnalysisStatsProps, diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx index fd356bc5f..807179988 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { render as reactRender, screen } from "@testing-library/react"; -import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../../variant-analysis/shared/variant-analysis"; import { VariantAnalysisStatusStats, VariantAnalysisStatusStatsProps, 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 index 7b2789fc2..e395e09e2 100644 --- 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 @@ -3,8 +3,8 @@ import { QueryStatus } from "../../../src/query-status"; import { VariantAnalysis, VariantAnalysisStatus, -} from "../../../src/remote-queries/shared/variant-analysis"; -import { createMockVariantAnalysis } from "../remote-queries/shared/variant-analysis"; +} from "../../../src/variant-analysis/shared/variant-analysis"; +import { createMockVariantAnalysis } from "../variant-analysis/shared/variant-analysis"; export function createMockVariantAnalysisHistoryItem({ historyItemStatus = QueryStatus.InProgress, diff --git a/extensions/ql-vscode/test/factories/remote-queries/gh-api/repository.ts b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/repository.ts similarity index 89% rename from extensions/ql-vscode/test/factories/remote-queries/gh-api/repository.ts rename to extensions/ql-vscode/test/factories/variant-analysis/gh-api/repository.ts index 07cbfae50..621ea0b47 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/gh-api/repository.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/repository.ts @@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker"; import { Repository, RepositoryWithMetadata, -} from "../../../../src/remote-queries/gh-api/repository"; +} from "../../../../src/variant-analysis/gh-api/repository"; export function createMockRepository(name = faker.random.word()): Repository { return { diff --git a/extensions/ql-vscode/test/factories/remote-queries/gh-api/scanned-repositories.ts b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/scanned-repositories.ts similarity index 93% rename from extensions/ql-vscode/test/factories/remote-queries/gh-api/scanned-repositories.ts rename to extensions/ql-vscode/test/factories/variant-analysis/gh-api/scanned-repositories.ts index 84e5819c5..cab58359a 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/gh-api/scanned-repositories.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/scanned-repositories.ts @@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker"; import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepository, -} from "../../../../src/remote-queries/gh-api/variant-analysis"; +} from "../../../../src/variant-analysis/gh-api/variant-analysis"; import { createMockRepositoryWithMetadata } from "./repository"; export function createMockScannedRepo( diff --git a/extensions/ql-vscode/test/factories/remote-queries/gh-api/skipped-repositories.ts b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/skipped-repositories.ts similarity index 94% rename from extensions/ql-vscode/test/factories/remote-queries/gh-api/skipped-repositories.ts rename to extensions/ql-vscode/test/factories/variant-analysis/gh-api/skipped-repositories.ts index 4ec66e180..469fd0370 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/gh-api/skipped-repositories.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/skipped-repositories.ts @@ -3,7 +3,7 @@ import { VariantAnalysisNotFoundRepositoryGroup, VariantAnalysisSkippedRepositories, VariantAnalysisSkippedRepositoryGroup, -} from "../../../../src/remote-queries/gh-api/variant-analysis"; +} from "../../../../src/variant-analysis/gh-api/variant-analysis"; import { createMockRepositoryWithMetadata } from "./repository"; export function createMockSkippedRepos(): VariantAnalysisSkippedRepositories { diff --git a/extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-api-response.ts b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-api-response.ts similarity index 90% rename from extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-api-response.ts rename to extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-api-response.ts index 9ae585ea6..d791db54d 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-api-response.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-api-response.ts @@ -4,8 +4,8 @@ import { VariantAnalysisScannedRepository, VariantAnalysisSkippedRepositories, VariantAnalysisStatus, -} from "../../../../src/remote-queries/gh-api/variant-analysis"; -import { VariantAnalysisQueryLanguage } from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/gh-api/variant-analysis"; +import { VariantAnalysisQueryLanguage } from "../../../../src/variant-analysis/shared/variant-analysis"; import { createMockScannedRepos } from "./scanned-repositories"; import { createMockSkippedRepos } from "./skipped-repositories"; import { createMockRepository } from "./repository"; diff --git a/extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-repo-task.ts b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-repo-task.ts similarity index 69% rename from extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-repo-task.ts rename to extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-repo-task.ts index c06661941..27b578430 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-repo-task.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-repo-task.ts @@ -1,6 +1,6 @@ import { faker } from "@faker-js/faker"; -import { VariantAnalysisRepoTask } from "../../../../src/remote-queries/gh-api/variant-analysis"; -import { VariantAnalysisRepoStatus } from "../../../../src/remote-queries/shared/variant-analysis"; +import { VariantAnalysisRepoTask } from "../../../../src/variant-analysis/gh-api/variant-analysis"; +import { VariantAnalysisRepoStatus } from "../../../../src/variant-analysis/shared/variant-analysis"; import { createMockRepository } from "./repository"; export function createMockVariantAnalysisRepoTask(): VariantAnalysisRepoTask { diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/AnalysisMessage.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/AnalysisMessage.ts similarity index 64% rename from extensions/ql-vscode/test/factories/remote-queries/shared/AnalysisMessage.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/AnalysisMessage.ts index cdd462908..364398d28 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/AnalysisMessage.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/AnalysisMessage.ts @@ -1,4 +1,4 @@ -import { AnalysisMessage } from "../../../../src/remote-queries/shared/analysis-result"; +import { AnalysisMessage } from "../../../../src/variant-analysis/shared/analysis-result"; export function createMockAnalysisMessage(): AnalysisMessage { return { diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/CodeFlow.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/CodeFlow.ts similarity index 85% rename from extensions/ql-vscode/test/factories/remote-queries/shared/CodeFlow.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/CodeFlow.ts index eb1713d8e..16f728c13 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/CodeFlow.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/CodeFlow.ts @@ -1,4 +1,4 @@ -import { CodeFlow } from "../../../../src/remote-queries/shared/analysis-result"; +import { CodeFlow } from "../../../../src/variant-analysis/shared/analysis-result"; import { createMockAnalysisMessage } from "./AnalysisMessage"; export function createMockCodeFlows(): CodeFlow[] { diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/repository.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/repository.ts similarity index 89% rename from extensions/ql-vscode/test/factories/remote-queries/shared/repository.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/repository.ts index 7220c99e3..d5579aeb0 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/repository.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/repository.ts @@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker"; import { Repository, RepositoryWithMetadata, -} from "../../../../src/remote-queries/shared/repository"; +} from "../../../../src/variant-analysis/shared/repository"; export function createMockRepository(): Repository { return { diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/scanned-repositories.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/scanned-repositories.ts similarity index 93% rename from extensions/ql-vscode/test/factories/remote-queries/shared/scanned-repositories.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/scanned-repositories.ts index f78506c5d..e043f5652 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/scanned-repositories.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/scanned-repositories.ts @@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker"; import { VariantAnalysisRepoStatus, VariantAnalysisScannedRepository, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; import { createMockRepositoryWithMetadata } from "./repository"; export function createMockScannedRepo( diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/skipped-repositories.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/skipped-repositories.ts similarity index 93% rename from extensions/ql-vscode/test/factories/remote-queries/shared/skipped-repositories.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/skipped-repositories.ts index 090158f44..01d7e080f 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/skipped-repositories.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/skipped-repositories.ts @@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker"; import { VariantAnalysisSkippedRepositories, VariantAnalysisSkippedRepositoryGroup, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; import { createMockRepositoryWithMetadata } from "./repository"; export function createMockSkippedRepos(): VariantAnalysisSkippedRepositories { diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-repo-tasks.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-repo-tasks.ts similarity index 91% rename from extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-repo-tasks.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-repo-tasks.ts index dc610313c..1ca1ac70c 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-repo-tasks.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-repo-tasks.ts @@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker"; import { VariantAnalysisRepositoryTask, VariantAnalysisRepoStatus, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; import { createMockRepositoryWithMetadata } from "./repository"; export function createMockVariantAnalysisRepositoryTask( diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-submission.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-submission.ts similarity index 89% rename from extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-submission.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-submission.ts index fd12aa271..141a60cd9 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-submission.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-submission.ts @@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker"; import { VariantAnalysisQueryLanguage, VariantAnalysisSubmission, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; export function createMockSubmission(): VariantAnalysisSubmission { return { diff --git a/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis.ts b/extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis.ts similarity index 95% rename from extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis.ts rename to extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis.ts index d2fed5dda..5607fee6d 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis.ts +++ b/extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis.ts @@ -5,7 +5,7 @@ import { VariantAnalysisScannedRepository, VariantAnalysisSkippedRepositories, VariantAnalysisStatus, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; import { createMockScannedRepos } from "./scanned-repositories"; import { createMockSkippedRepos } from "./skipped-repositories"; import { createMockRepository } from "./repository"; diff --git a/extensions/ql-vscode/test/unit-tests/sarif-processing.test.ts b/extensions/ql-vscode/test/unit-tests/sarif-processing.test.ts index 2bfcd1b0b..91010b08e 100644 --- a/extensions/ql-vscode/test/unit-tests/sarif-processing.test.ts +++ b/extensions/ql-vscode/test/unit-tests/sarif-processing.test.ts @@ -3,11 +3,11 @@ import { extractAnalysisAlerts, tryGetRule, tryGetSeverity, -} from "../../src/remote-queries/sarif-processing"; +} from "../../src/variant-analysis/sarif-processing"; import { AnalysisMessage, AnalysisMessageLocationToken, -} from "../../src/remote-queries/shared/analysis-result"; +} from "../../src/variant-analysis/shared/analysis-result"; describe("SARIF processing", () => { describe("tryGetRule", () => { diff --git a/extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts index 80297fc52..f1927e621 100644 --- a/extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts +++ b/extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts @@ -6,9 +6,9 @@ import { isVariantAnalysisComplete, VariantAnalysisRepoStatus, getActionsWorkflowRunUrl, -} from "../../src/remote-queries/shared/variant-analysis"; -import { createMockScannedRepo } from "../factories/remote-queries/shared/scanned-repositories"; -import { createMockVariantAnalysis } from "../factories/remote-queries/shared/variant-analysis"; +} from "../../src/variant-analysis/shared/variant-analysis"; +import { createMockScannedRepo } from "../factories/variant-analysis/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../factories/variant-analysis/shared/variant-analysis"; describe("parseVariantAnalysisQueryLanguage", () => { it("parses a valid language", () => { diff --git a/extensions/ql-vscode/test/unit-tests/remote-queries/gh-api/gh-api-client.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts similarity index 93% rename from extensions/ql-vscode/test/unit-tests/remote-queries/gh-api/gh-api-client.test.ts rename to extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts index fb012188a..0313b8034 100644 --- a/extensions/ql-vscode/test/unit-tests/remote-queries/gh-api/gh-api-client.test.ts +++ b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts @@ -3,8 +3,8 @@ import { getVariantAnalysis, getVariantAnalysisRepo, submitVariantAnalysis, -} from "../../../../src/remote-queries/gh-api/gh-api-client"; -import { createMockSubmission } from "../../../factories/remote-queries/shared/variant-analysis-submission"; +} from "../../../../src/variant-analysis/gh-api/gh-api-client"; +import { createMockSubmission } from "../../../factories/variant-analysis/shared/variant-analysis-submission"; import { MockGitHubApiServer } from "../../../../src/mocks/mock-gh-api-server"; import { response } from "../../../../src/mocks/scenarios/problem-query-success/0-getRepo.json"; diff --git a/extensions/ql-vscode/test/unit-tests/remote-queries/markdown-generation.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis/markdown-generation.test.ts similarity index 97% rename from extensions/ql-vscode/test/unit-tests/remote-queries/markdown-generation.test.ts rename to extensions/ql-vscode/test/unit-tests/variant-analysis/markdown-generation.test.ts index 994b18517..e73fb9dba 100644 --- a/extensions/ql-vscode/test/unit-tests/remote-queries/markdown-generation.test.ts +++ b/extensions/ql-vscode/test/unit-tests/variant-analysis/markdown-generation.test.ts @@ -4,17 +4,17 @@ import { readdir, readFile } from "fs-extra"; import { generateVariantAnalysisMarkdown, MarkdownFile, -} from "../../../src/remote-queries/markdown-generation"; +} from "../../../src/variant-analysis/markdown-generation"; import { VariantAnalysisQueryLanguage, VariantAnalysisRepoStatus, VariantAnalysisScannedRepository, VariantAnalysisScannedRepositoryResult, -} from "../../../src/remote-queries/shared/variant-analysis"; +} from "../../../src/variant-analysis/shared/variant-analysis"; import { AnalysisAlert, AnalysisRawResults, -} from "../../../src/remote-queries/shared/analysis-result"; +} from "../../../src/variant-analysis/shared/analysis-result"; import pathProblemAnalysesResults from "../data/markdown-generation/interpreted-results/path-problem/analyses-results.json"; import problemAnalysesResults from "../data/markdown-generation/interpreted-results/problem/analyses-results.json"; diff --git a/extensions/ql-vscode/test/unit-tests/remote-queries/variant-analysis-processor.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis/variant-analysis-processor.test.ts similarity index 92% rename from extensions/ql-vscode/test/unit-tests/remote-queries/variant-analysis-processor.test.ts rename to extensions/ql-vscode/test/unit-tests/variant-analysis/variant-analysis-processor.test.ts index cc5fcbf46..d7e3bbcbf 100644 --- a/extensions/ql-vscode/test/unit-tests/remote-queries/variant-analysis-processor.test.ts +++ b/extensions/ql-vscode/test/unit-tests/variant-analysis/variant-analysis-processor.test.ts @@ -1,23 +1,23 @@ import { faker } from "@faker-js/faker"; -import { VariantAnalysisScannedRepository as ApiVariantAnalysisScannedRepository } from "../../../src/remote-queries/gh-api/variant-analysis"; +import { VariantAnalysisScannedRepository as ApiVariantAnalysisScannedRepository } from "../../../src/variant-analysis/gh-api/variant-analysis"; import { VariantAnalysisQueryLanguage, VariantAnalysisScannedRepository, VariantAnalysisRepoStatus, -} from "../../../src/remote-queries/shared/variant-analysis"; +} from "../../../src/variant-analysis/shared/variant-analysis"; import { processScannedRepository, processVariantAnalysis, processVariantAnalysisRepositoryTask, -} from "../../../src/remote-queries/variant-analysis-processor"; +} from "../../../src/variant-analysis/variant-analysis-processor"; import { createMockScannedRepo, createMockScannedRepos, -} from "../../factories/remote-queries/gh-api/scanned-repositories"; -import { createMockSkippedRepos } from "../../factories/remote-queries/gh-api/skipped-repositories"; -import { createMockApiResponse } from "../../factories/remote-queries/gh-api/variant-analysis-api-response"; -import { createMockSubmission } from "../../factories/remote-queries/shared/variant-analysis-submission"; -import { createMockVariantAnalysisRepoTask } from "../../factories/remote-queries/gh-api/variant-analysis-repo-task"; +} from "../../factories/variant-analysis/gh-api/scanned-repositories"; +import { createMockSkippedRepos } from "../../factories/variant-analysis/gh-api/skipped-repositories"; +import { createMockApiResponse } from "../../factories/variant-analysis/gh-api/variant-analysis-api-response"; +import { createMockSubmission } from "../../factories/variant-analysis/shared/variant-analysis-submission"; +import { createMockVariantAnalysisRepoTask } from "../../factories/variant-analysis/gh-api/variant-analysis-repo-task"; describe(processVariantAnalysis.name, () => { const scannedRepos = createMockScannedRepos(); diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts similarity index 97% rename from extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts index 9238b7de1..6af75f008 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts @@ -17,44 +17,44 @@ import { setRemoteControllerRepo, setRemoteRepositoryLists, } from "../../../../src/config"; -import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client"; -import * as ghActionsApiClient from "../../../../src/remote-queries/gh-api/gh-actions-api-client"; +import * as ghApiClient from "../../../../src/variant-analysis/gh-api/gh-api-client"; +import * as ghActionsApiClient from "../../../../src/variant-analysis/gh-api/gh-actions-api-client"; import * as fs from "fs-extra"; import { join } from "path"; import { Readable } from "stream"; import { Response } from "node-fetch"; import * as fetchModule from "node-fetch"; -import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; +import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager"; import { CodeQLCliServer } from "../../../../src/cli"; import { fixWorkspaceReferences, restoreWorkspaceReferences, storagePath, } from "../../global.helper"; -import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager"; -import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis"; -import * as VariantAnalysisModule from "../../../../src/remote-queries/shared/variant-analysis"; +import { VariantAnalysisResultsManager } from "../../../../src/variant-analysis/variant-analysis-results-manager"; +import { createMockVariantAnalysis } from "../../../factories/variant-analysis/shared/variant-analysis"; +import * as VariantAnalysisModule from "../../../../src/variant-analysis/shared/variant-analysis"; import { createMockScannedRepo, createMockScannedRepos, -} from "../../../factories/remote-queries/shared/scanned-repositories"; +} from "../../../factories/variant-analysis/shared/scanned-repositories"; import { VariantAnalysis, VariantAnalysisScannedRepository, VariantAnalysisScannedRepositoryDownloadStatus, VariantAnalysisScannedRepositoryState, VariantAnalysisStatus, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; import { createTimestampFile } from "../../../../src/helpers"; -import { createMockVariantAnalysisRepoTask } from "../../../factories/remote-queries/gh-api/variant-analysis-repo-task"; +import { createMockVariantAnalysisRepoTask } from "../../../factories/variant-analysis/gh-api/variant-analysis-repo-task"; import { VariantAnalysis as VariantAnalysisApiResponse, VariantAnalysisRepoTask, -} from "../../../../src/remote-queries/gh-api/variant-analysis"; -import { createMockApiResponse } from "../../../factories/remote-queries/gh-api/variant-analysis-api-response"; +} from "../../../../src/variant-analysis/gh-api/variant-analysis"; +import { createMockApiResponse } from "../../../factories/variant-analysis/gh-api/variant-analysis-api-response"; import { UserCancellationException } from "../../../../src/commandRunner"; -import { Repository } from "../../../../src/remote-queries/gh-api/repository"; +import { Repository } from "../../../../src/variant-analysis/gh-api/repository"; import { defaultFilterSortState, SortKey, diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-monitor.test.ts similarity index 92% rename from extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-monitor.test.ts index 63722cfd5..0c9082c91 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-monitor.test.ts @@ -1,29 +1,29 @@ import { CancellationTokenSource, commands, extensions } from "vscode"; import { CodeQLExtensionInterface } from "../../../../src/extension"; -import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client"; -import { VariantAnalysisMonitor } from "../../../../src/remote-queries/variant-analysis-monitor"; +import * as ghApiClient from "../../../../src/variant-analysis/gh-api/gh-api-client"; +import { VariantAnalysisMonitor } from "../../../../src/variant-analysis/variant-analysis-monitor"; import { VariantAnalysis as VariantAnalysisApiResponse, VariantAnalysisFailureReason, VariantAnalysisScannedRepository as ApiVariantAnalysisScannedRepository, -} from "../../../../src/remote-queries/gh-api/variant-analysis"; +} from "../../../../src/variant-analysis/gh-api/variant-analysis"; import { createFailedMockApiResponse, createMockApiResponse, -} from "../../../factories/remote-queries/gh-api/variant-analysis-api-response"; +} from "../../../factories/variant-analysis/gh-api/variant-analysis-api-response"; import { VariantAnalysis, VariantAnalysisStatus, -} from "../../../../src/remote-queries/shared/variant-analysis"; -import { createMockScannedRepos } from "../../../factories/remote-queries/gh-api/scanned-repositories"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; +import { createMockScannedRepos } from "../../../factories/variant-analysis/gh-api/scanned-repositories"; import { processFailureReason, processScannedRepository, processUpdatedVariantAnalysis, -} from "../../../../src/remote-queries/variant-analysis-processor"; -import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis"; -import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; +} from "../../../../src/variant-analysis/variant-analysis-processor"; +import { createMockVariantAnalysis } from "../../../factories/variant-analysis/shared/variant-analysis"; +import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager"; import { testCredentialsWithStub } from "../../../factories/authentication"; jest.setTimeout(60_000); diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-results-manager.test.ts similarity index 98% rename from extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-results-manager.test.ts index 43deb4a40..9c2c3590f 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-results-manager.test.ts @@ -7,15 +7,15 @@ import { Readable } from "stream"; import { Response, RequestInfo, RequestInit } from "node-fetch"; import * as fetchModule from "node-fetch"; -import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager"; +import { VariantAnalysisResultsManager } from "../../../../src/variant-analysis/variant-analysis-results-manager"; import { CodeQLCliServer } from "../../../../src/cli"; import { storagePath } from "../../global.helper"; import { faker } from "@faker-js/faker"; -import { createMockVariantAnalysisRepositoryTask } from "../../../factories/remote-queries/shared/variant-analysis-repo-tasks"; +import { createMockVariantAnalysisRepositoryTask } from "../../../factories/variant-analysis/shared/variant-analysis-repo-tasks"; import { VariantAnalysisRepositoryTask, VariantAnalysisScannedRepositoryResult, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; jest.setTimeout(10_000); diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts similarity index 100% rename from extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts diff --git a/extensions/ql-vscode/test/vscode-tests/global.helper.ts b/extensions/ql-vscode/test/vscode-tests/global.helper.ts index 93b47e66f..e77eefe62 100644 --- a/extensions/ql-vscode/test/vscode-tests/global.helper.ts +++ b/extensions/ql-vscode/test/vscode-tests/global.helper.ts @@ -4,7 +4,7 @@ import { realpathSync, readFileSync, writeFileSync } from "fs-extra"; import { commands } from "vscode"; import { DatabaseManager } from "../../src/databases"; import { CodeQLCliServer } from "../../src/cli"; -import { removeWorkspaceRefs } from "../../src/remote-queries/run-remote-query"; +import { removeWorkspaceRefs } from "../../src/variant-analysis/run-remote-query"; // This file contains helpers shared between tests that work with an activated extension. 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 index 80e3efe3d..0c4eee0b0 100644 --- 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 @@ -7,9 +7,9 @@ import { QueryStatus } from "../../../../src/query-status"; import { VariantAnalysisRepoStatus, VariantAnalysisStatus, -} from "../../../../src/remote-queries/shared/variant-analysis"; -import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis"; -import { createMockScannedRepos } from "../../../factories/remote-queries/shared/scanned-repositories"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; +import { createMockVariantAnalysis } from "../../../factories/variant-analysis/shared/variant-analysis"; +import { createMockScannedRepos } from "../../../factories/variant-analysis/shared/scanned-repositories"; describe("HistoryItemLabelProvider", () => { let labelProvider: HistoryItemLabelProvider; 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 index bcf12d3a9..c1eadc03e 100644 --- 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 @@ -13,7 +13,7 @@ import { HistoryItemLabelProvider } from "../../../../src/query-history/history- import { ResultsView } from "../../../../src/interface"; import { EvalLogViewer } from "../../../../src/eval-log-viewer"; import { QueryRunner } from "../../../../src/queryRunner"; -import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; +import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager"; import { QueryHistoryInfo } from "../../../../src/query-history/query-history-info"; import { createMockLocalQueryInfo, @@ -23,7 +23,7 @@ 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 { VariantAnalysisStatus } from "../../../../src/remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../../../src/variant-analysis/shared/variant-analysis"; import { HistoryTreeDataProvider, SortOrder, 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 index 9a31bf4a8..34e060d9a 100644 --- 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 @@ -7,13 +7,13 @@ import { getRawQueryName, } from "../../../../src/query-history/query-history-info"; import { VariantAnalysisHistoryItem } from "../../../../src/query-history/variant-analysis-history-item"; -import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis"; -import { createMockScannedRepos } from "../../../factories/remote-queries/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../../../factories/variant-analysis/shared/variant-analysis"; +import { createMockScannedRepos } from "../../../factories/variant-analysis/shared/scanned-repositories"; import { createMockLocalQueryInfo } from "../../../factories/query-history/local-query-history-item"; import { VariantAnalysisRepoStatus, VariantAnalysisStatus, -} from "../../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/variant-analysis/shared/variant-analysis"; describe("Query history info", () => { const date = new Date("2022-01-01T00:00:00.000Z"); 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 index fe6aed4d4..461066151 100644 --- 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 @@ -14,7 +14,7 @@ import { HistoryItemLabelProvider } from "../../../../src/query-history/history- import { ResultsView } from "../../../../src/interface"; import { EvalLogViewer } from "../../../../src/eval-log-viewer"; import { QueryRunner } from "../../../../src/queryRunner"; -import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; +import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager"; import { QueryHistoryInfo } from "../../../../src/query-history/query-history-info"; import { createMockLocalQueryInfo, @@ -24,7 +24,7 @@ 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 { VariantAnalysisStatus } from "../../../../src/remote-queries/shared/variant-analysis"; +import { VariantAnalysisStatus } from "../../../../src/variant-analysis/shared/variant-analysis"; import { QuickPickItem, TextEditor } from "vscode"; import { WebviewReveal } from "../../../../src/interface-utils"; import * as helpers from "../../../../src/helpers"; diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts index 360c10479..1270c02c3 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts @@ -18,7 +18,7 @@ import { HistoryItemLabelProvider } from "../../../../src/query-history/history- import { ResultsView } from "../../../../src/interface"; import { EvalLogViewer } from "../../../../src/eval-log-viewer"; import { QueryRunner } from "../../../../src/queryRunner"; -import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; +import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager"; import { QueryHistoryManager } from "../../../../src/query-history/query-history-manager"; // set a higher timeout since recursive delete may take a while, expecially on Windows. diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/variant-analysis/repository-selection.test.ts similarity index 99% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/variant-analysis/repository-selection.test.ts index 034a7571d..8a623f506 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/variant-analysis/repository-selection.test.ts @@ -6,7 +6,7 @@ import { ensureDir, writeFile, writeJson } from "fs-extra"; import { UserCancellationException } from "../../../../src/commandRunner"; import * as config from "../../../../src/config"; -import { getRepositorySelection } from "../../../../src/remote-queries/repository-selection"; +import { getRepositorySelection } from "../../../../src/variant-analysis/repository-selection"; import { DbManager } from "../../../../src/databases/db-manager"; import { DbItem,