github-repos/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-27 15:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(plugins): generate completion functions in the background

Browse Source
This commit is contained in:
Marc Cornellà 2021-12-28 14:30:13 +01:00
parent c06197ad95
commit 49bae43f62
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
5 changed files with 57 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/cargo/cargo.plugin.zsh
View File

@ -7,7 +7,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}" 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
0="${${(M)0:#/*}:-$PWD/$0}" 0="${${(M)0:#/*}:-$PWD/$0}"
# Remove old generated completion file # Remove old generated completion file
command rm -f "${0:A:h}/_cargo" command rm -f "${0:A:h}/_cargo" "$ZSH_CACHE_DIR/cargo_version"
(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || { (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
fpath=("$ZSH/plugins/rust" $fpath) fpath=("$ZSH/plugins/rust" $fpath)

39
plugins/deno/deno.plugin.zsh
View File

@ -12,30 +12,29 @@ alias dts='deno test'
alias dup='deno upgrade' alias dup='deno upgrade'
# COMPLETION FUNCTION # COMPLETION FUNCTION
if (( $+commands[deno] )); then if (( ! $+commands[deno] )); then
# Handle $0 according to the standard: return
# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html fi
0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
0="${${(M)0:#/*}:-$PWD/$0}"
# remove old generated completion file # TODO: 2021-12-28: remove this block
command rm -f "${0:A:h}/_deno" # 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"
ver="$(deno --version)" # TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
ver_file="$ZSH_CACHE_DIR/deno_version" # Add completions folder in $ZSH_CACHE_DIR
comp_file="$ZSH_CACHE_DIR/completions/_deno" command mkdir -p "$ZSH_CACHE_DIR/completions"
(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
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
deno completions zsh >| "$comp_file"
echo "$ver" >| "$ver_file"
fi
# 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 declare -A _comps
autoload -Uz _deno autoload -Uz _deno
_comps[deno]=_deno _comps[deno]=_deno
unset ver ver_file comp_file
fi fi
deno completions zsh >| "$ZSH_CACHE_DIR/completions/_deno" &|

38
plugins/fnm/fnm.plugin.zsh
View File

@ -1,28 +1,26 @@
if (( $+commands[fnm] )); then if (( ! $+commands[fnm] )); then
# Handle $0 according to the standard: return
# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html fi
0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
0="${${(M)0:#/*}:-$PWD/$0}"
# remove old generated completion file # TODO: 2021-12-28: remove this block
command rm -f "${0:A:h}/_fnm" # 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}/_fnm" "$ZSH_CACHE_DIR/fnm_version"
ver="$(fnm --version)" # TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
ver_file="$ZSH_CACHE_DIR/fnm_version" # Add completions folder in $ZSH_CACHE_DIR
comp_file="$ZSH_CACHE_DIR/completions/_fnm" command mkdir -p "$ZSH_CACHE_DIR/completions"
(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
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
fnm completions --shell=zsh >| "$comp_file"
echo "$ver" >| "$ver_file"
fi
# If the completion file doesn't exist yet, we need to autoload it and
# bind it to `fnm`. Otherwise, compinit will have already done that.
if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
declare -A _comps declare -A _comps
autoload -Uz _fnm autoload -Uz _fnm
_comps[fnm]=_fnm _comps[fnm]=_fnm
unset ver ver_file comp_file
fi fi
fnm completions --shell=zsh >| "$ZSH_CACHE_DIR/completions/_fnm" &|

38
plugins/gh/gh.plugin.zsh
View File

@ -1,29 +1,27 @@
# Autocompletion for the GitHub CLI (gh). # Autocompletion for the GitHub CLI (gh).
if (( $+commands[gh] )); then if (( ! $+commands[gh] )); then
# Handle $0 according to the standard: return
# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html fi
0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
0="${${(M)0:#/*}:-$PWD/$0}"
# remove old generated completion file # TODO: 2021-12-28: remove this block
command rm -f "${0:A:h}/_gh" # 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}/_gh" "$ZSH_CACHE_DIR/gh_version"
ver="$(gh --version)" # TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
ver_file="$ZSH_CACHE_DIR/gh_version" # Add completions folder in $ZSH_CACHE_DIR
comp_file="$ZSH_CACHE_DIR/completions/_gh" command mkdir -p "$ZSH_CACHE_DIR/completions"
(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
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
gh completion --shell zsh >| "$comp_file"
echo "$ver" >| "$ver_file"
fi
# If the completion file doesn't exist yet, we need to autoload it and
# bind it to `gh`. Otherwise, compinit will have already done that.
if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
declare -A _comps declare -A _comps
autoload -Uz _gh autoload -Uz _gh
_comps[gh]=_gh _comps[gh]=_gh
unset ver ver_file comp_file
fi fi
gh completion --shell zsh >| "$ZSH_CACHE_DIR/completions/_gh" &|

2
plugins/rustup/rustup.plugin.zsh
View File

@ -7,7 +7,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}" 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
0="${${(M)0:#/*}:-$PWD/$0}" 0="${${(M)0:#/*}:-$PWD/$0}"
# Remove old generated completion file # Remove old generated completion file
command rm -f "${0:A:h}/_rustup" command rm -f "${0:A:h}/_rustup" "$ZSH_CACHE_DIR/rustup_version"
(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || { (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
fpath=("$ZSH/plugins/rust" $fpath) fpath=("$ZSH/plugins/rust" $fpath)