create index.ts and adjust imports and exports

Author: norascheuch

extensions/ql-vscode/src/ast-cfg-commands.ts

@@ -4,7 +4,7 @@ import { AstViewer } from "./astViewer";
 import {
   TemplatePrintAstProvider,
   TemplatePrintCfgProvider,
-} from "./language-support/contextual/template-provider";
+} from "./language-support";
 import { AstCfgCommands } from "./common/commands";
 import { LocalQueries } from "./local-queries";
 

extensions/ql-vscode/src/extension.ts

@@ -39,15 +39,13 @@ import {
   install,
   spawnIdeServer,
   getQueryEditorCommands,
-} from "./language-support";
-import { DatabaseManager } from "./local-databases";
-import { DatabaseUI } from "./local-databases-ui";
-import {
   TemplatePrintAstProvider,
   TemplatePrintCfgProvider,
   TemplateQueryDefinitionProvider,
   TemplateQueryReferenceProvider,
-} from "./language-support/contextual/template-provider";
+} from "./language-support";
+import { DatabaseManager } from "./local-databases";
+import { DatabaseUI } from "./local-databases-ui";
 import {
   DEFAULT_DISTRIBUTION_VERSION_RANGE,
   DistributionKind,

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

@@ -6,15 +6,15 @@ import {
 } from "../../pure/bqrs-cli-types";
 import { DatabaseItem } from "../../local-databases";
 import { ChildAstItem, AstItem } from "../../astViewer";
-import fileRangeFromURI from "./file-range-from-uri";
 import { Uri } from "vscode";
 import { QueryOutputDir } from "../../run-queries-shared";
+import { fileRangeFromURI } from ".";
 
 /**
  * A class that wraps a tree of QL results from a query that
  * has an @kind of graph
  */
-export default class AstBuilder {
+export class AstBuilder {
   private roots: AstItem[] | undefined;
   private bqrsPath: string;
   constructor(

extensions/ql-vscode/src/language-support/contextual/file-range-from-uri.ts

@@ -4,7 +4,7 @@ import { UrlValue, LineColumnLocation } from "../../pure/bqrs-cli-types";
 import { isEmptyPath } from "../../pure/bqrs-utils";
 import { DatabaseItem } from "../../local-databases";
 
-export default function fileRangeFromURI(
+export function fileRangeFromURI(
   uri: UrlValue | undefined,
   db: DatabaseItem,
 ): vscode.Location | undefined {

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

@@ -0,0 +1,6 @@
+export * from "./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

@@ -10,7 +10,6 @@ import {
 } from "../../pure/bqrs-cli-types";
 import { CodeQLCliServer } from "../../cli";
 import { DatabaseManager, DatabaseItem } from "../../local-databases";
-import fileRangeFromURI from "./file-range-from-uri";
 import { ProgressCallback } from "../../progress";
 import { KeyType } from "./key-type";
 import {
@@ -22,6 +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 ".";
 
 export const SELECT_QUERY_NAME = "#select";
 export const TEMPLATE_NAME = "selectedSourceFile";

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

@@ -19,7 +19,6 @@ import { CodeQLCliServer } from "../../cli";
 import { DatabaseManager } from "../../local-databases";
 import { CachedOperation } from "../../helpers";
 import { ProgressCallback, withProgress } from "../../progress";
-import AstBuilder from "./ast-builder";
 import { KeyType } from "./key-type";
 import {
   FullLocationLink,
@@ -33,6 +32,7 @@ import {
 } from "./query-resolver";
 import { isCanary, NO_CACHE_AST_VIEWER } from "../../config";
 import { CoreCompletedQuery, QueryRunner } from "../../query-server";
+import { AstBuilder } from ".";
 
 /**
  * Runs templated CodeQL queries to find definitions in

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

@@ -1,3 +1,4 @@
+export * from "./contextual";
 export * from "./ide-server";
 export * from "./language-support";
 export * from "./query-editor";

extensions/ql-vscode/src/run-queries-shared.ts

@@ -24,7 +24,7 @@ import { ensureMetadataIsComplete, InitialQueryInfo } from "./query-results";
 import { isQuickQueryPath } from "./local-queries";
 import { nanoid } from "nanoid";
 import { CodeQLCliServer } from "./cli";
-import { SELECT_QUERY_NAME } from "./language-support/contextual/location-finder";
+import { SELECT_QUERY_NAME } from "./language-support";
 import { DatabaseManager } from "./local-databases";
 import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types";
 import { BaseLogger, extLogger } from "./common";

extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts

@@ -21,7 +21,7 @@ import {
   CoreCompletedQuery,
   QueryRunner,
 } from "../../../src/query-server/query-runner";
-import { SELECT_QUERY_NAME } from "../../../src/language-support/contextual/location-finder";
+import { SELECT_QUERY_NAME } from "../../../src/language-support";
 import { LocalQueries } from "../../../src/local-queries";
 import { QueryResultType } from "../../../src/pure/new-messages";
 import { createVSCodeCommandManager } from "../../../src/common/vscode/commands";