diff --git a/extensions/ql-vscode/scripts/lint-scenarios.ts b/extensions/ql-vscode/scripts/lint-scenarios.ts index 2ce4f0b4d..46739e0e5 100644 --- a/extensions/ql-vscode/scripts/lint-scenarios.ts +++ b/extensions/ql-vscode/scripts/lint-scenarios.ts @@ -28,7 +28,7 @@ async function lintScenarios() { throw new Error(`Invalid schema: ${ajv.errorsText()}`); } - const validate = await ajv.compile(schema); + const validate = ajv.compile(schema); let invalidFiles = 0; diff --git a/extensions/ql-vscode/src/cli.ts b/extensions/ql-vscode/src/cli.ts index e00f50f77..751aa374f 100644 --- a/extensions/ql-vscode/src/cli.ts +++ b/extensions/ql-vscode/src/cli.ts @@ -295,7 +295,7 @@ export class CodeQLCliServer implements Disposable { ); } - return await spawnServer( + return spawnServer( codeQlPath, "CodeQL CLI Server", ["execute", "cli-server"], @@ -455,7 +455,7 @@ export class CodeQLCliServer implements Disposable { void logStream(child.stderr!, logger); } - for await (const event of await splitStreamAtSeparators(child.stdout!, [ + for await (const event of splitStreamAtSeparators(child.stdout!, [ "\0", ])) { yield event; @@ -487,7 +487,7 @@ export class CodeQLCliServer implements Disposable { cancellationToken?: CancellationToken, logger?: Logger, ): AsyncGenerator { - for await (const event of await this.runAsyncCodeQlCliCommandInternal( + for await (const event of this.runAsyncCodeQlCliCommandInternal( command, commandArgs, cancellationToken, @@ -750,7 +750,7 @@ export class CodeQLCliServer implements Disposable { ...testPaths, ]); - for await (const event of await this.runAsyncCodeQlCliCommand( + for await (const event of this.runAsyncCodeQlCliCommand( ["test", "run"], subcommandArgs, "Run CodeQL Tests", @@ -1543,7 +1543,7 @@ const lineEndings = ["\r\n", "\r", "\n"]; * @param logger The logger that will consume the stream output. */ async function logStream(stream: Readable, logger: Logger): Promise { - for await (const line of await splitStreamAtSeparators(stream, lineEndings)) { + for await (const line of splitStreamAtSeparators(stream, lineEndings)) { // Await the result of log here in order to ensure the logs are written in the correct order. await logger.log(line); } diff --git a/extensions/ql-vscode/src/mocks/mock-gh-api-server.ts b/extensions/ql-vscode/src/mocks/mock-gh-api-server.ts index 5bf5f0299..1d6bbd3ae 100644 --- a/extensions/ql-vscode/src/mocks/mock-gh-api-server.ts +++ b/extensions/ql-vscode/src/mocks/mock-gh-api-server.ts @@ -96,8 +96,8 @@ export class MockGitHubApiServer extends DisposableObject { } public async stopRecording(): Promise { - await this.recorder.stop(); - await this.recorder.clear(); + this.recorder.stop(); + this.recorder.clear(); } public async getScenarioNames(scenariosPath?: string): Promise { diff --git a/extensions/ql-vscode/src/mocks/vscode-mock-gh-api-server.ts b/extensions/ql-vscode/src/mocks/vscode-mock-gh-api-server.ts index c52543d48..fbe43c2c9 100644 --- a/extensions/ql-vscode/src/mocks/vscode-mock-gh-api-server.ts +++ b/extensions/ql-vscode/src/mocks/vscode-mock-gh-api-server.ts @@ -35,11 +35,11 @@ export class VSCodeMockGitHubApiServer extends DisposableObject { } public async startServer(): Promise { - await this.server.startServer(); + this.server.startServer(); } public async stopServer(): Promise { - await this.server.stopServer(); + this.server.stopServer(); await commands.executeCommand( "setContext", diff --git a/extensions/ql-vscode/src/test-adapter.ts b/extensions/ql-vscode/src/test-adapter.ts index b050a9ba2..c8b0f620c 100644 --- a/extensions/ql-vscode/src/test-adapter.ts +++ b/extensions/ql-vscode/src/test-adapter.ts @@ -356,15 +356,11 @@ export class QLTestAdapter extends DisposableObject implements TestAdapter { tests: string[], cancellationToken: CancellationToken, ): Promise { - const workspacePaths = await getOnDiskWorkspaceFolders(); - for await (const event of await this.cliServer.runTests( - tests, - workspacePaths, - { - cancellationToken, - logger: testLogger, - }, - )) { + const workspacePaths = getOnDiskWorkspaceFolders(); + for await (const event of this.cliServer.runTests(tests, workspacePaths, { + cancellationToken, + logger: testLogger, + })) { const state = event.pass ? "passed" : event.messages?.length diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts index 5c0a35741..6c014b609 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts @@ -50,11 +50,11 @@ class Checkpoint { } async resolve(): Promise { - await this.res(); + this.res(); } async reject(e: Error): Promise { - await this.rej(e); + this.rej(e); } } diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts index ea448f931..bb58940cb 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts @@ -50,11 +50,11 @@ class Checkpoint { } async resolve(): Promise { - await this.res(); + this.res(); } async reject(e: Error): Promise { - await this.rej(e); + this.rej(e); } }