Skip to content

Use app.createEventEmitter in QueryDiscovery #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertbrignull merged 2 commits into from
May 23, 2023
Merged

Use app.createEventEmitter in QueryDiscovery #2437

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da5d0d2
Use app.createEventEmitter in QueryDiscovery
robertbrignull May 22, 2023
57f04fc
Add type to onDidChangeQueriesEmitter
robertbrignull May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions extensions/ql-vscode/src/queries-panel/query-discovery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { dirname, basename, normalize, relative } from "path";
import { Discovery } from "../common/discovery";
import { CodeQLCliServer } from "../codeql-cli/cli";
import {
Event,
EventEmitter,
RelativePattern,
Uri,
WorkspaceFolder,
} from "vscode";
import { Event, RelativePattern, Uri, WorkspaceFolder } from "vscode";
import { MultiFileSystemWatcher } from "../common/vscode/multi-file-system-watcher";
import { App } from "../common/app";
import { FileTreeDirectory, FileTreeLeaf } from "../common/file-tree-nodes";
import { getOnDiskWorkspaceFoldersObjects } from "../helpers";
import { AppEventEmitter } from "../common/events";

/**
* The results of discovering queries.
Expand All @@ -36,16 +31,15 @@ interface QueryDiscoveryResults {
export class QueryDiscovery extends Discovery<QueryDiscoveryResults> {
private results: QueryDiscoveryResults | undefined;

private readonly onDidChangeQueriesEmitter = this.push(
new EventEmitter<void>(),
);
private readonly onDidChangeQueriesEmitter: AppEventEmitter<void>;
private readonly watcher: MultiFileSystemWatcher = this.push(
new MultiFileSystemWatcher(),
);

constructor(app: App, private readonly cliServer: CodeQLCliServer) {
super("Query Discovery");

this.onDidChangeQueriesEmitter = this.push(app.createEventEmitter<void>());
this.push(app.onDidChangeWorkspaceFolders(this.refresh.bind(this)));
this.push(this.watcher.onDidChange(this.refresh.bind(this)));
}
Expand Down