Skip to content

Commit 5f04738

Browse files
authored
Rename getVariantAnalysis to tryGetVariantAnalysis (#3409)
1 parent a416bcf commit 5f04738

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

extensions/ql-vscode/src/model-editor/model-evaluator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export class ModelEvaluator extends DisposableObject {
120120
evaluationRun: ModelEvaluationRun,
121121
): Promise<VariantAnalysis | undefined> {
122122
if (evaluationRun.variantAnalysisId) {
123-
return await this.variantAnalysisManager.getVariantAnalysis(
123+
return await this.variantAnalysisManager.tryGetVariantAnalysis(
124124
evaluationRun.variantAnalysisId,
125125
);
126126
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export async function exportVariantAnalysisResults(
4242
await withProgress(
4343
async (progress: ProgressCallback, token: CancellationToken) => {
4444
const variantAnalysis =
45-
await variantAnalysisManager.getVariantAnalysis(variantAnalysisId);
45+
await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId);
4646
if (!variantAnalysis) {
4747
void extLogger.log(
4848
`Could not find variant analysis with id ${variantAnalysisId}`,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const createVariantAnalysisContentProvider = (
2222
const variantAnalysisId = parseInt(variantAnalysisIdString);
2323

2424
const variantAnalysis =
25-
await variantAnalysisManager.getVariantAnalysis(variantAnalysisId);
25+
await variantAnalysisManager.tryGetVariantAnalysis(variantAnalysisId);
2626
if (!variantAnalysis) {
2727
void showAndLogWarningMessage(
2828
extLogger,

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ export class VariantAnalysisManager
484484
}
485485

486486
public async openQueryText(variantAnalysisId: number): Promise<void> {
487-
const variantAnalysis = await this.getVariantAnalysis(variantAnalysisId);
487+
const variantAnalysis = await this.tryGetVariantAnalysis(variantAnalysisId);
488488
if (!variantAnalysis) {
489489
void showAndLogWarningMessage(
490490
this.app.logger,
@@ -515,7 +515,7 @@ export class VariantAnalysisManager
515515
}
516516

517517
public async openQueryFile(variantAnalysisId: number): Promise<void> {
518-
const variantAnalysis = await this.getVariantAnalysis(variantAnalysisId);
518+
const variantAnalysis = await this.tryGetVariantAnalysis(variantAnalysisId);
519519

520520
if (!variantAnalysis) {
521521
void showAndLogWarningMessage(
@@ -557,7 +557,7 @@ export class VariantAnalysisManager
557557
return this.views.get(variantAnalysisId);
558558
}
559559

560-
public async getVariantAnalysis(
560+
public async tryGetVariantAnalysis(
561561
variantAnalysisId: number,
562562
): Promise<VariantAnalysis | undefined> {
563563
return this.variantAnalyses.get(variantAnalysisId);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface VariantAnalysisViewManager<
1919
unregisterView(view: T): void;
2020
getView(variantAnalysisId: number): T | undefined;
2121

22-
getVariantAnalysis(
22+
tryGetVariantAnalysis(
2323
variantAnalysisId: number,
2424
): Promise<VariantAnalysis | undefined>;
2525
getRepoStates(

extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export class VariantAnalysisView
9696
}
9797

9898
protected async getPanelConfig(): Promise<WebviewPanelConfig> {
99-
const variantAnalysis = await this.manager.getVariantAnalysis(
99+
const variantAnalysis = await this.manager.tryGetVariantAnalysis(
100100
this.variantAnalysisId,
101101
);
102102

@@ -178,7 +178,7 @@ export class VariantAnalysisView
178178

179179
void this.app.logger.log("Variant analysis view loaded");
180180

181-
const variantAnalysis = await this.manager.getVariantAnalysis(
181+
const variantAnalysis = await this.manager.tryGetVariantAnalysis(
182182
this.variantAnalysisId,
183183
);
184184

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ describe("Variant Analysis Manager", () => {
109109
await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis);
110110

111111
expect(
112-
await variantAnalysisManager.getVariantAnalysis(variantAnalysis.id),
112+
await variantAnalysisManager.tryGetVariantAnalysis(
113+
variantAnalysis.id,
114+
),
113115
).toEqual(variantAnalysis);
114116
});
115117

0 commit comments

Comments
 (0)