improve imports

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 "../language-support/ast-viewer/ast-viewer";
+import type { AstItem } from "../language-support";
 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

@@ -20,8 +20,6 @@ import { dirSync } from "tmp-promise";
 import { testExplorerExtensionId, TestHub } from "vscode-test-adapter-api";
 import { lt, parse } from "semver";
 import { watch } from "chokidar";
-
-import { AstViewer } from "./language-support/ast-viewer/ast-viewer";
 import {
   activate as archiveFilesystemProvider_activate,
   zipArchiveScheme,
@@ -36,6 +34,7 @@ import {
   QueryServerConfigListener,
 } from "./config";
 import {
+  AstViewer,
   install,
   spawnIdeServer,
   getQueryEditorCommands,

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

@@ -8,7 +8,7 @@ import { DatabaseItem } from "../../local-databases";
 import { ChildAstItem, AstItem } from "./ast-viewer";
 import { Uri } from "vscode";
 import { QueryOutputDir } from "../../run-queries-shared";
-import { fileRangeFromURI } from "../contextual";
+import { fileRangeFromURI } from "../contextual/file-range-from-uri";
 
 /**
  * A class that wraps a tree of QL results from a query that

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

@@ -1,9 +1,12 @@
 import { Uri, window } from "vscode";
 import { withProgress } from "../../progress";
 import { AstViewer } from "./ast-viewer";
-import { TemplatePrintAstProvider, TemplatePrintCfgProvider } from "..";
 import { AstCfgCommands } from "../../common/commands";
 import { LocalQueries } from "../../local-queries";
+import {
+  TemplatePrintAstProvider,
+  TemplatePrintCfgProvider,
+} from "../contextual/template-provider";
 
 type AstCfgOptions = {
   localQueries: LocalQueries;

extensions/ql-vscode/src/language-support/contextual/index.ts

@@ -1,6 +0,0 @@
-export * from "../ast-viewer/ast-builder";
-export * from "./file-range-from-uri";
-export * from "./key-type";
-export * from "./location-finder";
-export * from "./query-resolver";
-export * from "./template-provider";

extensions/ql-vscode/src/language-support/contextual/location-finder.ts

@@ -21,7 +21,7 @@ import { CancellationToken, LocationLink, Uri } from "vscode";
 import { QueryOutputDir } from "../../run-queries-shared";
 import { QueryRunner } from "../../query-server";
 import { QueryResultType } from "../../pure/new-messages";
-import { fileRangeFromURI } from ".";
+import { fileRangeFromURI } from "./file-range-from-uri";
 
 export const SELECT_QUERY_NAME = "#select";
 export const TEMPLATE_NAME = "selectedSourceFile";

extensions/ql-vscode/src/language-support/contextual/template-provider.ts

@@ -32,7 +32,7 @@ import {
 } from "./query-resolver";
 import { isCanary, NO_CACHE_AST_VIEWER } from "../../config";
 import { CoreCompletedQuery, QueryRunner } from "../../query-server";
-import { AstBuilder } from ".";
+import { AstBuilder } from "../ast-viewer/ast-builder";
 
 /**
  * Runs templated CodeQL queries to find definitions in

extensions/ql-vscode/src/language-support/index.ts

@@ -1,4 +1,10 @@
-export * from "./contextual";
+export * from "./ast-viewer/ast-builder";
+export * from "./ast-viewer/ast-viewer";
+export * from "./contextual/file-range-from-uri";
+export * from "./contextual/key-type";
+export * from "./contextual/location-finder";
+export * from "./contextual/query-resolver";
+export * from "./contextual/template-provider";
 export * from "./ide-server";
 export * from "./language-support";
 export * from "./query-editor";

extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/ast-viewer/ast-viewer.test.ts

@@ -1,10 +1,7 @@
 import { readFile } from "fs-extra";
 import { load } from "js-yaml";
 
-import {
-  AstViewer,
-  AstItem,
-} from "../../../../../src/language-support/ast-viewer/ast-viewer";
+import { AstViewer, AstItem } from "../../../../../src/language-support";
 import { commands, Range, Uri } from "vscode";
 import { testDisposeHandler } from "../../../test-dispose-handler";
 import { mockDatabaseItem } from "../../../utils/mocking.helpers";