From e86127672a2e6786c97bc3ea9797347644e7bcc0 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Tue, 27 Feb 2024 16:57:53 +0000 Subject: [PATCH] Drop async from some functions that are not async (#3410) --- .../src/model-editor/model-evaluator.ts | 2 +- .../src/variant-analysis/export-results.ts | 4 ++-- .../variant-analysis-content-provider.ts | 2 +- .../variant-analysis-manager.ts | 12 ++++++------ .../variant-analysis-view-manager.ts | 6 ++---- .../variant-analysis/variant-analysis-view.ts | 6 +++--- .../variant-analysis-manager.test.ts | 18 +++++++++--------- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/extensions/ql-vscode/src/model-editor/model-evaluator.ts b/extensions/ql-vscode/src/model-editor/model-evaluator.ts index 51c32ce05..9ad202def 100644 --- a/extensions/ql-vscode/src/model-editor/model-evaluator.ts +++ b/extensions/ql-vscode/src/model-editor/model-evaluator.ts @@ -120,7 +120,7 @@ export class ModelEvaluator extends DisposableObject { evaluationRun: ModelEvaluationRun, ): Promise { if (evaluationRun.variantAnalysisId) { - return await this.variantAnalysisManager.tryGetVariantAnalysis( + return this.variantAnalysisManager.tryGetVariantAnalysis( evaluationRun.variantAnalysisId, ); } diff --git a/extensions/ql-vscode/src/variant-analysis/export-results.ts b/extensions/ql-vscode/src/variant-analysis/export-results.ts index 6c0569465..17d1997a4 100644 --- a/extensions/ql-vscode/src/variant-analysis/export-results.ts +++ b/extensions/ql-vscode/src/variant-analysis/export-results.ts @@ -42,7 +42,7 @@ export async function exportVariantAnalysisResults( await withProgress( async (progress: ProgressCallback, token: CancellationToken) => { const variantAnalysis = - await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId); + variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId); if (!variantAnalysis) { void extLogger.log( `Could not find variant analysis with id ${variantAnalysisId}`, @@ -57,7 +57,7 @@ export async function exportVariantAnalysisResults( } const repoStates = - await variantAnalysisManager.getRepoStates(variantAnalysisId); + variantAnalysisManager.getRepoStates(variantAnalysisId); void extLogger.log( `Exporting variant analysis results for variant analysis with id ${variantAnalysis.id}`, diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts index 50ec16dae..255a419e6 100644 --- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts +++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts @@ -22,7 +22,7 @@ export const createVariantAnalysisContentProvider = ( const variantAnalysisId = parseInt(variantAnalysisIdString); const variantAnalysis = - await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId); + variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId); if (!variantAnalysis) { void showAndLogWarningMessage( extLogger, diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts index 82533e901..2e97b92e4 100644 --- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts +++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts @@ -486,7 +486,7 @@ export class VariantAnalysisManager } public async openQueryText(variantAnalysisId: number): Promise { - const variantAnalysis = await this.tryGetVariantAnalysis(variantAnalysisId); + const variantAnalysis = this.tryGetVariantAnalysis(variantAnalysisId); if (!variantAnalysis) { void showAndLogWarningMessage( this.app.logger, @@ -517,7 +517,7 @@ export class VariantAnalysisManager } public async openQueryFile(variantAnalysisId: number): Promise { - const variantAnalysis = await this.tryGetVariantAnalysis(variantAnalysisId); + const variantAnalysis = this.tryGetVariantAnalysis(variantAnalysisId); if (!variantAnalysis) { void showAndLogWarningMessage( @@ -559,15 +559,15 @@ export class VariantAnalysisManager return this.views.get(variantAnalysisId); } - public async tryGetVariantAnalysis( + public tryGetVariantAnalysis( variantAnalysisId: number, - ): Promise { + ): VariantAnalysis | undefined { return this.variantAnalyses.get(variantAnalysisId); } - public async getRepoStates( + public getRepoStates( variantAnalysisId: number, - ): Promise { + ): VariantAnalysisScannedRepositoryState[] { return Object.values(this.repoStates.get(variantAnalysisId) ?? {}); } diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts index a6f35caeb..cc531c558 100644 --- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts +++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts @@ -19,12 +19,10 @@ export interface VariantAnalysisViewManager< unregisterView(view: T): void; getView(variantAnalysisId: number): T | undefined; - tryGetVariantAnalysis( - variantAnalysisId: number, - ): Promise; + tryGetVariantAnalysis(variantAnalysisId: number): VariantAnalysis | undefined; getRepoStates( variantAnalysisId: number, - ): Promise; + ): VariantAnalysisScannedRepositoryState[]; openQueryFile(variantAnalysisId: number): Promise; openQueryText(variantAnalysisId: number): Promise; cancelVariantAnalysis(variantAnalysisId: number): Promise; diff --git a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts index 2442b2e87..f8a87e47b 100644 --- a/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts +++ b/extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts @@ -96,7 +96,7 @@ export class VariantAnalysisView } protected async getPanelConfig(): Promise { - const variantAnalysis = await this.manager.tryGetVariantAnalysis( + const variantAnalysis = this.manager.tryGetVariantAnalysis( this.variantAnalysisId, ); @@ -178,7 +178,7 @@ export class VariantAnalysisView void this.app.logger.log("Variant analysis view loaded"); - const variantAnalysis = await this.manager.tryGetVariantAnalysis( + const variantAnalysis = this.manager.tryGetVariantAnalysis( this.variantAnalysisId, ); @@ -206,7 +206,7 @@ export class VariantAnalysisView filterSortState, }); - const repoStates = await this.manager.getRepoStates(this.variantAnalysisId); + const repoStates = this.manager.getRepoStates(this.variantAnalysisId); if (repoStates.length === 0) { return; } diff --git a/extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts index 24b9567ba..debe0af8d 100644 --- a/extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts @@ -109,9 +109,7 @@ describe("Variant Analysis Manager", () => { await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis); expect( - await variantAnalysisManager.tryGetVariantAnalysis( - variantAnalysis.id, - ), + variantAnalysisManager.tryGetVariantAnalysis(variantAnalysis.id), ).toEqual(variantAnalysis); }); @@ -119,7 +117,7 @@ describe("Variant Analysis Manager", () => { await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis); expect( - await variantAnalysisManager.getRepoStates(variantAnalysis.id), + variantAnalysisManager.getRepoStates(variantAnalysis.id), ).toEqual([]); }); @@ -147,7 +145,7 @@ describe("Variant Analysis Manager", () => { await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis); expect( - await variantAnalysisManager.getRepoStates(variantAnalysis.id), + variantAnalysisManager.getRepoStates(variantAnalysis.id), ).toEqual( expect.arrayContaining([ { @@ -621,8 +619,9 @@ describe("Variant Analysis Manager", () => { it("should set the status to canceling", async () => { await variantAnalysisManager.cancelVariantAnalysis(variantAnalysis.id); - const updatedAnalysis = - await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysis.id); + const updatedAnalysis = variantAnalysisManager.tryGetVariantAnalysis( + variantAnalysis.id, + ); expect(updatedAnalysis?.status).toBe(VariantAnalysisStatus.Canceling); }); @@ -635,8 +634,9 @@ describe("Variant Analysis Manager", () => { variantAnalysisManager.cancelVariantAnalysis(variantAnalysis.id), ).rejects.toThrow("Error when cancelling"); - const updatedAnalysis = - await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysis.id); + const updatedAnalysis = variantAnalysisManager.tryGetVariantAnalysis( + variantAnalysis.id, + ); expect(updatedAnalysis?.status).toBe(VariantAnalysisStatus.InProgress); }); });