Pass in just the environment instead of full app

Author: robertbrignull

extensions/ql-vscode/src/queries-panel/queries-module.ts

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

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

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

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

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