mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-11 00:10:08 +00:00
c6e7f8905f
When generating completions for Cargo, if the Rust sysroot
(i.e. `rustc +${${(z)$(rustup default)}[1]} --print sysroot`) contains
spaces, Cargo completions will not work because the spaces are not
escaped, thus passing two arguments to the "source" command instead of
one. The spaces need to be escaped for this to work.
31 lines
1.1 KiB
Bash
31 lines
1.1 KiB
Bash
if ! (( $+commands[rustup] && $+commands[cargo] )); then
|
|
return
|
|
fi
|
|
|
|
# Add completions folder in $ZSH_CACHE_DIR
|
|
# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
|
|
command mkdir -p "$ZSH_CACHE_DIR/completions"
|
|
(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
|
|
|
|
# If the completion file doesn't exist yet, we need to autoload it and
|
|
# bind it to `cargo`. Otherwise, compinit will have already done that
|
|
if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then
|
|
autoload -Uz _cargo
|
|
typeset -g -A _comps
|
|
_comps[cargo]=_cargo
|
|
fi
|
|
|
|
# If the completion file doesn't exist yet, we need to autoload it and
|
|
# bind it to `rustup`. Otherwise, compinit will have already done that
|
|
if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
|
|
autoload -Uz _rustup
|
|
typeset -g -A _comps
|
|
_comps[rustup]=_rustup
|
|
fi
|
|
|
|
# Generate completion files in the background
|
|
rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
|
|
cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
|
|
#compdef cargo
|
|
source "$(rustc +${${(z)$(rustup default)}[1]} --print sysroot)"/share/zsh/site-functions/_cargo
|
|
EOF
|