From d8435d113a8efe11a98bd3632f042c1841574a79 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Mon, 13 Feb 2023 14:30:29 -0800 Subject: [PATCH] Fix `skipIfTrue` Also, update jsdoc for `resolveQlpacks`. --- extensions/ql-vscode/src/cli.ts | 4 ++-- extensions/ql-vscode/test/vscode-tests/cli.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/extensions/ql-vscode/src/cli.ts b/extensions/ql-vscode/src/cli.ts index ed9b7d88b..d126b450b 100644 --- a/extensions/ql-vscode/src/cli.ts +++ b/extensions/ql-vscode/src/cli.ts @@ -1138,8 +1138,8 @@ export class CodeQLCliServer implements Disposable { /** * Gets information about available qlpacks * @param additionalPacks A list of directories to search for qlpacks before searching in `searchPath`. - * @param searchPath A list of directories to search for packs not found in `additionalPacks`. If undefined, - * the default CLI search path is used. + * @param extensionPacksOnly Whether to only search for extension packs. If true, only extension packs will + * be returned. If false, all packs will be returned. * @returns A dictionary mapping qlpack name to the directory it comes from */ async resolveQlpacks( diff --git a/extensions/ql-vscode/test/vscode-tests/cli.ts b/extensions/ql-vscode/test/vscode-tests/cli.ts index a179052e1..c9ca4232f 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli.ts @@ -44,5 +44,9 @@ export function itWithCodeQL() { } export async function skipIfTrue(condition: Thenable) { - return (await condition) ? beforeEach(() => {}) : beforeEach.skip(() => {}); + return beforeEach(async () => { + if (await condition) { + pending(); + } + }); }