Merge branch 'master' into feature/353-sync-tree-view

Author: cbandera

package.json

@@ -107,7 +107,7 @@
             },
             {
                 "category": "Bazel",
-                "command": "bazel.copyTargetToClipboard",
+                "command": "bazel.copyLabelToClipboard",
                 "title": "Copy Label to Clipboard"
             },
             {
@@ -322,8 +322,8 @@
         "menus": {
             "commandPalette": [
                 {
-                    "command": "bazel.copyTargetToClipboard",
-                    "when": "false"
+                    "command": "bazel.copyLabelToClipboard",
+                    "when": "bazel.haveWorkspace"
                 },
                 {
                     "command": "bazel.buildTarget",
@@ -422,12 +422,12 @@
                     "group": "build"
                 },
                 {
-                    "command": "bazel.copyTargetToClipboard",
+                    "command": "bazel.copyLabelToClipboard",
                     "when": "view == bazelWorkspace && viewItem == rule",
                     "group": "build"
                 },
                 {
-                    "command": "bazel.copyTargetToClipboard",
+                    "command": "bazel.copyLabelToClipboard",
                     "when": "view == bazelWorkspace && viewItem == testRule",
                     "group": "build"
                 }

src/codelens/bazel_build_code_lens_provider.ts

@@ -137,7 +137,16 @@ export class BazelBuildCodeLensProvider implements vscode.CodeLensProvider {
         countMap.set(line, countMap.has(line));
         return countMap;
       }, new Map<number, boolean>());
-    for (const target of queryResult.target) {
+    // Sort targets by length first, then alphabetically
+    // This ensures shorter names (often main targets) appear first, with consistent ordering within each length group
+    const sortedTargets = [...queryResult.target].sort((a, b) => {
+      const lengthDiff = a.rule.name.length - b.rule.name.length;
+      return lengthDiff !== 0
+        ? lengthDiff
+        : a.rule.name.localeCompare(b.rule.name);
+    });
+
+    for (const target of sortedTargets) {
       const location = new QueryLocation(target.rule.location);
       const targetName = target.rule.name;
       const ruleClass = target.rule.ruleClass;
@@ -147,7 +156,7 @@ export class BazelBuildCodeLensProvider implements vscode.CodeLensProvider {
 
       // All targets support target copying and building.
       commands.push({
-        commandString: "bazel.copyTargetToClipboard",
+        commandString: "bazel.copyLabelToClipboard",
         name: "Copy",
       });
       commands.push({

src/extension/bazel_wrapper_commands.ts

@@ -13,11 +13,16 @@
 // limitations under the License.
 
 import * as vscode from "vscode";
+import * as path from "path";
 
 import { IBazelCommandAdapter } from "../bazel/bazel_command";
 import { BazelWorkspaceInfo } from "../bazel/bazel_workspace_info";
 import { getDefaultBazelExecutablePath } from "./configuration";
-import { getBazelPackageFile } from "../bazel/bazel_utils";
+import {
+  getBazelPackageFile,
+  getBazelWorkspaceFolder,
+  getBazelPackageFolder,
+} from "../bazel/bazel_utils";
 import {
   queryQuickPickTargets,
   queryQuickPickPackage,
@@ -368,6 +373,80 @@ async function bazelGoToLabel(target_info?: blaze_query.ITarget | undefined) {
   });
 }
 
+/**
+ * Copies the Bazel label to the clipboard.
+ *
+ * If no adapter is provided, it will find the label under the cursor in the
+ * active editor, validate it, and copy it to the clipboard. If the label is a
+ * short form (missing the target name), it will be expanded to the full label.
+ */
+function bazelCopyLabelToClipboard(adapter: IBazelCommandAdapter | undefined) {
+  let label: string;
+
+  if (adapter !== undefined) {
+    // Called from a command adapter, so we can assume there is only one target.
+    label = adapter.getBazelCommandOptions().targets[0];
+  } else {
+    // Called from command palette
+    const editor = vscode.window.activeTextEditor;
+    if (!editor) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      vscode.window.showInformationMessage(
+        "Please open a file to copy a label from.",
+      );
+      return;
+    }
+
+    const document = editor.document;
+    const position = editor.selection.active;
+    const wordRange = document.getWordRangeAtPosition(
+      position,
+      /(?<![^"'])[a-zA-Z0-9_/:.-@]+(?![^"'])/,
+    );
+
+    if (!wordRange) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      vscode.window.showInformationMessage(
+        "No label found at cursor position.",
+      );
+      return;
+    }
+
+    label = document.getText(wordRange);
+
+    // If the label doesn't start with //, prepend the current package
+    if (!label.startsWith("//") && !label.startsWith("@")) {
+      const filePath = document.uri.fsPath;
+      const packagePath = getBazelPackageFolder(filePath);
+      if (!packagePath) {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        vscode.window.showErrorMessage("Not in a Bazel package.");
+        return;
+      }
+
+      // Get the package relative to workspace
+      const workspaceRoot = getBazelWorkspaceFolder(filePath);
+      const relativePackage = path.relative(workspaceRoot, packagePath) || ".";
+      label = `//${relativePackage}${label.startsWith(":") ? "" : ":"}${label}`;
+    }
+
+    // Handle the case where the target name is omitted
+    // (e.g., "//foo/bar" instead of "//foo/bar:bar")
+    if (!label.includes(":")) {
+      const parts = label.split("/");
+      const lastPart = parts[parts.length - 1];
+      if (lastPart && lastPart !== "...") {
+        // Don't expand "//..."
+        label = `${label}:${lastPart}`;
+      }
+    }
+  }
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  vscode.env.clipboard.writeText(label);
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  vscode.window.showInformationMessage(`Copied to clipboard: ${label}`);
+}
+
 /**
  * Activate all user-facing commands which simply wrap Bazel commands
  * such as `build`, `clean`, etc.
@@ -394,5 +473,9 @@ export function activateWrapperCommands(): vscode.Disposable[] {
     vscode.commands.registerCommand("bazel.clean", bazelClean),
     vscode.commands.registerCommand("bazel.goToBuildFile", bazelGoToBuildFile),
     vscode.commands.registerCommand("bazel.goToLabel", bazelGoToLabel),
+    vscode.commands.registerCommand(
+      "bazel.copyLabelToClipboard",
+      bazelCopyLabelToClipboard,
+    ),
   ];
 }

src/extension/extension.ts

@@ -15,7 +15,7 @@
 import * as vscode from "vscode";
 import * as lc from "vscode-languageclient/node";
 
-import { activateTaskProvider, IBazelCommandAdapter } from "../bazel";
+import { activateTaskProvider } from "../bazel";
 import {
   BuildifierDiagnosticsManager,
   BuildifierFormatProvider,
@@ -110,10 +110,6 @@ export async function activate(context: vscode.ExtensionContext) {
       completionItemProvider?.refresh();
       workspaceTreeProvider.refresh();
     }),
-    vscode.commands.registerCommand(
-      "bazel.copyTargetToClipboard",
-      bazelCopyTargetToClipboard,
-    ),
     // URI handler
     vscode.window.registerUriHandler({
       async handleUri(uri: vscode.Uri) {
@@ -213,19 +209,3 @@ function createLsp(config: vscode.WorkspaceConfiguration) {
     clientOptions,
   );
 }
-
-/**
- * Copies a target to the clipboard.
- */
-function bazelCopyTargetToClipboard(adapter: IBazelCommandAdapter | undefined) {
-  if (adapter === undefined) {
-    // This command should not be enabled in the commands palette, so adapter
-    // should always be present.
-    return;
-  }
-  // This can only be called on single targets, so we can assume there is only
-  // one of them.
-  const target = adapter.getBazelCommandOptions().targets[0];
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  vscode.env.clipboard.writeText(target);
-}

test/bazel_workspace/pkg1/BUILD

@@ -1,7 +1,19 @@
+# Note this file contains different kinds of labels on purpose - used by copy_label_to_clipboard test
+load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS")  # external label
+py_library(
+    name="pkg1",  # Same label as package
+    srcs=glob(["subfolder/*.py"]),
+    imports=["subfolder"],
+)
+filegroup(
+    name="src_files",
+    srcs=["main.py"],  # relative file label
+)
 py_binary(
-    name = "main",
-    srcs = ["main.py"],
-    visibility = ["//visibility:public"],
+    name="main",  # name label
+    srcs=[":src_files"],  # relative target label
+    visibility=["//visibility:public"],  # Full label on purpose
+    deps=["//pkg1"],  # Short package label on purpose
 )
 filegroup(
     name="foo",

test/bazel_workspace/pkg1/main.py

@@ -1,5 +1,4 @@
-def main():
-    print("Hello, world!")
+from lib import hello_world
 
 if __name__ == "__main__":
-    main()
+    hello_world()

test/bazel_workspace/pkg1/subfolder/lib.py

@@ -0,0 +1,2 @@
+def hello_world():
+    print("Hello, world!")