Merge pull request #2503 from github/koesie10/move-interface

Move interface.ts to local-queries/results-view.ts

Author: koesie10

extensions/ql-vscode/src/extension.ts

@@ -72,8 +72,8 @@ import {
   getErrorMessage,
   getErrorStack,
 } from "./pure/helpers-pure";
-import { ResultsView } from "./interface";
 import {
+  ResultsView,
   WebviewReveal,
   LocalQueries,
   QuickEvalCodeLensProvider,

extensions/ql-vscode/src/local-queries/index.ts

@@ -2,4 +2,5 @@ export * from "./local-queries";
 export * from "./local-query-run";
 export * from "./quick-eval-code-lens-provider";
 export * from "./quick-query";
+export * from "./results-view";
 export { WebviewReveal } from "./webview";

extensions/ql-vscode/src/local-queries/local-queries.ts

@@ -28,7 +28,7 @@ import { displayQuickQuery } from "./quick-query";
 import { CoreCompletedQuery, QueryRunner } from "../query-server";
 import { QueryHistoryManager } from "../query-history/query-history-manager";
 import { DatabaseUI } from "../databases/local-databases-ui";
-import { ResultsView } from "../interface";
+import { ResultsView } from "./results-view";
 import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
 import {
   createInitialQueryInfo,

extensions/ql-vscode/src/interface.ts …vscode/src/local-queries/results-view.tsextensions/ql-vscode/src/interface.ts renamed to extensions/ql-vscode/src/local-queries/results-view.ts extensions/ql-vscode/src/interface.ts renamed to extensions/ql-vscode/src/local-queries/results-view.ts

@@ -10,20 +10,20 @@ import {
   env,
   WebviewPanel,
 } from "vscode";
-import * as cli from "./codeql-cli/cli";
-import { CodeQLCliServer } from "./codeql-cli/cli";
+import * as cli from "../codeql-cli/cli";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import {
   DatabaseEventKind,
   DatabaseItem,
   DatabaseManager,
-} from "./databases/local-databases";
-import { showAndLogExceptionWithTelemetry } from "./helpers";
+} from "../databases/local-databases";
+import { showAndLogExceptionWithTelemetry } from "../helpers";
 import {
   asError,
   assertNever,
   getErrorMessage,
   getErrorStack,
-} from "./pure/helpers-pure";
+} from "../pure/helpers-pure";
 import {
   FromResultsViewMsg,
   Interpretation,
@@ -40,43 +40,43 @@ import {
   NavigationDirection,
   getDefaultResultSetName,
   ParsedResultSets,
-} from "./pure/interface-types";
-import { Logger } from "./common";
+} from "../pure/interface-types";
+import { Logger } from "../common";
 import {
   CompletedQueryInfo,
   interpretResultsSarif,
   interpretGraphResults,
   CompletedLocalQueryInfo,
-} from "./query-results";
-import { QueryEvaluationInfo } from "./run-queries-shared";
+} from "../query-results";
+import { QueryEvaluationInfo } from "../run-queries-shared";
 import {
   parseSarifLocation,
   parseSarifPlainTextMessage,
-} from "./pure/sarif-utils";
-import { WebviewReveal, fileUriToWebviewUri } from "./local-queries/webview";
+} from "../pure/sarif-utils";
+import { WebviewReveal, fileUriToWebviewUri } from "./webview";
 import {
   tryResolveLocation,
   shownLocationDecoration,
   shownLocationLineDecoration,
   jumpToLocation,
-} from "./databases/local-databases/locations";
+} from "../databases/local-databases/locations";
 import {
   RawResultSet,
   transformBqrsResultSet,
   ResultSetSchema,
-} from "./pure/bqrs-cli-types";
+} from "../pure/bqrs-cli-types";
 import {
   AbstractWebview,
   WebviewPanelConfig,
-} from "./common/vscode/abstract-webview";
-import { isCanary, PAGE_SIZE } from "./config";
-import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
-import { telemetryListener } from "./telemetry";
-import { redactableError } from "./pure/errors";
-import { ResultsViewCommands } from "./common/commands";
+} from "../common/vscode/abstract-webview";
+import { isCanary, PAGE_SIZE } from "../config";
+import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider";
+import { telemetryListener } from "../telemetry";
+import { redactableError } from "../pure/errors";
+import { ResultsViewCommands } from "../common/commands";
 
 /**
- * interface.ts
+ * results-view.ts
  * ------------
  *
  * Displaying query results and linking back to source files when the

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -42,8 +42,7 @@ import { readQueryHistoryFromFile, writeQueryHistoryToFile } from "./store";
 import { pathExists } from "fs-extra";
 import { CliVersionConstraint } from "../codeql-cli/cli";
 import { HistoryItemLabelProvider } from "./history-item-label-provider";
-import { ResultsView } from "../interface";
-import { WebviewReveal } from "../local-queries";
+import { ResultsView, WebviewReveal } from "../local-queries";
 import { EvalLogTreeBuilder, EvalLogViewer } from "../query-evaluation-logging";
 import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
 import { QueryWithResults } from "../run-queries-shared";

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

@@ -7,7 +7,7 @@ import { LocalQueryInfo } from "../../../../src/query-results";
 import { DatabaseManager } from "../../../../src/databases/local-databases";
 import { tmpDir } from "../../../../src/helpers";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
-import { ResultsView } from "../../../../src/interface";
+import { ResultsView } from "../../../../src/local-queries";
 import { EvalLogViewer } from "../../../../src/query-evaluation-logging";
 import { QueryRunner } from "../../../../src/query-server/query-runner";
 import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";

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

@@ -8,7 +8,7 @@ import { LocalQueryInfo } from "../../../../src/query-results";
 import { DatabaseManager } from "../../../../src/databases/local-databases";
 import { tmpDir } from "../../../../src/helpers";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
-import { ResultsView } from "../../../../src/interface";
+import { ResultsView, WebviewReveal } from "../../../../src/local-queries";
 import { EvalLogViewer } from "../../../../src/query-evaluation-logging";
 import { QueryRunner } from "../../../../src/query-server/query-runner";
 import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
@@ -22,7 +22,6 @@ import { createMockVariantAnalysisHistoryItem } from "../../../factories/query-h
 import { VariantAnalysisHistoryItem } from "../../../../src/query-history/variant-analysis-history-item";
 import { QueryStatus } from "../../../../src/query-status";
 import { VariantAnalysisStatus } from "../../../../src/variant-analysis/shared/variant-analysis";
-import { WebviewReveal } from "../../../../src/local-queries";
 import * as helpers from "../../../../src/helpers";
 import { mockedQuickPickItem } from "../../utils/mocking.helpers";
 import { createMockQueryHistoryDirs } from "../../../factories/query-history/query-history-dirs";

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts

@@ -14,7 +14,7 @@ import { tmpDir, walkDirectory } from "../../../../src/helpers";
 import { DisposableBucket } from "../../disposable-bucket";
 import { testDisposeHandler } from "../../test-dispose-handler";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
-import { ResultsView } from "../../../../src/interface";
+import { ResultsView } from "../../../../src/local-queries";
 import { EvalLogViewer } from "../../../../src/query-evaluation-logging";
 import { QueryRunner } from "../../../../src/query-server/query-runner";
 import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";