Retrofit bazelrc tests for new command lens providers

Author: pcj

src/bazelrc/feature.ts

@@ -19,20 +19,12 @@ export class BazelrcFeature implements IExtensionFeature, vscode.Disposable {
     ) {
     }
 
-    private registerBazelCommandCodeLensProviders(bazelExecutable: string) {
-        const provider = new BazelCommandCodeLensProvider(bazelExecutable);
-        const r = this.commandCodelensProviderRegistry;
-        BazelCommands.forEach(command => {
-            r.registerCommandCodeLensProvider(command, provider);
-        });
-    }
-
     async activate(
         ctx: vscode.ExtensionContext,
         config: vscode.WorkspaceConfiguration): Promise<any> {
 
         const cfg = await createBazelrcConfiguration(ctx, config);
-        this.registerBazelCommandCodeLensProviders(cfg.run.executable);
+        registerBazelCommandCodeLensProviders(this.commandCodelensProviderRegistry, cfg.run.executable);
 
         const codelens = new BazelrcCodelens(cfg.run.executable, this.commandCodelensProviderRegistry);
         this.disposables.push(codelens);
@@ -54,7 +46,7 @@ export class BazelrcFeature implements IExtensionFeature, vscode.Disposable {
     }
 }
 
-class BazelCommandCodeLensProvider implements CommandCodeLensProvider {
+export class BazelCommandCodeLensProvider implements CommandCodeLensProvider {
     constructor(
         private bazelExecutable: string,
     ) {}
@@ -97,3 +89,10 @@ function createRunCommand(runCtx: RunContext): vscode.Command {
         tooltip: `${runCtx.command} ${runCtx.args.join(' ')}`,
     };
 }
+
+export function registerBazelCommandCodeLensProviders(registry: ICommandCodeLensProviderRegistry, bazelExecutable: string) {
+    const provider = new BazelCommandCodeLensProvider(bazelExecutable);
+    BazelCommands.forEach(command => {
+        registry.registerCommandCodeLensProvider(command, provider);
+    });
+}

src/test/integration/feature.bazelrc.test.ts

@@ -8,7 +8,7 @@ import { expect } from 'chai';
 import { after, before, describe, it } from 'mocha';
 import { API } from '../../api';
 import { BazelrcCodelens, RunContext } from '../../bazelrc/codelens';
-import { BazelrcFeatureName } from '../../bazelrc/feature';
+import { BazelrcFeatureName, registerBazelCommandCodeLensProviders } from '../../bazelrc/feature';
 import { BazelFlagSupport } from '../../bazelrc/flags';
 
 tmp.setGracefulCleanup();
@@ -37,7 +37,7 @@ type codelensTest = {
 	range?: vscode.Range, // the expected range, if we care
 };
 
-describe(BazelrcFeatureName, function () {
+describe.only(BazelrcFeatureName, function () {
 	let support: BazelFlagSupport;
 	let codelens: BazelrcCodelens;
 	const cancellationTokenSource = new vscode.CancellationTokenSource();
@@ -51,6 +51,7 @@ describe(BazelrcFeatureName, function () {
 		});
 		await support.load();
 		const registry = new API();
+		registerBazelCommandCodeLensProviders(registry, 'bazel');		
 		codelens = new BazelrcCodelens('bazel', registry);
         await codelens.setup(true); // skip install commands
 	});