diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
| commit | 49edbf438ed690c76e6b2af80368c59404cf0167 (patch) | |
| tree | 129b3adb2f5f39a1329a426a3b7d51ed2c2290c1 /plugins/deno/deno.plugin.zsh | |
| parent | 1bc186dabe12b3d01b2257e82f3a104c48b8b3c7 (diff) | |
| parent | 78c91ccbf99c77bd4d9cdb74279a40776721f66d (diff) | |
| download | zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.gz zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.bz2 zsh-49edbf438ed690c76e6b2af80368c59404cf0167.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/deno/deno.plugin.zsh')
| -rw-r--r-- | plugins/deno/deno.plugin.zsh | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh index eb7191971..77c2125d2 100644 --- a/plugins/deno/deno.plugin.zsh +++ b/plugins/deno/deno.plugin.zsh @@ -12,25 +12,29 @@ alias dts='deno test' alias dup='deno upgrade' # COMPLETION FUNCTION -if (( $+commands[deno] )); then - # remove old generated completion file - command rm -f "${0:A:h}/_deno" - - ver="$(deno --version)" - ver_file="$ZSH_CACHE_DIR/deno_version" - comp_file="$ZSH_CACHE_DIR/completions/_deno" +if (( ! $+commands[deno] )); then + return +fi - mkdir -p "${comp_file:h}" - (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath) +# TODO: 2021-12-28: remove this block +# Handle $0 according to the standard: +# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html +0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}" +0="${${(M)0:#/*}:-$PWD/$0}" +# Remove old generated files +command rm -f "${0:A:h}/_deno" "$ZSH_CACHE_DIR/deno_version" - if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then - deno completions zsh >| "$comp_file" - echo "$ver" >| "$ver_file" - fi +# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh +# Add completions folder in $ZSH_CACHE_DIR +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 `deno`. Otherwise, compinit will have already done that. +if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then declare -A _comps autoload -Uz _deno _comps[deno]=_deno - - unset ver ver_file comp_file fi + +deno completions zsh >| "$ZSH_CACHE_DIR/completions/_deno" &| |