Skip to content

Commit 407aa14

Browse files
norascheuchnorascheuch
authored
Merge pull request #2002 from github/elena-nora/move-query-history-files
Move query history files to new folders
2 parents d6ab229 + 76a35de commit 407aa14

23 files changed

+103
-102
lines changed

‎extensions/ql-vscode/src/compare/compare-view.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
import resultsDiff from "./resultsDiff";
1818
import { CompletedLocalQueryInfo } from "../query-results";
1919
import { assertNever, getErrorMessage } from "../pure/helpers-pure";
20-
import { HistoryItemLabelProvider } from "../history-item-label-provider";
20+
import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider";
2121
import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview";
2222
import { telemetryListener } from "../telemetry";
2323

‎extensions/ql-vscode/src/extension.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ import {
8383
ProgressReporter,
8484
queryServerLogger,
8585
} from "./common";
86-
import { QueryHistoryManager } from "./query-history";
86+
import { QueryHistoryManager } from "./query-history/query-history";
8787
import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results";
8888
import { QueryServerClient as LegacyQueryServerClient } from "./legacy-query-server/queryserver-client";
8989
import { QueryServerClient } from "./query-server/queryserver-client";
@@ -110,7 +110,7 @@ import {
110110
handleDownloadPacks,
111111
handleInstallPackDependencies,
112112
} from "./packaging";
113-
import { HistoryItemLabelProvider } from "./history-item-label-provider";
113+
import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
114114
import {
115115
exportRemoteQueryResults,
116116
exportSelectedRemoteQueryResults,

‎extensions/ql-vscode/src/interface.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import {
6464
} from "./pure/bqrs-cli-types";
6565
import { AbstractWebview, WebviewPanelConfig } from "./abstract-webview";
6666
import { PAGE_SIZE } from "./config";
67-
import { HistoryItemLabelProvider } from "./history-item-label-provider";
67+
import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
6868
import { telemetryListener } from "./telemetry";
6969

7070
/**

‎extensions/ql-vscode/src/log-insights/log-scanner-service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Diagnostic, DiagnosticSeverity, languages, Range, Uri } from "vscode";
22
import { DisposableObject } from "../pure/disposable-object";
3-
import { QueryHistoryManager } from "../query-history";
4-
import { QueryHistoryInfo } from "../query-history-info";
3+
import { QueryHistoryManager } from "../query-history/query-history";
4+
import { QueryHistoryInfo } from "../query-history/query-history-info";
55
import {
66
EvaluationLogProblemReporter,
77
EvaluationLogScannerSet,

extensions/ql-vscode/src/history-item-label-provider.ts renamed to extensions/ql-vscode/src/query-history/history-item-label-provider.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { env } from "vscode";
22
import { basename } from "path";
3-
import { QueryHistoryConfig } from "./config";
4-
import { LocalQueryInfo } from "./query-results";
3+
import { QueryHistoryConfig } from "../config";
4+
import { LocalQueryInfo } from "../query-results";
55
import {
66
buildRepoLabel,
77
getRawQueryName,
88
QueryHistoryInfo,
99
} from "./query-history-info";
10-
import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item";
11-
import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item";
12-
import { assertNever } from "./pure/helpers-pure";
13-
import { pluralize } from "./pure/word";
14-
import { humanizeQueryStatus } from "./query-status";
10+
import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item";
11+
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
12+
import { assertNever } from "../pure/helpers-pure";
13+
import { pluralize } from "../pure/word";
14+
import { humanizeQueryStatus } from "../query-status";
1515

1616
interface InterpolateReplacements {
1717
t: string; // Start time

extensions/ql-vscode/src/query-history-info.ts renamed to extensions/ql-vscode/src/query-history/query-history-info.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item";
2-
import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item";
3-
import { LocalQueryInfo } from "./query-results";
4-
import { assertNever } from "./pure/helpers-pure";
5-
import { pluralize } from "./pure/word";
1+
import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item";
2+
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
3+
import { LocalQueryInfo } from "../query-results";
4+
import { assertNever } from "../pure/helpers-pure";
5+
import { pluralize } from "../pure/word";
66
import {
77
hasRepoScanCompleted,
88
getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl,
9-
} from "./remote-queries/shared/variant-analysis";
9+
} from "../remote-queries/shared/variant-analysis";
1010

1111
export type QueryHistoryInfo =
1212
| LocalQueryInfo

extensions/ql-vscode/src/query-history-scrubber.ts renamed to extensions/ql-vscode/src/query-history/query-history-scrubber.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { pathExists, readdir, stat, remove, readFile } from "fs-extra";
22
import { EOL } from "os";
33
import { join } from "path";
44
import { Disposable, ExtensionContext } from "vscode";
5-
import { extLogger } from "./common";
5+
import { extLogger } from "../common";
66
import { QueryHistoryManager } from "./query-history";
77

88
const LAST_SCRUB_TIME_KEY = "lastScrubTime";

extensions/ql-vscode/src/query-history.ts renamed to extensions/ql-vscode/src/query-history/query-history.ts

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,58 +17,58 @@ import {
1717
window,
1818
workspace,
1919
} from "vscode";
20-
import { QueryHistoryConfig } from "./config";
20+
import { QueryHistoryConfig } from "../config";
2121
import {
2222
showAndLogErrorMessage,
2323
showAndLogInformationMessage,
2424
showAndLogWarningMessage,
2525
showBinaryChoiceDialog,
2626
showInformationMessageWithAction,
27-
} from "./helpers";
28-
import { extLogger } from "./common";
27+
} from "../helpers";
28+
import { extLogger } from "../common";
2929
import { URLSearchParams } from "url";
30-
import { DisposableObject } from "./pure/disposable-object";
31-
import { commandRunner } from "./commandRunner";
32-
import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "./pure/time";
30+
import { DisposableObject } from "../pure/disposable-object";
31+
import { commandRunner } from "../commandRunner";
32+
import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "../pure/time";
3333
import {
3434
assertNever,
3535
getErrorMessage,
3636
getErrorStack,
37-
} from "./pure/helpers-pure";
38-
import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results";
37+
} from "../pure/helpers-pure";
38+
import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
3939
import {
4040
getActionsWorkflowRunUrl,
4141
getQueryId,
4242
getQueryText,
4343
QueryHistoryInfo,
4444
} from "./query-history-info";
45-
import { DatabaseManager } from "./databases";
45+
import { DatabaseManager } from "../databases";
4646
import { registerQueryHistoryScrubber } from "./query-history-scrubber";
4747
import {
4848
QueryStatus,
4949
variantAnalysisStatusToQueryStatus,
50-
} from "./query-status";
50+
} from "../query-status";
5151
import {
5252
deserializeQueryHistory,
5353
serializeQueryHistory,
54-
} from "./query-serialization";
54+
} from "../query-serialization";
5555
import { pathExists } from "fs-extra";
56-
import { CliVersionConstraint } from "./cli";
56+
import { CliVersionConstraint } from "../cli";
5757
import { HistoryItemLabelProvider } from "./history-item-label-provider";
58-
import { Credentials } from "./authentication";
59-
import { cancelRemoteQuery } from "./remote-queries/gh-api/gh-actions-api-client";
60-
import { RemoteQueriesManager } from "./remote-queries/remote-queries-manager";
61-
import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item";
62-
import { ResultsView } from "./interface";
63-
import { WebviewReveal } from "./interface-utils";
64-
import { EvalLogViewer } from "./eval-log-viewer";
65-
import EvalLogTreeBuilder from "./eval-log-tree-builder";
66-
import { EvalLogData, parseViewerData } from "./pure/log-summary-parser";
67-
import { QueryWithResults } from "./run-queries-shared";
68-
import { QueryRunner } from "./queryRunner";
69-
import { VariantAnalysisManager } from "./remote-queries/variant-analysis-manager";
70-
import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item";
71-
import { getTotalResultCount } from "./remote-queries/shared/variant-analysis";
58+
import { Credentials } from "../authentication";
59+
import { cancelRemoteQuery } from "../remote-queries/gh-api/gh-actions-api-client";
60+
import { RemoteQueriesManager } from "../remote-queries/remote-queries-manager";
61+
import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item";
62+
import { ResultsView } from "../interface";
63+
import { WebviewReveal } from "../interface-utils";
64+
import { EvalLogViewer } from "../eval-log-viewer";
65+
import EvalLogTreeBuilder from "../eval-log-tree-builder";
66+
import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
67+
import { QueryWithResults } from "../run-queries-shared";
68+
import { QueryRunner } from "../queryRunner";
69+
import { VariantAnalysisManager } from "../remote-queries/variant-analysis-manager";
70+
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
71+
import { getTotalResultCount } from "../remote-queries/shared/variant-analysis";
7272

7373
/**
7474
* query-history.ts
@@ -1705,6 +1705,7 @@ the file in the file explorer and dragging it into the workspace.`,
17051705
throw new Error("No other queries available to compare with.");
17061706
}
17071707
const choice = await window.showQuickPick(comparableQueryLabels);
1708+
17081709
return choice?.query;
17091710
}
17101711

extensions/ql-vscode/src/remote-queries/variant-analysis-history-item.ts renamed to extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { QueryStatus } from "../query-status";
2-
import { VariantAnalysis } from "./shared/variant-analysis";
2+
import { VariantAnalysis } from "../remote-queries/shared/variant-analysis";
33

44
/**
55
* Information about a variant analysis.

‎extensions/ql-vscode/src/query-serialization.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
getErrorStack,
99
} from "./pure/helpers-pure";
1010
import { CompletedQueryInfo, LocalQueryInfo } from "./query-results";
11-
import { QueryHistoryInfo } from "./query-history-info";
11+
import { QueryHistoryInfo } from "./query-history/query-history-info";
1212
import { QueryStatus } from "./query-status";
1313
import { QueryEvaluationInfo } from "./run-queries-shared";
1414
import { QueryResultType } from "./pure/legacy-messages";

0 commit comments

Comments
 (0)