From a19c40bd661f4d4a74ef7ee794e5002edfbb555f Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Fri, 9 Jun 2023 10:24:07 +0100
Subject: [PATCH] Avoid using app.createEventEmitter

---
 .../ql-vscode/src/queries-panel/query-discovery.ts    |  3 ++-
 .../queries-panel/query-discovery.test.ts             | 11 ++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/extensions/ql-vscode/src/queries-panel/query-discovery.ts b/extensions/ql-vscode/src/queries-panel/query-discovery.ts
index 5c0fe6f68..dde498a28 100644
--- a/extensions/ql-vscode/src/queries-panel/query-discovery.ts
+++ b/extensions/ql-vscode/src/queries-panel/query-discovery.ts
@@ -3,6 +3,7 @@ import { Discovery } from "../common/discovery";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import {
   Event,
+  EventEmitter,
   RelativePattern,
   Uri,
   WorkspaceFolder,
@@ -53,7 +54,7 @@ export class QueryDiscovery
   ) {
     super("Query Discovery", extLogger);
 
-    this.onDidChangeQueriesEmitter = this.push(app.createEventEmitter<void>());
+    this.onDidChangeQueriesEmitter = this.push(new EventEmitter<void>());
     this.push(workspace.onDidChangeWorkspaceFolders(this.refresh.bind(this)));
     this.push(this.watcher.onDidChange(this.refresh.bind(this)));
   }
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts
index f4b2b3524..b5a67d655 100644
--- a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts
@@ -153,12 +153,7 @@ describe("QueryDiscovery", () => {
           .mockResolvedValue([join(workspaceRoot, "query1.ql")]),
       });
 
-      const discovery = new QueryDiscovery(
-        createMockApp({
-          createEventEmitter: () => new EventEmitter(),
-        }),
-        cli,
-      );
+      const discovery = new QueryDiscovery(createMockApp({}), cli);
 
       const onDidChangeQueriesSpy = jest.fn();
       discovery.onDidChangeQueries(onDidChangeQueriesSpy);
@@ -185,9 +180,7 @@ describe("QueryDiscovery", () => {
         .mockImplementation(onDidChangeWorkspaceFoldersEvent.event);
 
       const discovery = new QueryDiscovery(
-        createMockApp({
-          createEventEmitter: () => new EventEmitter(),
-        }),
+        createMockApp({}),
         mockedObject<CodeQLCliServer>({
           resolveQueries: jest.fn().mockResolvedValue([]),
         }),