diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2021-09-27 13:03:58 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-09-27 13:03:58 -0600 |
| commit | c674485e6b4abe313469900997d893d2940ee843 (patch) | |
| tree | d6ca6edaff3d81849489f31ca13b127acef89c75 /plugins/cargo | |
| parent | 3c73976ef306d68a85d60c94be9a1dcdc33fa2bf (diff) | |
| parent | 93ad3a88214b95f571e03c21f7d9bd76f9110938 (diff) | |
| download | zsh-c674485e6b4abe313469900997d893d2940ee843.tar.gz zsh-c674485e6b4abe313469900997d893d2940ee843.tar.bz2 zsh-c674485e6b4abe313469900997d893d2940ee843.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/cargo')
| -rw-r--r-- | plugins/cargo/.gitignore | 1 | ||||
| -rw-r--r-- | plugins/cargo/cargo.plugin.zsh | 24 |
2 files changed, 18 insertions, 7 deletions
diff --git a/plugins/cargo/.gitignore b/plugins/cargo/.gitignore deleted file mode 100644 index 42d7ecdd6..000000000 --- a/plugins/cargo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -_cargo diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh index 92eae5359..7082d2d55 100644 --- a/plugins/cargo/cargo.plugin.zsh +++ b/plugins/cargo/cargo.plugin.zsh @@ -1,11 +1,23 @@ -# COMPLETION FUNCTION if (( $+commands[rustup] && $+commands[cargo] )); then - if [[ ! -f $ZSH_CACHE_DIR/cargo_version ]] \ - || [[ "$(cargo --version)" != "$(< "$ZSH_CACHE_DIR/cargo_version")" ]] \ - || [[ ! -f $ZSH/plugins/cargo/_cargo ]]; then - rustup completions zsh cargo > $ZSH/plugins/cargo/_cargo - cargo --version > $ZSH_CACHE_DIR/cargo_version + # remove old generated completion file + command rm -f "${0:A:h}/_cargo" + + # generate new completion file + ver="$(cargo --version)" + ver_file="$ZSH_CACHE_DIR/cargo_version" + comp_file="$ZSH_CACHE_DIR/completions/_cargo" + + mkdir -p "${comp_file:h}" + (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath) + + if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then + rustup completions zsh cargo >| "$comp_file" + echo "$ver" >| "$ver_file" fi + + declare -A _comps autoload -Uz _cargo _comps[cargo]=_cargo + + unset ver ver_file comp_file fi |