mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Pass in just the environment instead of full app

Browse Source
This commit is contained in:
Robert
2023-06-09 10:26:50 +01:00
parent a19c40bd66
commit eb938034fb
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/queries-panel/queries-module.ts
View File

@@ -19,7 +19,7 @@ export class QueriesModule extends DisposableObject {
} }
void extLogger.log("Initializing queries panel."); void extLogger.log("Initializing queries panel.");
const queryDiscovery = new QueryDiscovery(app, cliServer); const queryDiscovery = new QueryDiscovery(app.environment, cliServer);
this.push(queryDiscovery); this.push(queryDiscovery);
void queryDiscovery.refresh(); void queryDiscovery.refresh();

6
extensions/ql-vscode/src/queries-panel/query-discovery.ts
View File

@@ -10,7 +10,7 @@ import {
workspace, workspace,
} from "vscode"; } from "vscode";
import { MultiFileSystemWatcher } from "../common/vscode/multi-file-system-watcher"; import { MultiFileSystemWatcher } from "../common/vscode/multi-file-system-watcher";
import { App } from "../common/app"; import { EnvironmentContext } from "../common/app";
import { FileTreeDirectory, FileTreeLeaf } from "../common/file-tree-nodes"; import { FileTreeDirectory, FileTreeLeaf } from "../common/file-tree-nodes";
import { getOnDiskWorkspaceFoldersObjects } from "../helpers"; import { getOnDiskWorkspaceFoldersObjects } from "../helpers";
import { AppEventEmitter } from "../common/events"; import { AppEventEmitter } from "../common/events";
@@ -49,7 +49,7 @@ export class QueryDiscovery
); );
constructor( constructor(
private readonly app: App, private readonly env: EnvironmentContext,
private readonly cliServer: CodeQLCliServer, private readonly cliServer: CodeQLCliServer,
) { ) {
super("Query Discovery", extLogger); super("Query Discovery", extLogger);
@@ -137,7 +137,7 @@ export class QueryDiscovery
const rootDirectory = new FileTreeDirectory<string>( const rootDirectory = new FileTreeDirectory<string>(
fullPath, fullPath,
name, name,
this.app.environment, this.env,
); );
for (const queryPath of resolvedQueries) { for (const queryPath of resolvedQueries) {
const relativePath = normalize(relative(fullPath, queryPath)); const relativePath = normalize(relative(fullPath, queryPath));

14
extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts
View File

@@ -7,7 +7,7 @@ import {
} from "vscode"; } from "vscode";
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli"; import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
import { QueryDiscovery } from "../../../../src/queries-panel/query-discovery"; import { QueryDiscovery } from "../../../../src/queries-panel/query-discovery";
import { createMockApp } from "../../../__mocks__/appMock"; import { createMockEnvironmentContext } from "../../../__mocks__/appMock";
import { mockedObject } from "../../utils/mocking.helpers"; import { mockedObject } from "../../utils/mocking.helpers";
import { basename, join, sep } from "path"; import { basename, join, sep } from "path";
@@ -23,7 +23,7 @@ describe("QueryDiscovery", () => {
resolveQueries, resolveQueries,
}); });
const discovery = new QueryDiscovery(createMockApp({}), cli); const discovery = new QueryDiscovery(createMockEnvironmentContext(), cli);
await discovery.refresh(); await discovery.refresh();
const queries = discovery.queries; const queries = discovery.queries;
@@ -43,7 +43,7 @@ describe("QueryDiscovery", () => {
]), ]),
}); });
const discovery = new QueryDiscovery(createMockApp({}), cli); const discovery = new QueryDiscovery(createMockEnvironmentContext(), cli);
await discovery.refresh(); await discovery.refresh();
const queries = discovery.queries; const queries = discovery.queries;
expect(queries).toBeDefined(); expect(queries).toBeDefined();
@@ -69,7 +69,7 @@ describe("QueryDiscovery", () => {
]), ]),
}); });
const discovery = new QueryDiscovery(createMockApp({}), cli); const discovery = new QueryDiscovery(createMockEnvironmentContext(), cli);
await discovery.refresh(); await discovery.refresh();
const queries = discovery.queries; const queries = discovery.queries;
expect(queries).toBeDefined(); expect(queries).toBeDefined();
@@ -114,7 +114,7 @@ describe("QueryDiscovery", () => {
resolveQueries, resolveQueries,
}); });
const discovery = new QueryDiscovery(createMockApp({}), cli); const discovery = new QueryDiscovery(createMockEnvironmentContext(), cli);
await discovery.refresh(); await discovery.refresh();
const queries = discovery.queries; const queries = discovery.queries;
expect(queries).toBeDefined(); expect(queries).toBeDefined();
@@ -153,7 +153,7 @@ describe("QueryDiscovery", () => {
.mockResolvedValue([join(workspaceRoot, "query1.ql")]), .mockResolvedValue([join(workspaceRoot, "query1.ql")]),
}); });
const discovery = new QueryDiscovery(createMockApp({}), cli); const discovery = new QueryDiscovery(createMockEnvironmentContext(), cli);
const onDidChangeQueriesSpy = jest.fn(); const onDidChangeQueriesSpy = jest.fn();
discovery.onDidChangeQueries(onDidChangeQueriesSpy); discovery.onDidChangeQueries(onDidChangeQueriesSpy);
@@ -180,7 +180,7 @@ describe("QueryDiscovery", () => {
.mockImplementation(onDidChangeWorkspaceFoldersEvent.event); .mockImplementation(onDidChangeWorkspaceFoldersEvent.event);
const discovery = new QueryDiscovery( const discovery = new QueryDiscovery(
createMockApp({}), createMockEnvironmentContext(),
mockedObject<CodeQLCliServer>({ mockedObject<CodeQLCliServer>({
resolveQueries: jest.fn().mockResolvedValue([]), resolveQueries: jest.fn().mockResolvedValue([]),
}), }),