Skip to content

Commit 0b6bcfd

Browse files
Merge pull request #2459 from github/robertbrignull/discovery-logging
Avoid vscode reference rfom discovery.ts
2 parents e7a5def + 1f6d8f2 commit 0b6bcfd

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DisposableObject } from "../pure/disposable-object";
2-
import { extLogger } from "./logging/vscode/loggers";
32
import { getErrorMessage } from "../pure/helpers-pure";
3+
import { Logger } from "./logging";
44

55
/**
66
* Base class for "discovery" operations, which scan the file system to find specific kinds of
@@ -11,7 +11,7 @@ export abstract class Discovery<T> extends DisposableObject {
1111
private restartWhenFinished = false;
1212
private currentDiscoveryPromise: Promise<void> | undefined;
1313

14-
constructor(private readonly name: string) {
14+
constructor(private readonly name: string, private readonly logger: Logger) {
1515
super();
1616
}
1717

@@ -68,7 +68,7 @@ export abstract class Discovery<T> extends DisposableObject {
6868
try {
6969
results = await this.discover();
7070
} catch (err) {
71-
void extLogger.log(
71+
void this.logger.log(
7272
`${this.name} failed. Reason: ${getErrorMessage(err)}`,
7373
);
7474
results = undefined;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { FileTreeDirectory, FileTreeLeaf } from "../common/file-tree-nodes";
88
import { getOnDiskWorkspaceFoldersObjects } from "../helpers";
99
import { AppEventEmitter } from "../common/events";
1010
import { QueryDiscoverer } from "./query-tree-data-provider";
11+
import { extLogger } from "../common";
1112

1213
/**
1314
* The results of discovering queries.
@@ -41,7 +42,7 @@ export class QueryDiscovery
4142
);
4243

4344
constructor(app: App, private readonly cliServer: CodeQLCliServer) {
44-
super("Query Discovery");
45+
super("Query Discovery", extLogger);
4546

4647
this.onDidChangeQueriesEmitter = this.push(app.createEventEmitter<void>());
4748
this.push(app.onDidChangeWorkspaceFolders(this.refresh.bind(this)));

extensions/ql-vscode/src/query-testing/qltest-discovery.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { MultiFileSystemWatcher } from "../common/vscode/multi-file-system-watch
1111
import { CodeQLCliServer } from "../codeql-cli/cli";
1212
import { pathExists } from "fs-extra";
1313
import { FileTreeDirectory, FileTreeLeaf } from "../common/file-tree-nodes";
14+
import { extLogger } from "../common";
1415

1516
/**
1617
* The results of discovering QL tests.
@@ -42,7 +43,7 @@ export class QLTestDiscovery extends Discovery<QLTestDiscoveryResults> {
4243
private readonly workspaceFolder: WorkspaceFolder,
4344
private readonly cliServer: CodeQLCliServer,
4445
) {
45-
super("QL Test Discovery");
46+
super("QL Test Discovery", extLogger);
4647

4748
this.push(this.watcher.onDidChange(this.handleDidChange, this));
4849
}

0 commit comments

Comments
 (0)