Skip to content

Commit 6f37f17

Browse files
committed
MRVA repositories panel not behind canary
1 parent 90b0911 commit 6f37f17

File tree

6 files changed

+12
-26
lines changed

6 files changed

+12
-26
lines changed

extensions/ql-vscode/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,8 +1281,7 @@
12811281
},
12821282
{
12831283
"id": "codeQLVariantAnalysisRepositories",
1284-
"name": "Variant Analysis Repositories",
1285-
"when": "config.codeQL.canary"
1284+
"name": "Variant Analysis Repositories"
12861285
},
12871286
{
12881287
"id": "codeQLQueryHistory",

extensions/ql-vscode/src/databases/db-module.ts

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { window } from "vscode";
2-
import { App, AppMode } from "../common/app";
2+
import { App } from "../common/app";
33
import { extLogger } from "../common";
44
import { DisposableObject } from "../pure/disposable-object";
55
import { DbConfigStore } from "./config/db-config-store";
66
import { DbManager } from "./db-manager";
77
import { DbPanel } from "./ui/db-panel";
88
import { DbSelectionDecorationProvider } from "./ui/db-selection-decoration-provider";
9-
import { isCanary } from "../config";
109

1110
export class DbModule extends DisposableObject {
1211
public readonly dbManager: DbManager;
@@ -19,24 +18,12 @@ export class DbModule extends DisposableObject {
1918
this.dbManager = new DbManager(app, this.dbConfigStore);
2019
}
2120

22-
public static async initialize(app: App): Promise<DbModule | undefined> {
23-
if (DbModule.shouldEnableModule(app.mode)) {
24-
const dbModule = new DbModule(app);
25-
app.subscriptions.push(dbModule);
21+
public static async initialize(app: App): Promise<DbModule> {
22+
const dbModule = new DbModule(app);
23+
app.subscriptions.push(dbModule);
2624

27-
await dbModule.initialize(app);
28-
return dbModule;
29-
}
30-
31-
return undefined;
32-
}
33-
34-
private static shouldEnableModule(app: AppMode): boolean {
35-
if (app === AppMode.Development || app === AppMode.Test) {
36-
return true;
37-
}
38-
39-
return isCanary();
25+
await dbModule.initialize(app);
26+
return dbModule;
4027
}
4128

4229
private async initialize(app: App): Promise<void> {

extensions/ql-vscode/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ async function activateWithInstalledDistribution(
644644
cliServer,
645645
variantAnalysisStorageDir,
646646
variantAnalysisResultsManager,
647-
dbModule?.dbManager,
647+
dbModule.dbManager,
648648
);
649649
ctx.subscriptions.push(variantAnalysisManager);
650650
ctx.subscriptions.push(variantAnalysisResultsManager);

extensions/ql-vscode/src/variant-analysis/repository-selection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export interface RepositorySelection {
1313
* @returns The user selection.
1414
*/
1515
export async function getRepositorySelection(
16-
dbManager?: DbManager,
16+
dbManager: DbManager,
1717
): Promise<RepositorySelection> {
18-
const selectedDbItem = dbManager?.getSelectedDbItem();
18+
const selectedDbItem = dbManager.getSelectedDbItem();
1919
if (selectedDbItem) {
2020
switch (selectedDbItem.kind) {
2121
case DbItemKind.LocalDatabase || DbItemKind.LocalList:

extensions/ql-vscode/src/variant-analysis/run-remote-query.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ export async function prepareRemoteQueryRun(
223223
uri: Uri | undefined,
224224
progress: ProgressCallback,
225225
token: CancellationToken,
226-
dbManager?: DbManager,
226+
dbManager: DbManager,
227227
): Promise<PreparedRemoteQuery> {
228228
if (!uri?.fsPath.endsWith(".ql")) {
229229
throw new UserCancellationException("Not a CodeQL query file.");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class VariantAnalysisManager
105105
private readonly cliServer: CodeQLCliServer,
106106
private readonly storagePath: string,
107107
private readonly variantAnalysisResultsManager: VariantAnalysisResultsManager,
108-
private readonly dbManager?: DbManager,
108+
private readonly dbManager: DbManager,
109109
) {
110110
super();
111111
this.variantAnalysisMonitor = this.push(

0 commit comments

Comments
 (0)