mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Drop async from some functions that are not async (#3410)

Browse Source
This commit is contained in:
Charis Kyriakou
2024-02-27 16:57:53 +00:00
committed by GitHub
parent 040c7fc726
commit e86127672a
7 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/model-editor/model-evaluator.ts
View File

@@ -120,7 +120,7 @@ export class ModelEvaluator extends DisposableObject {
evaluationRun: ModelEvaluationRun, evaluationRun: ModelEvaluationRun,
): Promise<VariantAnalysis | undefined> { ): Promise<VariantAnalysis | undefined> {
if (evaluationRun.variantAnalysisId) { if (evaluationRun.variantAnalysisId) {
return await this.variantAnalysisManager.tryGetVariantAnalysis( return this.variantAnalysisManager.tryGetVariantAnalysis(
evaluationRun.variantAnalysisId, evaluationRun.variantAnalysisId,
); );
} }

4
extensions/ql-vscode/src/variant-analysis/export-results.ts
View File

@@ -42,7 +42,7 @@ export async function exportVariantAnalysisResults(
await withProgress( await withProgress(
async (progress: ProgressCallback, token: CancellationToken) => { async (progress: ProgressCallback, token: CancellationToken) => {
const variantAnalysis = const variantAnalysis =
await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId); variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId);
if (!variantAnalysis) { if (!variantAnalysis) {
void extLogger.log( void extLogger.log(
`Could not find variant analysis with id ${variantAnalysisId}`, `Could not find variant analysis with id ${variantAnalysisId}`,
@@ -57,7 +57,7 @@ export async function exportVariantAnalysisResults(
} }
const repoStates = const repoStates =
await variantAnalysisManager.getRepoStates(variantAnalysisId); variantAnalysisManager.getRepoStates(variantAnalysisId);
void extLogger.log( void extLogger.log(
`Exporting variant analysis results for variant analysis with id ${variantAnalysis.id}`, `Exporting variant analysis results for variant analysis with id ${variantAnalysis.id}`,

2
extensions/ql-vscode/src/variant-analysis/variant-analysis-content-provider.ts
View File

@@ -22,7 +22,7 @@ export const createVariantAnalysisContentProvider = (
const variantAnalysisId = parseInt(variantAnalysisIdString); const variantAnalysisId = parseInt(variantAnalysisIdString);
const variantAnalysis = const variantAnalysis =
await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId); variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId);
if (!variantAnalysis) { if (!variantAnalysis) {
void showAndLogWarningMessage( void showAndLogWarningMessage(
extLogger, extLogger,

12
extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts
View File

@@ -486,7 +486,7 @@ export class VariantAnalysisManager
} }
public async openQueryText(variantAnalysisId: number): Promise<void> { public async openQueryText(variantAnalysisId: number): Promise<void> {
const variantAnalysis = await this.tryGetVariantAnalysis(variantAnalysisId); const variantAnalysis = this.tryGetVariantAnalysis(variantAnalysisId);
if (!variantAnalysis) { if (!variantAnalysis) {
void showAndLogWarningMessage( void showAndLogWarningMessage(
this.app.logger, this.app.logger,
@@ -517,7 +517,7 @@ export class VariantAnalysisManager
} }
public async openQueryFile(variantAnalysisId: number): Promise<void> { public async openQueryFile(variantAnalysisId: number): Promise<void> {
const variantAnalysis = await this.tryGetVariantAnalysis(variantAnalysisId); const variantAnalysis = this.tryGetVariantAnalysis(variantAnalysisId);
if (!variantAnalysis) { if (!variantAnalysis) {
void showAndLogWarningMessage( void showAndLogWarningMessage(
@@ -559,15 +559,15 @@ export class VariantAnalysisManager
return this.views.get(variantAnalysisId); return this.views.get(variantAnalysisId);
} }
public async tryGetVariantAnalysis( public tryGetVariantAnalysis(
variantAnalysisId: number, variantAnalysisId: number,
): Promise<VariantAnalysis | undefined> { ): VariantAnalysis | undefined {
return this.variantAnalyses.get(variantAnalysisId); return this.variantAnalyses.get(variantAnalysisId);
} }
public async getRepoStates( public getRepoStates(
variantAnalysisId: number, variantAnalysisId: number,
): Promise<VariantAnalysisScannedRepositoryState[]> { ): VariantAnalysisScannedRepositoryState[] {
return Object.values(this.repoStates.get(variantAnalysisId) ?? {}); return Object.values(this.repoStates.get(variantAnalysisId) ?? {});
} }

6
extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts
View File

@@ -19,12 +19,10 @@ export interface VariantAnalysisViewManager<
unregisterView(view: T): void; unregisterView(view: T): void;
getView(variantAnalysisId: number): T | undefined; getView(variantAnalysisId: number): T | undefined;
tryGetVariantAnalysis( tryGetVariantAnalysis(variantAnalysisId: number): VariantAnalysis | undefined;
variantAnalysisId: number,
): Promise<VariantAnalysis | undefined>;
getRepoStates( getRepoStates(
variantAnalysisId: number, variantAnalysisId: number,
): Promise<VariantAnalysisScannedRepositoryState[]>; ): VariantAnalysisScannedRepositoryState[];
openQueryFile(variantAnalysisId: number): Promise<void>; openQueryFile(variantAnalysisId: number): Promise<void>;
openQueryText(variantAnalysisId: number): Promise<void>; openQueryText(variantAnalysisId: number): Promise<void>;
cancelVariantAnalysis(variantAnalysisId: number): Promise<void>; cancelVariantAnalysis(variantAnalysisId: number): Promise<void>;

6
extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts
View File

@@ -96,7 +96,7 @@ export class VariantAnalysisView
} }
protected async getPanelConfig(): Promise<WebviewPanelConfig> { protected async getPanelConfig(): Promise<WebviewPanelConfig> {
const variantAnalysis = await this.manager.tryGetVariantAnalysis( const variantAnalysis = this.manager.tryGetVariantAnalysis(
this.variantAnalysisId, this.variantAnalysisId,
); );
@@ -178,7 +178,7 @@ export class VariantAnalysisView
void this.app.logger.log("Variant analysis view loaded"); void this.app.logger.log("Variant analysis view loaded");
const variantAnalysis = await this.manager.tryGetVariantAnalysis( const variantAnalysis = this.manager.tryGetVariantAnalysis(
this.variantAnalysisId, this.variantAnalysisId,
); );
@@ -206,7 +206,7 @@ export class VariantAnalysisView
filterSortState, filterSortState,
}); });
const repoStates = await this.manager.getRepoStates(this.variantAnalysisId); const repoStates = this.manager.getRepoStates(this.variantAnalysisId);
if (repoStates.length === 0) { if (repoStates.length === 0) {
return; return;
} }

18
extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts
View File

@@ -109,9 +109,7 @@ describe("Variant Analysis Manager", () => {
await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis); await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis);
expect( expect(
await variantAnalysisManager.tryGetVariantAnalysis( variantAnalysisManager.tryGetVariantAnalysis(variantAnalysis.id),
variantAnalysis.id,
),
).toEqual(variantAnalysis); ).toEqual(variantAnalysis);
}); });
@@ -119,7 +117,7 @@ describe("Variant Analysis Manager", () => {
await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis); await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis);
expect( expect(
await variantAnalysisManager.getRepoStates(variantAnalysis.id), variantAnalysisManager.getRepoStates(variantAnalysis.id),
).toEqual([]); ).toEqual([]);
}); });
@@ -147,7 +145,7 @@ describe("Variant Analysis Manager", () => {
await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis); await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis);
expect( expect(
await variantAnalysisManager.getRepoStates(variantAnalysis.id), variantAnalysisManager.getRepoStates(variantAnalysis.id),
).toEqual( ).toEqual(
expect.arrayContaining([ expect.arrayContaining([
{ {
@@ -621,8 +619,9 @@ describe("Variant Analysis Manager", () => {
it("should set the status to canceling", async () => { it("should set the status to canceling", async () => {
await variantAnalysisManager.cancelVariantAnalysis(variantAnalysis.id); await variantAnalysisManager.cancelVariantAnalysis(variantAnalysis.id);
const updatedAnalysis = const updatedAnalysis = variantAnalysisManager.tryGetVariantAnalysis(
await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysis.id); variantAnalysis.id,
);
expect(updatedAnalysis?.status).toBe(VariantAnalysisStatus.Canceling); expect(updatedAnalysis?.status).toBe(VariantAnalysisStatus.Canceling);
}); });
@@ -635,8 +634,9 @@ describe("Variant Analysis Manager", () => {
variantAnalysisManager.cancelVariantAnalysis(variantAnalysis.id), variantAnalysisManager.cancelVariantAnalysis(variantAnalysis.id),
).rejects.toThrow("Error when cancelling"); ).rejects.toThrow("Error when cancelling");
const updatedAnalysis = const updatedAnalysis = variantAnalysisManager.tryGetVariantAnalysis(
await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysis.id); variantAnalysis.id,
);
expect(updatedAnalysis?.status).toBe(VariantAnalysisStatus.InProgress); expect(updatedAnalysis?.status).toBe(VariantAnalysisStatus.InProgress);
}); });
}); });