fix(workspace-tree): make bazel.commandLine.queryExpression behave more similarly to bazel query (#619)

* fix(workspace-tree): honor bazel.commandLine.queryExpression in tree view

The Bazel Targets tree's per-package target listing used a hardcoded
//pkg:all query, so targets that didn't match the user's configured
queryExpression still appeared under each package node. queryPackages()
already honored the expression, and #608 fixed the root-level listing,
but per-package children still leaked through.

Intersect the per-package target query with the user's expression so the
tree matches what `bazel query <expression>` returns, consistent with
the root-level and quick-picker behavior. Also updates the setting
description to mention target filtering and adds test coverage for
kind() filters, single-target filters, and empty-result filters.

* fix formatting

Author: janantharaj

package.json

@@ -195,7 +195,7 @@
                 "bazel.commandLine.queryExpression": {
                     "type": "string",
                     "default": "...:*",
-                    "description": "A [query language expression](https://bazel.build/query/language) which determines the packages displayed in the workspace tree and quick picker. The default inspects the entire workspace, but you could narrow it. For example: `//part/you/want/...:*`"
+                    "description": "A [query language expression](https://bazel.build/query/language) which determines the packages and targets displayed in the workspace tree and quick picker. The default inspects the entire workspace, but you could narrow it. For example: `//part/you/want/...:*` or `kind('.*_test rule', //...)`"
                 },
                 "bazel.lsp.command": {
                     "type": "string",

src/workspace-tree/bazel_package_tree_item.ts

@@ -19,7 +19,10 @@ import {
   IBazelCommandAdapter,
   IBazelCommandOptions,
 } from "../bazel";
-import { getBazelExecutablePath } from "../extension/configuration";
+import {
+  getBazelExecutablePath,
+  getQueryExpression,
+} from "../extension/configuration";
 import { blaze_query } from "../protos";
 import { BazelTargetTreeItem } from "./bazel_target_tree_item";
 import { IBazelTreeItem } from "./bazel_tree_item";
@@ -55,10 +58,12 @@ export class BazelPackageTreeItem
   }
 
   public async getChildren(): Promise<IBazelTreeItem[]> {
+    const queryExpression = getQueryExpression();
+    const targetQuery = `(${queryExpression}) intersect (//${this.packagePath}:all)`;
     const queryResult = await new BazelQuery(
       getBazelExecutablePath(),
       this.workspaceInfo.bazelWorkspacePath,
-    ).queryTargets(`//${this.packagePath}:all`, {
+    ).queryTargets(targetQuery, {
       ignoresErrors: true,
       sortByRuleName: true,
     });

test/workspace_tree.test.ts

@@ -122,6 +122,92 @@ describe("Bazel Workspace Tree", function (this: Mocha.Suite) {
     );
   });
 
+  describe("queryExpression filtering", () => {
+    afterEach(async () => {
+      await vscode.workspace
+        .getConfiguration("bazel.commandLine")
+        .update(
+          "queryExpression",
+          undefined,
+          vscode.ConfigurationTarget.Workspace,
+        );
+    });
+
+    it("should filter targets by rule kind", async () => {
+      await vscode.workspace
+        .getConfiguration("bazel.commandLine")
+        .update(
+          "queryExpression",
+          "kind('py_.*', //...)",
+          vscode.ConfigurationTarget.Workspace,
+        );
+
+      await verifyTreeStructure(
+        {
+          "//pkg1": {
+            ":main  (py_binary)": {},
+            ":pkg1  (py_library)": {},
+          },
+        },
+        await workspaceTreeProvider.getChildren(),
+      );
+    });
+
+    it("should filter to filegroup targets only", async () => {
+      await vscode.workspace
+        .getConfiguration("bazel.commandLine")
+        .update(
+          "queryExpression",
+          "kind('filegroup', //...)",
+          vscode.ConfigurationTarget.Workspace,
+        );
+
+      await verifyTreeStructure(
+        {
+          "//pkg1": {
+            ":foo  (filegroup)": {},
+            ":src_files  (filegroup)": {},
+          },
+          "//pkg2/sub-pkg": {
+            ":foobar  (filegroup)": {},
+          },
+        },
+        await workspaceTreeProvider.getChildren(),
+      );
+    });
+
+    it("should filter to a single target", async () => {
+      await vscode.workspace
+        .getConfiguration("bazel.commandLine")
+        .update(
+          "queryExpression",
+          "//pkg1:main",
+          vscode.ConfigurationTarget.Workspace,
+        );
+
+      await verifyTreeStructure(
+        {
+          "//pkg1": {
+            ":main  (py_binary)": {},
+          },
+        },
+        await workspaceTreeProvider.getChildren(),
+      );
+    });
+
+    it("should show empty tree when expression matches nothing", async () => {
+      await vscode.workspace
+        .getConfiguration("bazel.commandLine")
+        .update(
+          "queryExpression",
+          "kind('java_library', //...)",
+          vscode.ConfigurationTarget.Workspace,
+        );
+
+      await verifyTreeStructure({}, await workspaceTreeProvider.getChildren());
+    });
+  });
+
   it("does not select tree item when bazel view is hidden", async () => {
     // GIVEN another view is active (Search) instead of the Explorer
     await vscode.commands.executeCommand("workbench.view.search");