Add setting for test discovery label

Author: bytebat

CHANGELOG.md

@@ -45,6 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Support official vscode testing API to discover, run, debug and anlyze `cc_test` targets via test explorer UI
 - Additional setting to switch on/off testing feature
+- Additional setting to reduce the search space for large projects with many build targets
 
 ### Fixed
 

README.md

@@ -31,9 +31,10 @@ If the `activateTesting` setting is set to true (default), the extension tries t
 
 ![test_explorer_example](images/test_explorer_example.png)
 
-This might take a while, depending on the size of your C++ project and the number of existing tests. In case of unexpected failures, check the extension output for error logs.
+Depending on the size of your C++ project, the test discovery process might take a while. You can reduce the search space by the extension setting `testDiscoverLabel`. In case of unexpected failures, check the extension output for error logs.
 
 ## Extension Settings
 
 * `vsc-bazel-tools.customCompileCommandsTarget`: Specifies a custom bazel target (label) to generate the compile commands.
 * `vsc-bazel-tools.activateTesting`: Discover and publish tests via test explorer UI.
+* `vsc-bazel-tools.testDiscoverLabel`: Bazel label for test discovery (e.g. `//my/package/...`).

package.json

@@ -52,6 +52,14 @@
           ],
           "default": true,
           "description": "Discover tests in test explorer UI."
+        },
+        "vsc-bazel-tools.testDiscoverLabel": {
+          "type": [
+            "string",
+            "//..."
+          ],
+          "default": "//...",
+          "description": "This label will be used to search for tests. Defaults to workspace search (//...)"
         }
       }
     }

src/extension.ts

@@ -9,12 +9,14 @@ let extensionOutputChannel: vscode.OutputChannel | undefined;
 let compileCommandsGenerator: vscode.Disposable | undefined;
 let bazelTestCtrl: vscode.TestController | undefined;
 
+const bazelTools = "vsc-bazel-tools";
 const activeTestingSettingName = "activateTesting";
+const testDiscoverLabelSettingName = "testDiscoverLabel";
 const activeTestingSettingDefault = true;
 let testingActivated = false;
 
 export async function activate(context: vscode.ExtensionContext) {
-	extensionOutputChannel = vscode.window.createOutputChannel("vsc-bazel-tools");
+	extensionOutputChannel = vscode.window.createOutputChannel(bazelTools);
 	extensionOutputChannel.show();
 	logger.attachTransport((logObj) => {
 		extensionOutputChannel.appendLine(logObj['0'].toString());
@@ -31,7 +33,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	const bazelWorkspaceDir = path.dirname(foundWorkspaceFiles[0]);
 
 	logger.info("Retrieving configuration.");
-	const config = vscode.workspace.getConfiguration("vsc-bazel-tools");
+	const config = vscode.workspace.getConfiguration(bazelTools);
 
 	compileCommandsGenerator = vscode.commands.registerCommand('vsc-bazel-tools.generateCompileCommands', async () => {
 		vscode.window.withProgress({
@@ -69,7 +71,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	const toggleTestingFeature = async () => {
 		if (!testingActivated) {
 			bazelTestCtrl = vscode.tests.createTestController('bazelTestController', 'Unit tests');
-			const utils = new Utils(bazelTestCtrl);
+			const utils = new Utils(bazelTestCtrl, vscode.workspace.getConfiguration(bazelTools).get(testDiscoverLabelSettingName));
 
 			bazelTestCtrl.resolveHandler = async test => {
 				if (!test) {
@@ -116,14 +118,20 @@ export async function activate(context: vscode.ExtensionContext) {
 	};
 
 	// activate/deactivate testing feature initially
-	if (config.get(activeTestingSettingName, activeTestingSettingDefault)) {
+	if (vscode.workspace.getConfiguration(bazelTools).get(activeTestingSettingName, activeTestingSettingDefault)) {
 		await toggleTestingFeature();
 	}
 
 	// activate/deactivate testing feature on config change
 	vscode.workspace.onDidChangeConfiguration(async e => {
-		if (e.affectsConfiguration(`vsc-bazel-tools.${activeTestingSettingName}`) &&
-			config.get(activeTestingSettingName, activeTestingSettingDefault) === true) {
+		const activeTestingFlagChanged = e.affectsConfiguration(`vsc-bazel-tools.${activeTestingSettingName}`);
+		const testDiscoverLabelChanged = e.affectsConfiguration(`vsc-bazel-tools.${testDiscoverLabelSettingName}`);
+		const activeTestingSetting = vscode.workspace.getConfiguration(bazelTools).get(activeTestingSettingName, activeTestingSettingDefault);
+		if (activeTestingFlagChanged && activeTestingSetting === true || testDiscoverLabelChanged) {
+			if (testDiscoverLabelChanged) {
+				bazelTestCtrl?.dispose();
+				testingActivated = false; // trigger refresh
+			}
 			await toggleTestingFeature();
 		}
 	});
@@ -132,4 +140,5 @@ export async function activate(context: vscode.ExtensionContext) {
 export function deactivate() {
 	compileCommandsGenerator?.dispose();
 	bazelTestCtrl?.dispose();
+	testingActivated = false;
 }

src/test_controller.ts

@@ -33,6 +33,7 @@ export class Utils {
 
     constructor(
         private readonly controller: vscode.TestController,
+        private readonly testDiscoverLabel: string,
     ) { }
 
     public async discoverAllTestsInWorkspace() {
@@ -51,8 +52,7 @@ export class Utils {
                     logger.error(`No WORKSPACE file found in ${this.workspaceDirPath}`);
                 });
 
-                const bazelTestTargetsQuery = await runCommand("bazel", ["query", "kind(\"cc_test\", //...)"], this.workspaceDirPath);
-                // TODO: get search dir/label from UI instead of using global //...?
+                const bazelTestTargetsQuery = await runCommand("bazel", ["query", `kind(\"cc_test\", ${this.testDiscoverLabel})`], this.workspaceDirPath);
 
                 if (bazelTestTargetsQuery.error) {
                     throw new Error(`bazel query failed:\n ${bazelTestTargetsQuery.error.message}`);