Skip to content

Commit e5845b1

Browse files
norascheuchnorascheuch
committed
move contextual -> language-support/contextual including tests and kebab-caseing
1 parent be3efd7 commit e5845b1

File tree

15 files changed

+70
-61
lines changed

15 files changed

+70
-61
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { AstViewer } from "./astViewer";
44
import {
55
TemplatePrintAstProvider,
66
TemplatePrintCfgProvider,
7-
} from "./contextual/templateProvider";
7+
} from "./language-support/contextual/template-provider";
88
import { AstCfgCommands } from "./common/commands";
99
import { LocalQueries } from "./local-queries";
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import {
4747
TemplatePrintCfgProvider,
4848
TemplateQueryDefinitionProvider,
4949
TemplateQueryReferenceProvider,
50-
} from "./contextual/templateProvider";
50+
} from "./language-support/contextual/template-provider";
5151
import {
5252
DEFAULT_DISTRIBUTION_VERSION_RANGE,
5353
DistributionKind,

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
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 "../../astViewer";
9+
import fileRangeFromURI from "./file-range-from-uri";
610
import { Uri } from "vscode";
7-
import { QueryOutputDir } from "../run-queries-shared";
11+
import { QueryOutputDir } from "../../run-queries-shared";
812

913
/**
1014
* A class that wraps a tree of QL results from a query that

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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

77
export default function fileRangeFromURI(
88
uri: UrlValue | 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 fileRangeFromURI from "./file-range-from-uri";
14+
import { ProgressCallback } from "../../progress";
15+
import { KeyType } from "./key-type";
1616
import {
1717
qlpackOfDatabase,
1818
resolveQueries,
1919
runContextualQuery,
20-
} from "./queryResolver";
20+
} from "./query-resolver";
2121
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";
22+
import { QueryOutputDir } from "../../run-queries-shared";
23+
import { QueryRunner } from "../../query-server";
24+
import { QueryResultType } from "../../pure/new-messages";
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 AstBuilder from "./ast-builder";
23+
import { KeyType } from "./key-type";
2424
import {
2525
FullLocationLink,
2626
getLocationsForUriString,
2727
TEMPLATE_NAME,
28-
} from "./locationFinder";
28+
} from "./location-finder";
2929
import {
3030
qlpackOfDatabase,
3131
resolveQueries,
3232
runContextualQuery,
33-
} from "./queryResolver";
34-
import { isCanary, NO_CACHE_AST_VIEWER } from "../config";
35-
import { CoreCompletedQuery, QueryRunner } from "../query-server";
33+
} from "./query-resolver";
34+
import { isCanary, NO_CACHE_AST_VIEWER } from "../../config";
35+
import { CoreCompletedQuery, QueryRunner } from "../../query-server";
3636

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { ensureMetadataIsComplete, InitialQueryInfo } from "./query-results";
2424
import { isQuickQueryPath } from "./local-queries";
2525
import { nanoid } from "nanoid";
2626
import { CodeQLCliServer } from "./cli";
27-
import { SELECT_QUERY_NAME } from "./contextual/locationFinder";
27+
import { SELECT_QUERY_NAME } from "./language-support/contextual/location-finder";
2828
import { DatabaseManager } from "./local-databases";
2929
import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types";
3030
import { BaseLogger, extLogger } from "./common";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
CoreCompletedQuery,
2222
QueryRunner,
2323
} from "../../../src/query-server/query-runner";
24-
import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder";
24+
import { SELECT_QUERY_NAME } from "../../../src/language-support/contextual/location-finder";
2525
import { LocalQueries } from "../../../src/local-queries";
2626
import { QueryResultType } from "../../../src/pure/new-messages";
2727
import { createVSCodeCommandManager } from "../../../src/common/vscode/commands";

0 commit comments

Comments
 (0)