Remove onDidChangeWorkspaceFolders from app

extensions/ql-vscode/src/common/app.ts

@@ -4,7 +4,6 @@ import { AppEventEmitter } from "./events";
 import { Logger } from "./logging";
 import { Memento } from "./memento";
 import { AppCommandManager } from "./commands";
-import type { Event, WorkspaceFoldersChangeEvent } from "vscode";
 
 export interface App {
   createEventEmitter<T>(): AppEventEmitter<T>;
@@ -15,7 +14,6 @@ export interface App {
   readonly globalStoragePath: string;
   readonly workspaceStoragePath?: string;
   readonly workspaceState: Memento;
-  readonly onDidChangeWorkspaceFolders: Event<WorkspaceFoldersChangeEvent>;
   readonly credentials: Credentials;
   readonly commands: AppCommandManager;
   readonly environment: EnvironmentContext;

extensions/ql-vscode/src/common/vscode/vscode-app.ts

@@ -40,10 +40,6 @@ export class ExtensionApp implements App {
     return this.extensionContext.workspaceState;
   }
 
-  public get onDidChangeWorkspaceFolders(): vscode.Event<vscode.WorkspaceFoldersChangeEvent> {
-    return vscode.workspace.onDidChangeWorkspaceFolders;
-  }
-
   public get subscriptions(): Disposable[] {
     return this.extensionContext.subscriptions;
   }

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

@@ -1,7 +1,13 @@
 import { dirname, basename, normalize, relative } from "path";
 import { Discovery } from "../common/discovery";
 import { CodeQLCliServer } from "../codeql-cli/cli";
-import { Event, RelativePattern, Uri, WorkspaceFolder } from "vscode";
+import {
+  Event,
+  RelativePattern,
+  Uri,
+  WorkspaceFolder,
+  workspace,
+} from "vscode";
 import { MultiFileSystemWatcher } from "../common/vscode/multi-file-system-watcher";
 import { App } from "../common/app";
 import { FileTreeDirectory, FileTreeLeaf } from "../common/file-tree-nodes";
@@ -48,7 +54,7 @@ export class QueryDiscovery
     super("Query Discovery", extLogger);
 
     this.onDidChangeQueriesEmitter = this.push(app.createEventEmitter<void>());
-    this.push(app.onDidChangeWorkspaceFolders(this.refresh.bind(this)));
+    this.push(workspace.onDidChangeWorkspaceFolders(this.refresh.bind(this)));
     this.push(this.watcher.onDidChange(this.refresh.bind(this)));
   }
 

extensions/ql-vscode/test/__mocks__/appMock.ts

@@ -8,7 +8,6 @@ import { testCredentialsWithStub } from "../factories/authentication";
 import { Credentials } from "../../src/common/authentication";
 import { AppCommandManager } from "../../src/common/commands";
 import { createMockCommandManager } from "./commandsMock";
-import type { Event, WorkspaceFoldersChangeEvent } from "vscode";
 
 export function createMockApp({
   extensionPath = "/mock/extension/path",
@@ -16,7 +15,6 @@ export function createMockApp({
   globalStoragePath = "/mock/global/storage/path",
   createEventEmitter = <T>() => new MockAppEventEmitter<T>(),
   workspaceState = createMockMemento(),
-  onDidChangeWorkspaceFolders = jest.fn(),
   credentials = testCredentialsWithStub(),
   commands = createMockCommandManager(),
   environment = createMockEnvironmentContext(),
@@ -26,7 +24,6 @@ export function createMockApp({
   globalStoragePath?: string;
   createEventEmitter?: <T>() => AppEventEmitter<T>;
   workspaceState?: Memento;
-  onDidChangeWorkspaceFolders?: Event<WorkspaceFoldersChangeEvent>;
   credentials?: Credentials;
   commands?: AppCommandManager;
   environment?: EnvironmentContext;
@@ -39,7 +36,6 @@ export function createMockApp({
     workspaceStoragePath,
     globalStoragePath,
     workspaceState,
-    onDidChangeWorkspaceFolders,
     createEventEmitter,
     credentials,
     commands,

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

@@ -180,11 +180,13 @@ describe("QueryDiscovery", () => {
     it("should refresh when workspace folders change", async () => {
       const onDidChangeWorkspaceFoldersEvent =
         new EventEmitter<WorkspaceFoldersChangeEvent>();
+      jest
+        .spyOn(workspace, "onDidChangeWorkspaceFolders")
+        .mockImplementation(onDidChangeWorkspaceFoldersEvent.event);
 
       const discovery = new QueryDiscovery(
         createMockApp({
           createEventEmitter: () => new EventEmitter(),
-          onDidChangeWorkspaceFolders: onDidChangeWorkspaceFoldersEvent.event,
         }),
         mockedObject<CodeQLCliServer>({
           resolveQueries: jest.fn().mockResolvedValue([]),