commit 8227feae537e7b4cf0d753ce97f31d41b44711a8
author Gibson Fahnestock <gibfahn@gmail.com> Mon Apr 06 21:41:04 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 06 21:42:31 2020 -0700
tree 2dfa67e46d2995e37933750936e2a5b20cc363c8
parent 17ebbf15bea3733c0c21e0376fb5906e391edb49

Fix bazel zsh completion for users with b defined

If you have an `alias b` defined in your dotfiles, this will break the
bazel completion (see [0][] for an example). Basically the `b` will
expand to the contents of the alias before the function is parsed.

If you already have `b() ...` to define a function, and you already
have a function named `b`, this completion will override that function.

Therefore update the function name to follow the existing convention.

[0]: https://github.com/ohmyzsh/ohmyzsh/issues/6237

Closes #11064.

PiperOrigin-RevId: 305181481

scripts/zsh_completion/_bazel

diff --git a/scripts/zsh_completion/_bazel b/scripts/zsh_completion/_bazel
index b247383..827ce54 100644
--- a/scripts/zsh_completion/_bazel
+++ b/scripts/zsh_completion/_bazel
@@ -40,7 +40,7 @@
 
 : ${BAZEL_COMPLETION_PACKAGE_PATH:=%workspace%}
 : ${BAZEL:=bazel}
-b() { ${BAZEL} --noblock_for_lock "$@" 2>/dev/null; }
+_bazel_b() { ${BAZEL} --noblock_for_lock "$@" 2>/dev/null; }
 
 # Default cache lifetime is 1 week
 zstyle -s ":completion:${curcontext}:" cache-lifetime lifetime
@@ -93,7 +93,7 @@
   if _cache_invalid BAZEL_${lcmd}_options || _cache_invalid BAZEL_${lcmd}_args \
     || ! _bazel_safe_retrieve_cache BAZEL_${lcmd}_options ${_bazel_cmd_options} \
     || ! _retrieve_cache BAZEL_${lcmd}_args ${_bazel_cmd_args}; then
-    if ! eval "$(b help completion)"; then
+    if ! eval "$(_bazel_b help completion)"; then
       return
     fi
     local opts_var
@@ -163,7 +163,7 @@
       rule_re=".*_test|.*_binary"
       ;;
   esac
-  completions=(${$(b query "kind(\"${rule_re}\", ${pkg}:all)" 2>/dev/null)##*:})
+  completions=(${$(_bazel_b query "kind(\"${rule_re}\", ${pkg}:all)" 2>/dev/null)##*:})
   if ( (( ${#completions} > 0 )) && [[ $target_type != run ]] ); then
     completions+=(all)
   fi
@@ -282,7 +282,7 @@
   typeset -ga _bazel_cmd_list
   # Use `bazel help` instead of `bazel help completion` to get command
   # descriptions.
-  if _bazel_cmd_list=("${(@f)$(b help | awk '
+  if _bazel_cmd_list=("${(@f)$(_bazel_b help | awk '
 /Available commands/ { command=1; }
 /  [-a-z]+[ \t]+.+/ { if (command) { printf "%s:", $1; for (i=2; i<=NF; i++) printf "%s ", $i; print "" } }
 /^$/ { command=0; }')}"); then
@@ -331,7 +331,7 @@
       typeset -ga _bazel_info_keys_list
       # Use `bazel help` instead of `bazel help completion` to get info-key
       # descriptions.
-      if _bazel_info_keys_list=("${(@f)$(b help info-keys | awk '
+      if _bazel_info_keys_list=("${(@f)$(_bazel_b help info-keys | awk '
   { printf "%s:", $1; for (i=2; i<=NF; i++) printf "%s ", $i; print "" }')}"); then
         _store_cache BAZEL_info_keys _bazel_info_keys_list
       fi