Skip to content

Commit 77fbaea

Browse files
norascheuchnorascheuch
authored
Merge pull request #2368 from github/nora/move-files-misc1
Move contextual and ast-viewer files into language-support
2 parents 3b53c5a + b6b3d3b commit 77fbaea

21 files changed

Lines changed: 108 additions & 90 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { CommandManager } from "../packages/commands";
22
import type { Uri, Range, TextDocumentShowOptions } from "vscode";
3-
import type { AstItem } from "../astViewer";
3+
import type { AstItem } from "../language-support";
44
import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
55
import type { DatabaseItem } from "../local-databases";
66
import type { QueryHistoryInfo } from "../query-history/query-history-info";

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import { dirSync } from "tmp-promise";
2020
import { testExplorerExtensionId, TestHub } from "vscode-test-adapter-api";
2121
import { lt, parse } from "semver";
2222
import { watch } from "chokidar";
23-
24-
import { AstViewer } from "./astViewer";
2523
import {
2624
activate as archiveFilesystemProvider_activate,
2725
zipArchiveScheme,
@@ -36,18 +34,17 @@ import {
3634
QueryServerConfigListener,
3735
} from "./config";
3836
import {
37+
AstViewer,
3938
install,
4039
spawnIdeServer,
4140
getQueryEditorCommands,
42-
} from "./language-support";
43-
import { DatabaseManager } from "./local-databases";
44-
import { DatabaseUI } from "./local-databases-ui";
45-
import {
4641
TemplatePrintAstProvider,
4742
TemplatePrintCfgProvider,
4843
TemplateQueryDefinitionProvider,
4944
TemplateQueryReferenceProvider,
50-
} from "./contextual/templateProvider";
45+
} from "./language-support";
46+
import { DatabaseManager } from "./local-databases";
47+
import { DatabaseUI } from "./local-databases-ui";
5148
import {
5249
DEFAULT_DISTRIBUTION_VERSION_RANGE,
5350
DistributionKind,
@@ -119,7 +116,7 @@ import {
119116
QueryServerCommands,
120117
} from "./common/commands";
121118
import { LocalQueries, QuickEvalCodeLensProvider } from "./local-queries";
122-
import { getAstCfgCommands } from "./ast-cfg-commands";
119+
import { getAstCfgCommands } from "./language-support/ast-viewer/ast-cfg-commands";
123120
import { App } from "./common/app";
124121
import { registerCommandWithErrorHandling } from "./common/vscode/commands";
125122
import { DebuggerUI } from "./debugger/debugger-ui";

extensions/ql-vscode/src/contextual/astBuilder.ts renamed to extensions/ql-vscode/src/language-support/ast-viewer/ast-builder.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
import { CodeQLCliServer } from "../cli";
2-
import { DecodedBqrsChunk, BqrsId, EntityValue } from "../pure/bqrs-cli-types";
3-
import { DatabaseItem } from "../local-databases";
4-
import { ChildAstItem, AstItem } from "../astViewer";
5-
import fileRangeFromURI from "./fileRangeFromURI";
1+
import { CodeQLCliServer } from "../../cli";
2+
import {
3+
DecodedBqrsChunk,
4+
BqrsId,
5+
EntityValue,
6+
} from "../../pure/bqrs-cli-types";
7+
import { DatabaseItem } from "../../local-databases";
8+
import { ChildAstItem, AstItem } from "./ast-viewer";
69
import { Uri } from "vscode";
7-
import { QueryOutputDir } from "../run-queries-shared";
10+
import { QueryOutputDir } from "../../run-queries-shared";
11+
import { fileRangeFromURI } from "../contextual/file-range-from-uri";
812

913
/**
1014
* A class that wraps a tree of QL results from a query that
1115
* has an @kind of graph
1216
*/
13-
export default class AstBuilder {
17+
export class AstBuilder {
1418
private roots: AstItem[] | undefined;
1519
private bqrsPath: string;
1620
constructor(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Uri, window } from "vscode";
2-
import { withProgress } from "./progress";
3-
import { AstViewer } from "./astViewer";
2+
import { withProgress } from "../../progress";
3+
import { AstViewer } from "./ast-viewer";
4+
import { AstCfgCommands } from "../../common/commands";
5+
import { LocalQueries } from "../../local-queries";
46
import {
57
TemplatePrintAstProvider,
68
TemplatePrintCfgProvider,
7-
} from "./contextual/templateProvider";
8-
import { AstCfgCommands } from "./common/commands";
9-
import { LocalQueries } from "./local-queries";
9+
} from "../contextual/template-provider";
1010

1111
type AstCfgOptions = {
1212
localQueries: LocalQueries;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ import {
1515
} from "vscode";
1616
import { basename } from "path";
1717

18-
import { DatabaseItem } from "./local-databases";
19-
import { UrlValue, BqrsId } from "./pure/bqrs-cli-types";
20-
import { showLocation } from "./interface-utils";
18+
import { DatabaseItem } from "../../local-databases";
19+
import { UrlValue, BqrsId } from "../../pure/bqrs-cli-types";
20+
import { showLocation } from "../../interface-utils";
2121
import {
2222
isStringLoc,
2323
isWholeFileLoc,
2424
isLineColumnLoc,
25-
} from "./pure/bqrs-utils";
26-
import { DisposableObject } from "./pure/disposable-object";
27-
import { showAndLogExceptionWithTelemetry } from "./helpers";
28-
import { asError, getErrorMessage } from "./pure/helpers-pure";
29-
import { redactableError } from "./pure/errors";
30-
import { AstViewerCommands } from "./common/commands";
25+
} from "../../pure/bqrs-utils";
26+
import { DisposableObject } from "../../pure/disposable-object";
27+
import { showAndLogExceptionWithTelemetry } from "../../helpers";
28+
import { asError, getErrorMessage } from "../../pure/helpers-pure";
29+
import { redactableError } from "../../pure/errors";
30+
import { AstViewerCommands } from "../../common/commands";
3131

3232
export interface AstItem {
3333
id: BqrsId;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as vscode from "vscode";
22

3-
import { UrlValue, LineColumnLocation } from "../pure/bqrs-cli-types";
4-
import { isEmptyPath } from "../pure/bqrs-utils";
5-
import { DatabaseItem } from "../local-databases";
3+
import { UrlValue, LineColumnLocation } from "../../pure/bqrs-cli-types";
4+
import { isEmptyPath } from "../../pure/bqrs-utils";
5+
import { DatabaseItem } from "../../local-databases";
66

7-
export default function fileRangeFromURI(
7+
export function fileRangeFromURI(
88
uri: UrlValue | undefined,
99
db: DatabaseItem,
1010
): vscode.Location | undefined {

extensions/ql-vscode/src/contextual/keyType.ts renamed to extensions/ql-vscode/src/language-support/contextual/key-type.ts

File renamed without changes.

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import {
22
decodeSourceArchiveUri,
33
encodeArchiveBasePath,
4-
} from "../archive-filesystem-provider";
4+
} from "../../archive-filesystem-provider";
55
import {
66
ColumnKindCode,
77
EntityValue,
88
getResultSetSchema,
99
ResultSetSchema,
10-
} from "../pure/bqrs-cli-types";
11-
import { CodeQLCliServer } from "../cli";
12-
import { DatabaseManager, DatabaseItem } from "../local-databases";
13-
import fileRangeFromURI from "./fileRangeFromURI";
14-
import { ProgressCallback } from "../progress";
15-
import { KeyType } from "./keyType";
10+
} from "../../pure/bqrs-cli-types";
11+
import { CodeQLCliServer } from "../../cli";
12+
import { DatabaseManager, DatabaseItem } from "../../local-databases";
13+
import { ProgressCallback } from "../../progress";
14+
import { KeyType } from "./key-type";
1615
import {
1716
qlpackOfDatabase,
1817
resolveQueries,
1918
runContextualQuery,
20-
} from "./queryResolver";
19+
} from "./query-resolver";
2120
import { CancellationToken, LocationLink, Uri } from "vscode";
22-
import { QueryOutputDir } from "../run-queries-shared";
23-
import { QueryRunner } from "../query-server";
24-
import { QueryResultType } from "../pure/new-messages";
21+
import { QueryOutputDir } from "../../run-queries-shared";
22+
import { QueryRunner } from "../../query-server";
23+
import { QueryResultType } from "../../pure/new-messages";
24+
import { fileRangeFromURI } from "./file-range-from-uri";
2525

2626
export const SELECT_QUERY_NAME = "#select";
2727
export const TEMPLATE_NAME = "selectedSourceFile";

extensions/ql-vscode/src/contextual/queryResolver.ts renamed to extensions/ql-vscode/src/language-support/contextual/query-resolver.ts

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,21 @@ import {
99
getOnDiskWorkspaceFolders,
1010
QlPacksForLanguage,
1111
showAndLogExceptionWithTelemetry,
12-
} from "../helpers";
13-
import { KeyType, kindOfKeyType, nameOfKeyType, tagOfKeyType } from "./keyType";
14-
import { CodeQLCliServer } from "../cli";
15-
import { DatabaseItem } from "../local-databases";
16-
import { extLogger, TeeLogger } from "../common";
12+
} from "../../helpers";
13+
import {
14+
KeyType,
15+
kindOfKeyType,
16+
nameOfKeyType,
17+
tagOfKeyType,
18+
} from "./key-type";
19+
import { CodeQLCliServer } from "../../cli";
20+
import { DatabaseItem } from "../../local-databases";
21+
import { extLogger, TeeLogger } from "../../common";
1722
import { CancellationToken } from "vscode";
18-
import { ProgressCallback } from "../progress";
19-
import { CoreCompletedQuery, QueryRunner } from "../query-server";
20-
import { redactableError } from "../pure/errors";
21-
import { QLPACK_FILENAMES } from "../pure/ql";
23+
import { ProgressCallback } from "../../progress";
24+
import { CoreCompletedQuery, QueryRunner } from "../../query-server";
25+
import { redactableError } from "../../pure/errors";
26+
import { QLPACK_FILENAMES } from "../../pure/ql";
2227

2328
export async function qlpackOfDatabase(
2429
cli: Pick<CodeQLCliServer, "resolveQlpacks">,

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ import {
1414
decodeSourceArchiveUri,
1515
encodeArchiveBasePath,
1616
zipArchiveScheme,
17-
} from "../archive-filesystem-provider";
18-
import { CodeQLCliServer } from "../cli";
19-
import { DatabaseManager } from "../local-databases";
20-
import { CachedOperation } from "../helpers";
21-
import { ProgressCallback, withProgress } from "../progress";
22-
import AstBuilder from "./astBuilder";
23-
import { KeyType } from "./keyType";
17+
} from "../../archive-filesystem-provider";
18+
import { CodeQLCliServer } from "../../cli";
19+
import { DatabaseManager } from "../../local-databases";
20+
import { CachedOperation } from "../../helpers";
21+
import { ProgressCallback, withProgress } from "../../progress";
22+
import { KeyType } from "./key-type";
2423
import {
2524
FullLocationLink,
2625
getLocationsForUriString,
2726
TEMPLATE_NAME,
28-
} from "./locationFinder";
27+
} from "./location-finder";
2928
import {
3029
qlpackOfDatabase,
3130
resolveQueries,
3231
runContextualQuery,
33-
} from "./queryResolver";
34-
import { isCanary, NO_CACHE_AST_VIEWER } from "../config";
35-
import { CoreCompletedQuery, QueryRunner } from "../query-server";
32+
} from "./query-resolver";
33+
import { isCanary, NO_CACHE_AST_VIEWER } from "../../config";
34+
import { CoreCompletedQuery, QueryRunner } from "../../query-server";
35+
import { AstBuilder } from "../ast-viewer/ast-builder";
3636

3737
/**
3838
* Runs templated CodeQL queries to find definitions in

0 commit comments

Comments
 (0)