From 761c34322ed81c6355096152c6f323b433054a8c Mon Sep 17 00:00:00 2001
From: "bazel.build machine account"
 <15028808+bazel-io@users.noreply.github.com>
Date: Tue, 16 Jan 2024 15:33:49 +0100
Subject: [PATCH] [7.1.0] Offer Shell completion for top-level packages without
 subpackages (#20879)

`bazel build //` now completes to `bazel build //:` when there are no
packages beneath the top-level package. While this is mostly an edge
case that doesn't apply to real projects, it will become more relevant
when completion support is added for external repositories in a future
PR.

Closes #20679.

Commit
https://github.com/bazelbuild/bazel/commit/ad3dd45abe64bd630bc082511ea935c2c94c350c

PiperOrigin-RevId: 597873995
Change-Id: Ida2b26536325acf130a9792b915ed8f3fe425a24

Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>
---
 scripts/bash_completion_test.sh      | 15 +++++++++++++++
 scripts/bazel-complete-template.bash |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/scripts/bash_completion_test.sh b/scripts/bash_completion_test.sh
index 6a2f39622795fd..bc243da2aac954 100755
--- a/scripts/bash_completion_test.sh
+++ b/scripts/bash_completion_test.sh
@@ -794,4 +794,19 @@ test_workspace_boundary() {
                      'build //sub_repo/'
 }
 
+test_complete_root_package() {
+    # This test only works for Bazel
+    if [[ ! " ${COMMAND_ALIASES[*]} " =~ " bazel " ]]; then return; fi
+
+    mkdir pkgs_repo
+    touch pkgs_repo/WORKSPACE
+    cat > pkgs_repo/BUILD <<'EOF'
+cc_binary(name = "main")
+EOF
+    cd pkgs_repo 2>/dev/null
+
+    assert_expansion 'build //' \
+                     'build //:'
+}
+
 run_suite "Tests of bash completion of 'blaze' command."
diff --git a/scripts/bazel-complete-template.bash b/scripts/bazel-complete-template.bash
index 320d77670c7820..2b3402c2fd9bb0 100644
--- a/scripts/bazel-complete-template.bash
+++ b/scripts/bazel-complete-template.bash
@@ -269,6 +269,14 @@ _bazel__expand_package_name() {
         fi
       fi
     done
+    # The loop over the compgen -d output above does not include the top-level
+    # package.
+    if [ -f $root$current/BUILD.bazel -o -f $root$current/BUILD ]; then
+      found=1
+      if [ "${type}" != "label-package" ]; then
+        echo "${current}:"
+      fi
+    fi
     [ $found -gt 0 ] && break  # Stop searching package path upon first match.
   done
 }