move src/astViewer to src/language-support/ast-viewer/ast-viewer including test

Author: norascheuch

extensions/ql-vscode/src/common/commands.ts

@@ -1,6 +1,6 @@
 import type { CommandManager } from "../packages/commands";
 import type { Uri, Range, TextDocumentShowOptions } from "vscode";
-import type { AstItem } from "../astViewer";
+import type { AstItem } from "../language-support/ast-viewer/ast-viewer";
 import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
 import type { DatabaseItem } from "../local-databases";
 import type { QueryHistoryInfo } from "../query-history/query-history-info";

extensions/ql-vscode/src/extension.ts

@@ -21,7 +21,7 @@ import { testExplorerExtensionId, TestHub } from "vscode-test-adapter-api";
 import { lt, parse } from "semver";
 import { watch } from "chokidar";
 
-import { AstViewer } from "./astViewer";
+import { AstViewer } from "./language-support/ast-viewer/ast-viewer";
 import {
   activate as archiveFilesystemProvider_activate,
   zipArchiveScheme,

extensions/ql-vscode/src/language-support/ast-viewer/ast-cfg-commands.ts

@@ -1,6 +1,6 @@
 import { Uri, window } from "vscode";
 import { withProgress } from "../../progress";
-import { AstViewer } from "../../astViewer";
+import { AstViewer } from "./ast-viewer";
 import { TemplatePrintAstProvider, TemplatePrintCfgProvider } from "..";
 import { AstCfgCommands } from "../../common/commands";
 import { LocalQueries } from "../../local-queries";

extensions/ql-vscode/src/astViewer.ts …anguage-support/ast-viewer/ast-viewer.tsextensions/ql-vscode/src/astViewer.ts renamed to extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts extensions/ql-vscode/src/astViewer.ts renamed to extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts

@@ -15,19 +15,19 @@ import {
 } from "vscode";
 import { basename } from "path";
 
-import { DatabaseItem } from "./local-databases";
-import { UrlValue, BqrsId } from "./pure/bqrs-cli-types";
-import { showLocation } from "./interface-utils";
+import { DatabaseItem } from "../../local-databases";
+import { UrlValue, BqrsId } from "../../pure/bqrs-cli-types";
+import { showLocation } from "../../interface-utils";
 import {
   isStringLoc,
   isWholeFileLoc,
   isLineColumnLoc,
-} from "./pure/bqrs-utils";
-import { DisposableObject } from "./pure/disposable-object";
-import { showAndLogExceptionWithTelemetry } from "./helpers";
-import { asError, getErrorMessage } from "./pure/helpers-pure";
-import { redactableError } from "./pure/errors";
-import { AstViewerCommands } from "./common/commands";
+} from "../../pure/bqrs-utils";
+import { DisposableObject } from "../../pure/disposable-object";
+import { showAndLogExceptionWithTelemetry } from "../../helpers";
+import { asError, getErrorMessage } from "../../pure/helpers-pure";
+import { redactableError } from "../../pure/errors";
+import { AstViewerCommands } from "../../common/commands";
 
 export interface AstItem {
   id: BqrsId;

extensions/ql-vscode/src/language-support/contextual/ast-builder.ts

@@ -5,7 +5,7 @@ import {
   EntityValue,
 } from "../../pure/bqrs-cli-types";
 import { DatabaseItem } from "../../local-databases";
-import { ChildAstItem, AstItem } from "../../astViewer";
+import { ChildAstItem, AstItem } from "../ast-viewer/ast-viewer";
 import { Uri } from "vscode";
 import { QueryOutputDir } from "../../run-queries-shared";
 import { fileRangeFromURI } from ".";

…ode-tests/no-workspace/astViewer.test.ts …ge-support/ast-viewer/ast-viewer.test.tsextensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts renamed to extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/ast-viewer/ast-viewer.test.ts extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts renamed to extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/ast-viewer/ast-viewer.test.ts

@@ -1,10 +1,13 @@
 import { readFile } from "fs-extra";
 import { load } from "js-yaml";
 
-import { AstViewer, AstItem } from "../../../src/astViewer";
+import {
+  AstViewer,
+  AstItem,
+} from "../../../../../src/language-support/ast-viewer/ast-viewer";
 import { commands, Range, Uri } from "vscode";
-import { testDisposeHandler } from "../test-dispose-handler";
-import { mockDatabaseItem } from "../utils/mocking.helpers";
+import { testDisposeHandler } from "../../../test-dispose-handler";
+import { mockDatabaseItem } from "../../../utils/mocking.helpers";
 
 describe("AstViewer", () => {
   let astRoots: AstItem[];