diff --git a/extensions/ql-vscode/src/compare/compare-view.ts b/extensions/ql-vscode/src/compare/compare-view.ts index 02ef142c136..1d31ccb29bf 100644 --- a/extensions/ql-vscode/src/compare/compare-view.ts +++ b/extensions/ql-vscode/src/compare/compare-view.ts @@ -17,7 +17,7 @@ import { import resultsDiff from "./resultsDiff"; import { CompletedLocalQueryInfo } from "../query-results"; import { assertNever, getErrorMessage } from "../pure/helpers-pure"; -import { HistoryItemLabelProvider } from "../history-item-label-provider"; +import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider"; import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview"; import { telemetryListener } from "../telemetry"; diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index 99361f6a33d..de12a9c124c 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -83,7 +83,7 @@ import { ProgressReporter, queryServerLogger, } from "./common"; -import { QueryHistoryManager } from "./query-history"; +import { QueryHistoryManager } from "./query-history/query-history"; import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results"; import { QueryServerClient as LegacyQueryServerClient } from "./legacy-query-server/queryserver-client"; import { QueryServerClient } from "./query-server/queryserver-client"; @@ -110,7 +110,7 @@ import { handleDownloadPacks, handleInstallPackDependencies, } from "./packaging"; -import { HistoryItemLabelProvider } from "./history-item-label-provider"; +import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider"; import { exportRemoteQueryResults, exportSelectedRemoteQueryResults, diff --git a/extensions/ql-vscode/src/interface.ts b/extensions/ql-vscode/src/interface.ts index c27cb1b83e1..602503552e1 100644 --- a/extensions/ql-vscode/src/interface.ts +++ b/extensions/ql-vscode/src/interface.ts @@ -64,7 +64,7 @@ import { } from "./pure/bqrs-cli-types"; import { AbstractWebview, WebviewPanelConfig } from "./abstract-webview"; import { PAGE_SIZE } from "./config"; -import { HistoryItemLabelProvider } from "./history-item-label-provider"; +import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider"; import { telemetryListener } from "./telemetry"; /** diff --git a/extensions/ql-vscode/src/log-insights/log-scanner-service.ts b/extensions/ql-vscode/src/log-insights/log-scanner-service.ts index 292f0d47586..339e37a5852 100644 --- a/extensions/ql-vscode/src/log-insights/log-scanner-service.ts +++ b/extensions/ql-vscode/src/log-insights/log-scanner-service.ts @@ -1,7 +1,7 @@ import { Diagnostic, DiagnosticSeverity, languages, Range, Uri } from "vscode"; import { DisposableObject } from "../pure/disposable-object"; -import { QueryHistoryManager } from "../query-history"; -import { QueryHistoryInfo } from "../query-history-info"; +import { QueryHistoryManager } from "../query-history/query-history"; +import { QueryHistoryInfo } from "../query-history/query-history-info"; import { EvaluationLogProblemReporter, EvaluationLogScannerSet, diff --git a/extensions/ql-vscode/src/history-item-label-provider.ts b/extensions/ql-vscode/src/query-history/history-item-label-provider.ts similarity index 89% rename from extensions/ql-vscode/src/history-item-label-provider.ts rename to extensions/ql-vscode/src/query-history/history-item-label-provider.ts index c4562420e01..7ba9ba89ef7 100644 --- a/extensions/ql-vscode/src/history-item-label-provider.ts +++ b/extensions/ql-vscode/src/query-history/history-item-label-provider.ts @@ -1,17 +1,17 @@ import { env } from "vscode"; import { basename } from "path"; -import { QueryHistoryConfig } from "./config"; -import { LocalQueryInfo } from "./query-results"; +import { QueryHistoryConfig } from "../config"; +import { LocalQueryInfo } from "../query-results"; import { buildRepoLabel, getRawQueryName, QueryHistoryInfo, } from "./query-history-info"; -import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item"; -import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item"; -import { assertNever } from "./pure/helpers-pure"; -import { pluralize } from "./pure/word"; -import { humanizeQueryStatus } from "./query-status"; +import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item"; +import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item"; +import { assertNever } from "../pure/helpers-pure"; +import { pluralize } from "../pure/word"; +import { humanizeQueryStatus } from "../query-status"; interface InterpolateReplacements { t: string; // Start time diff --git a/extensions/ql-vscode/src/query-history-info.ts b/extensions/ql-vscode/src/query-history/query-history-info.ts similarity index 88% rename from extensions/ql-vscode/src/query-history-info.ts rename to extensions/ql-vscode/src/query-history/query-history-info.ts index 2116a5ac2b9..87a67dfd885 100644 --- a/extensions/ql-vscode/src/query-history-info.ts +++ b/extensions/ql-vscode/src/query-history/query-history-info.ts @@ -1,12 +1,12 @@ -import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item"; -import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item"; -import { LocalQueryInfo } from "./query-results"; -import { assertNever } from "./pure/helpers-pure"; -import { pluralize } from "./pure/word"; +import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item"; +import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item"; +import { LocalQueryInfo } from "../query-results"; +import { assertNever } from "../pure/helpers-pure"; +import { pluralize } from "../pure/word"; import { hasRepoScanCompleted, getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl, -} from "./remote-queries/shared/variant-analysis"; +} from "../remote-queries/shared/variant-analysis"; export type QueryHistoryInfo = | LocalQueryInfo diff --git a/extensions/ql-vscode/src/query-history-scrubber.ts b/extensions/ql-vscode/src/query-history/query-history-scrubber.ts similarity index 99% rename from extensions/ql-vscode/src/query-history-scrubber.ts rename to extensions/ql-vscode/src/query-history/query-history-scrubber.ts index d986c7988f0..a8a3833be1e 100644 --- a/extensions/ql-vscode/src/query-history-scrubber.ts +++ b/extensions/ql-vscode/src/query-history/query-history-scrubber.ts @@ -2,7 +2,7 @@ import { pathExists, readdir, stat, remove, readFile } from "fs-extra"; import { EOL } from "os"; import { join } from "path"; import { Disposable, ExtensionContext } from "vscode"; -import { extLogger } from "./common"; +import { extLogger } from "../common"; import { QueryHistoryManager } from "./query-history"; const LAST_SCRUB_TIME_KEY = "lastScrubTime"; diff --git a/extensions/ql-vscode/src/query-history.ts b/extensions/ql-vscode/src/query-history/query-history.ts similarity index 97% rename from extensions/ql-vscode/src/query-history.ts rename to extensions/ql-vscode/src/query-history/query-history.ts index 6adecf535b7..e5742d75f7b 100644 --- a/extensions/ql-vscode/src/query-history.ts +++ b/extensions/ql-vscode/src/query-history/query-history.ts @@ -17,58 +17,58 @@ import { window, workspace, } from "vscode"; -import { QueryHistoryConfig } from "./config"; +import { QueryHistoryConfig } from "../config"; import { showAndLogErrorMessage, showAndLogInformationMessage, showAndLogWarningMessage, showBinaryChoiceDialog, showInformationMessageWithAction, -} from "./helpers"; -import { extLogger } from "./common"; +} from "../helpers"; +import { extLogger } from "../common"; import { URLSearchParams } from "url"; -import { DisposableObject } from "./pure/disposable-object"; -import { commandRunner } from "./commandRunner"; -import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "./pure/time"; +import { DisposableObject } from "../pure/disposable-object"; +import { commandRunner } from "../commandRunner"; +import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "../pure/time"; import { assertNever, getErrorMessage, getErrorStack, -} from "./pure/helpers-pure"; -import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results"; +} from "../pure/helpers-pure"; +import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results"; import { getActionsWorkflowRunUrl, getQueryId, getQueryText, QueryHistoryInfo, } from "./query-history-info"; -import { DatabaseManager } from "./databases"; +import { DatabaseManager } from "../databases"; import { registerQueryHistoryScrubber } from "./query-history-scrubber"; import { QueryStatus, variantAnalysisStatusToQueryStatus, -} from "./query-status"; +} from "../query-status"; import { deserializeQueryHistory, serializeQueryHistory, -} from "./query-serialization"; +} from "../query-serialization"; import { pathExists } from "fs-extra"; -import { CliVersionConstraint } from "./cli"; +import { CliVersionConstraint } from "../cli"; import { HistoryItemLabelProvider } from "./history-item-label-provider"; -import { Credentials } from "./authentication"; -import { cancelRemoteQuery } from "./remote-queries/gh-api/gh-actions-api-client"; -import { RemoteQueriesManager } from "./remote-queries/remote-queries-manager"; -import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item"; -import { ResultsView } from "./interface"; -import { WebviewReveal } from "./interface-utils"; -import { EvalLogViewer } from "./eval-log-viewer"; -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 { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item"; -import { getTotalResultCount } from "./remote-queries/shared/variant-analysis"; +import { Credentials } from "../authentication"; +import { cancelRemoteQuery } from "../remote-queries/gh-api/gh-actions-api-client"; +import { RemoteQueriesManager } from "../remote-queries/remote-queries-manager"; +import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item"; +import { ResultsView } from "../interface"; +import { WebviewReveal } from "../interface-utils"; +import { EvalLogViewer } from "../eval-log-viewer"; +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 { VariantAnalysisHistoryItem } from "./variant-analysis-history-item"; +import { getTotalResultCount } from "../remote-queries/shared/variant-analysis"; /** * query-history.ts @@ -1705,6 +1705,7 @@ the file in the file explorer and dragging it into the workspace.`, throw new Error("No other queries available to compare with."); } const choice = await window.showQuickPick(comparableQueryLabels); + return choice?.query; } diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-history-item.ts b/extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts similarity index 81% rename from extensions/ql-vscode/src/remote-queries/variant-analysis-history-item.ts rename to extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts index 18327733fae..6cbb7cea936 100644 --- a/extensions/ql-vscode/src/remote-queries/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 "./shared/variant-analysis"; +import { VariantAnalysis } from "../remote-queries/shared/variant-analysis"; /** * Information about a variant analysis. diff --git a/extensions/ql-vscode/src/query-serialization.ts b/extensions/ql-vscode/src/query-serialization.ts index 6006b2b69e2..0871fa14a84 100644 --- a/extensions/ql-vscode/src/query-serialization.ts +++ b/extensions/ql-vscode/src/query-serialization.ts @@ -8,7 +8,7 @@ import { getErrorStack, } from "./pure/helpers-pure"; import { CompletedQueryInfo, LocalQueryInfo } from "./query-results"; -import { QueryHistoryInfo } from "./query-history-info"; +import { QueryHistoryInfo } from "./query-history/query-history-info"; import { QueryStatus } from "./query-status"; import { QueryEvaluationInfo } from "./run-queries-shared"; import { QueryResultType } from "./pure/legacy-messages"; diff --git a/extensions/ql-vscode/src/remote-queries/export-results.ts b/extensions/ql-vscode/src/remote-queries/export-results.ts index e829889b542..2db997e0998 100644 --- a/extensions/ql-vscode/src/remote-queries/export-results.ts +++ b/extensions/ql-vscode/src/remote-queries/export-results.ts @@ -13,7 +13,7 @@ import { Credentials } from "../authentication"; import { ProgressCallback, UserCancellationException } from "../commandRunner"; import { showInformationMessageWithAction } from "../helpers"; import { extLogger } from "../common"; -import { QueryHistoryManager } from "../query-history"; +import { QueryHistoryManager } from "../query-history/query-history"; import { createGist } from "./gh-api/gh-api-client"; import { RemoteQueriesManager } from "./remote-queries-manager"; import { diff --git a/extensions/ql-vscode/src/remote-queries/remote-queries-view.ts b/extensions/ql-vscode/src/remote-queries/remote-queries-view.ts index 9a42622eacb..59a5d8c5e91 100644 --- a/extensions/ql-vscode/src/remote-queries/remote-queries-view.ts +++ b/extensions/ql-vscode/src/remote-queries/remote-queries-view.ts @@ -28,7 +28,7 @@ import { } from "./shared/remote-query-result"; import { showAndLogWarningMessage } from "../helpers"; import { URLSearchParams } from "url"; -import { SHOW_QUERY_TEXT_MSG } from "../query-history"; +import { SHOW_QUERY_TEXT_MSG } from "../query-history/query-history"; import { AnalysesResultsManager } from "./analyses-results-manager"; import { AnalysisResults } from "./shared/analysis-result"; import { humanizeUnit } from "../pure/time"; diff --git a/extensions/ql-vscode/src/remote-queries/variant-analysis-content-provider.ts b/extensions/ql-vscode/src/remote-queries/variant-analysis-content-provider.ts index 355c2b9efb8..d2d3ac75162 100644 --- a/extensions/ql-vscode/src/remote-queries/variant-analysis-content-provider.ts +++ b/extensions/ql-vscode/src/remote-queries/variant-analysis-content-provider.ts @@ -1,7 +1,7 @@ import { TextDocumentContentProvider, Uri } from "vscode"; import { URLSearchParams } from "url"; import { showAndLogWarningMessage } from "../helpers"; -import { SHOW_QUERY_TEXT_MSG } from "../query-history"; +import { SHOW_QUERY_TEXT_MSG } from "../query-history/query-history"; import { VariantAnalysisManager } from "./variant-analysis-manager"; export const createVariantAnalysisContentProvider = ( diff --git a/extensions/ql-vscode/test/factories/local-queries/local-query-history-item.ts b/extensions/ql-vscode/test/factories/query-history/local-query-history-item.ts similarity index 100% rename from extensions/ql-vscode/test/factories/local-queries/local-query-history-item.ts rename to extensions/ql-vscode/test/factories/query-history/local-query-history-item.ts diff --git a/extensions/ql-vscode/test/factories/remote-queries/remote-query-history-item.ts b/extensions/ql-vscode/test/factories/query-history/remote-query-history-item.ts similarity index 100% rename from extensions/ql-vscode/test/factories/remote-queries/remote-query-history-item.ts rename to extensions/ql-vscode/test/factories/query-history/remote-query-history-item.ts diff --git a/extensions/ql-vscode/test/factories/remote-queries/variant-analysis-history-item.ts b/extensions/ql-vscode/test/factories/query-history/variant-analysis-history-item.ts similarity index 83% rename from extensions/ql-vscode/test/factories/remote-queries/variant-analysis-history-item.ts rename to extensions/ql-vscode/test/factories/query-history/variant-analysis-history-item.ts index db8a0361a8e..35f110d6f09 100644 --- a/extensions/ql-vscode/test/factories/remote-queries/variant-analysis-history-item.ts +++ b/extensions/ql-vscode/test/factories/query-history/variant-analysis-history-item.ts @@ -1,7 +1,7 @@ -import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/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 { createMockVariantAnalysis } from "./shared/variant-analysis"; +import { createMockVariantAnalysis } from "../remote-queries/shared/variant-analysis"; export function createMockVariantAnalysisHistoryItem({ historyItemStatus = QueryStatus.InProgress, diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/history-item-label-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-item-label-provider.test.ts similarity index 95% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/history-item-label-provider.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-item-label-provider.test.ts index 5f2f4964ea5..996a23da9ae 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/history-item-label-provider.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-item-label-provider.test.ts @@ -1,9 +1,9 @@ import { env } from "vscode"; -import { QueryHistoryConfig } from "../../../src/config"; -import { HistoryItemLabelProvider } from "../../../src/history-item-label-provider"; -import { createMockLocalQueryInfo } from "../../factories/local-queries/local-query-history-item"; -import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item"; -import { QueryStatus } from "../../../src/query-status"; +import { QueryHistoryConfig } from "../../../../src/config"; +import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider"; +import { createMockLocalQueryInfo } from "../../../factories/query-history/local-query-history-item"; +import { createMockRemoteQueryHistoryItem } from "../../../factories/query-history/remote-query-history-item"; +import { QueryStatus } from "../../../../src/query-status"; describe("HistoryItemLabelProvider", () => { let labelProvider: HistoryItemLabelProvider; diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history-info.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-info.test.ts similarity index 90% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/query-history-info.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-info.test.ts index c8fe45fe6fa..e42c47af4d3 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history-info.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-info.test.ts @@ -1,20 +1,20 @@ -import { QueryStatus } from "../../../src/query-status"; +import { QueryStatus } from "../../../../src/query-status"; import { buildRepoLabel, getActionsWorkflowRunUrl, getQueryId, getQueryText, getRawQueryName, -} from "../../../src/query-history-info"; -import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item"; -import { createMockVariantAnalysis } from "../../factories/remote-queries/shared/variant-analysis"; -import { createMockScannedRepos } from "../../factories/remote-queries/shared/scanned-repositories"; -import { createMockLocalQueryInfo } from "../../factories/local-queries/local-query-history-item"; -import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item"; +} 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 { createMockLocalQueryInfo } from "../../../factories/query-history/local-query-history-item"; +import { createMockRemoteQueryHistoryItem } from "../../../factories/query-history/remote-query-history-item"; import { VariantAnalysisRepoStatus, VariantAnalysisStatus, -} from "../../../src/remote-queries/shared/variant-analysis"; +} from "../../../../src/remote-queries/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.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history.test.ts similarity index 97% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/query-history.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history.test.ts index 00986b9dc80..61e72936ce4 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history.test.ts @@ -2,50 +2,50 @@ import { readdirSync, mkdirSync, writeFileSync } from "fs-extra"; import { join } from "path"; import * as vscode from "vscode"; -import { extLogger } from "../../../src/common"; -import { registerQueryHistoryScrubber } from "../../../src/query-history-scrubber"; +import { extLogger } from "../../../../src/common"; +import { registerQueryHistoryScrubber } from "../../../../src/query-history/query-history-scrubber"; import { HistoryTreeDataProvider, QueryHistoryManager, SortOrder, -} from "../../../src/query-history"; +} from "../../../../src/query-history/query-history"; import { QueryHistoryConfig, QueryHistoryConfigListener, -} from "../../../src/config"; -import { LocalQueryInfo } from "../../../src/query-results"; -import { DatabaseManager } from "../../../src/databases"; +} from "../../../../src/config"; +import { LocalQueryInfo } from "../../../../src/query-results"; +import { DatabaseManager } from "../../../../src/databases"; import { dirSync } from "tmp-promise"; import { ONE_DAY_IN_MS, ONE_HOUR_IN_MS, THREE_HOURS_IN_MS, TWO_HOURS_IN_MS, -} from "../../../src/pure/time"; -import { tmpDir } from "../../../src/helpers"; -import { HistoryItemLabelProvider } from "../../../src/history-item-label-provider"; -import { RemoteQueriesManager } from "../../../src/remote-queries/remote-queries-manager"; -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 { QueryHistoryInfo } from "../../../src/query-history-info"; +} from "../../../../src/pure/time"; +import { tmpDir } from "../../../../src/helpers"; +import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider"; +import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager"; +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 { QueryHistoryInfo } from "../../../../src/query-history/query-history-info"; import { createMockLocalQueryInfo, createMockQueryWithResults, -} from "../../factories/local-queries/local-query-history-item"; -import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item"; -import { RemoteQueryHistoryItem } from "../../../src/remote-queries/remote-query-history-item"; -import { shuffleHistoryItems } from "../utils/query-history-helpers"; -import { createMockVariantAnalysisHistoryItem } from "../../factories/remote-queries/variant-analysis-history-item"; -import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item"; -import { QueryStatus } from "../../../src/query-status"; -import { VariantAnalysisStatus } from "../../../src/remote-queries/shared/variant-analysis"; -import * as ghActionsApiClient from "../../../src/remote-queries/gh-api/gh-actions-api-client"; -import { Credentials } from "../../../src/authentication"; +} from "../../../factories/query-history/local-query-history-item"; +import { createMockRemoteQueryHistoryItem } from "../../../factories/query-history/remote-query-history-item"; +import { RemoteQueryHistoryItem } from "../../../../src/remote-queries/remote-query-history-item"; +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 * as ghActionsApiClient from "../../../../src/remote-queries/gh-api/gh-actions-api-client"; +import { Credentials } from "../../../../src/authentication"; import { QuickPickItem, TextEditor } from "vscode"; -import { WebviewReveal } from "../../../src/interface-utils"; -import * as helpers from "../../../src/helpers"; +import { WebviewReveal } from "../../../../src/interface-utils"; +import * as helpers from "../../../../src/helpers"; describe("query-history", () => { const mockExtensionLocation = join(tmpDir.name, "mock-extension-location"); diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/remote-query-history.test.ts similarity index 99% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/remote-query-history.test.ts index 38921ccf9d9..bf8110cfdfb 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/remote-query-history.test.ts @@ -20,13 +20,13 @@ import { import { QueryHistoryConfig } from "../../../../src/config"; import { DatabaseManager } from "../../../../src/databases"; import { tmpDir, walkDirectory } from "../../../../src/helpers"; -import { QueryHistoryManager } from "../../../../src/query-history"; +import { QueryHistoryManager } from "../../../../src/query-history/query-history"; import { Credentials } from "../../../../src/authentication"; import { AnalysesResultsManager } from "../../../../src/remote-queries/analyses-results-manager"; import { RemoteQueryResult } from "../../../../src/remote-queries/shared/remote-query-result"; import { DisposableBucket } from "../../disposable-bucket"; import { testDisposeHandler } from "../../test-dispose-handler"; -import { HistoryItemLabelProvider } from "../../../../src/history-item-label-provider"; +import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider"; import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager"; import { ResultsView } from "../../../../src/interface"; import { EvalLogViewer } from "../../../../src/eval-log-viewer"; diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts similarity index 98% rename from extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts index 9d8f1bfcd62..392eee25640 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts @@ -12,10 +12,10 @@ import { commands, ExtensionContext, Uri } from "vscode"; import { QueryHistoryConfig } from "../../../../src/config"; import { DatabaseManager } from "../../../../src/databases"; import { tmpDir, walkDirectory } from "../../../../src/helpers"; -import { QueryHistoryManager } from "../../../../src/query-history"; +import { QueryHistoryManager } from "../../../../src/query-history/query-history"; import { DisposableBucket } from "../../disposable-bucket"; import { testDisposeHandler } from "../../test-dispose-handler"; -import { HistoryItemLabelProvider } from "../../../../src/history-item-label-provider"; +import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider"; import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager"; import { ResultsView } from "../../../../src/interface"; import { EvalLogViewer } from "../../../../src/eval-log-viewer"; diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-serialization.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-serialization.test.ts index f417e8e6d42..d3f341bf043 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-serialization.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-serialization.test.ts @@ -12,10 +12,10 @@ import { tmpDir } from "../../../src/helpers"; import { QueryResultType } from "../../../src/pure/legacy-messages"; import { QueryInProgress } from "../../../src/legacy-query-server/run-queries"; import { RemoteQueryHistoryItem } from "../../../src/remote-queries/remote-query-history-item"; -import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item"; -import { QueryHistoryInfo } from "../../../src/query-history-info"; -import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item"; -import { createMockVariantAnalysisHistoryItem } from "../../factories/remote-queries/variant-analysis-history-item"; +import { VariantAnalysisHistoryItem } from "../../../src/query-history/variant-analysis-history-item"; +import { QueryHistoryInfo } from "../../../src/query-history/query-history-info"; +import { createMockRemoteQueryHistoryItem } from "../../factories/query-history/remote-query-history-item"; +import { createMockVariantAnalysisHistoryItem } from "../../factories/query-history/variant-analysis-history-item"; describe("serialize and deserialize", () => { let infoSuccessRaw: LocalQueryInfo; diff --git a/extensions/ql-vscode/test/vscode-tests/utils/query-history-helpers.ts b/extensions/ql-vscode/test/vscode-tests/utils/query-history-helpers.ts index 0f4c8931ae5..74654125210 100644 --- a/extensions/ql-vscode/test/vscode-tests/utils/query-history-helpers.ts +++ b/extensions/ql-vscode/test/vscode-tests/utils/query-history-helpers.ts @@ -1,4 +1,4 @@ -import { QueryHistoryInfo } from "../../../src/query-history-info"; +import { QueryHistoryInfo } from "../../../src/query-history/query-history-info"; export function shuffleHistoryItems(history: QueryHistoryInfo[]) { return history.sort(() => Math.random() - 0.5);