Avoid using app.createEventEmitter

This commit is contained in:
Robert
2023-06-09 10:24:07 +01:00
parent f0cf4a0105
commit a19c40bd66
2 changed files with 4 additions and 10 deletions

View File

@@ -3,6 +3,7 @@ import { Discovery } from "../common/discovery";
import { CodeQLCliServer } from "../codeql-cli/cli"; import { CodeQLCliServer } from "../codeql-cli/cli";
import { import {
Event, Event,
EventEmitter,
RelativePattern, RelativePattern,
Uri, Uri,
WorkspaceFolder, WorkspaceFolder,
@@ -53,7 +54,7 @@ export class QueryDiscovery
) { ) {
super("Query Discovery", extLogger); 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(workspace.onDidChangeWorkspaceFolders(this.refresh.bind(this)));
this.push(this.watcher.onDidChange(this.refresh.bind(this))); this.push(this.watcher.onDidChange(this.refresh.bind(this)));
} }

View File

@@ -153,12 +153,7 @@ describe("QueryDiscovery", () => {
.mockResolvedValue([join(workspaceRoot, "query1.ql")]), .mockResolvedValue([join(workspaceRoot, "query1.ql")]),
}); });
const discovery = new QueryDiscovery( const discovery = new QueryDiscovery(createMockApp({}), cli);
createMockApp({
createEventEmitter: () => new EventEmitter(),
}),
cli,
);
const onDidChangeQueriesSpy = jest.fn(); const onDidChangeQueriesSpy = jest.fn();
discovery.onDidChangeQueries(onDidChangeQueriesSpy); discovery.onDidChangeQueries(onDidChangeQueriesSpy);
@@ -185,9 +180,7 @@ describe("QueryDiscovery", () => {
.mockImplementation(onDidChangeWorkspaceFoldersEvent.event); .mockImplementation(onDidChangeWorkspaceFoldersEvent.event);
const discovery = new QueryDiscovery( const discovery = new QueryDiscovery(
createMockApp({ createMockApp({}),
createEventEmitter: () => new EventEmitter(),
}),
mockedObject<CodeQLCliServer>({ mockedObject<CodeQLCliServer>({
resolveQueries: jest.fn().mockResolvedValue([]), resolveQueries: jest.fn().mockResolvedValue([]),
}), }),