mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-01 21:51:40 +02:00
Code Releases Activity

49454: open dump file once only instead of reopening it for appends

Browse source
This commit is contained in:
Oliver Kiddle 2021-09-28 23:45:44 +02:00
parent 0a8d5cdbc8
commit 16ad7cec1b
2 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2021-09-28 Oliver Kiddle <opk@zsh.org> 2021-09-28 Oliver Kiddle <opk@zsh.org>
* 49454: Completion/compdump: open dump file once only instead
of reopening it for appends
* 49450: Src/Zle/compcore.c: don't display explanation with * 49450: Src/Zle/compcore.c: don't display explanation with
compadd -x if any of -D, -A or -O are also used compadd -x if any of -D, -A or -O are also used

58
Completion/compdump
View file

@ -16,7 +16,7 @@
emulate -L zsh emulate -L zsh
setopt extendedglob noshglob setopt extendedglob noshglob
typeset _d_file _d_f _d_bks _d_line _d_als _d_files _d_name _d_tmp typeset _d_file _d_f _d_fd _d_bks _d_line _d_als _d_files _d_name _d_tmp
_d_file=${_comp_dumpfile-${0:h}/compinit.dump}.$HOST.$$ _d_file=${_comp_dumpfile-${0:h}/compinit.dump}.$HOST.$$
[[ $_d_file = //* ]] && _d_file=${_d_file[2,-1]} [[ $_d_file = //* ]] && _d_file=${_d_file[2,-1]}
@ -33,44 +33,45 @@ if [[ -n "$_comp_secure" ]]; then
(( $#_d_wdirs )) && _d_files=( "${(@)_d_files:#(${(j:|:)_d_wdirs})/*}" ) (( $#_d_wdirs )) && _d_files=( "${(@)_d_files:#(${(j:|:)_d_wdirs})/*}" )
fi fi
print "#files: $#_d_files\tversion: $ZSH_VERSION" > $_d_file exec {_d_fd}>$_d_file
print "#files: $#_d_files\tversion: $ZSH_VERSION" >& $_d_fd
# Dump the arrays _comps, _services and _patcomps. The quoting # Dump the arrays _comps, _services and _patcomps. The quoting
# hieroglyphics ensure that a single quote inside a variable is itself # hieroglyphics ensure that a single quote inside a variable is itself
# correctly quoted. # correctly quoted.
print "\n_comps=(" >> $_d_file print "\n_comps=(" >& $_d_fd
for _d_f in ${(ok)_comps}; do for _d_f in ${(ok)_comps}; do
print -r - "${(qq)_d_f}" "${(qq)_comps[$_d_f]}" print -r - "${(qq)_d_f}" "${(qq)_comps[$_d_f]}"
done >> $_d_file done >& $_d_fd
print ")" >> $_d_file print ")" >& $_d_fd
print "\n_services=(" >> $_d_file print "\n_services=(" >& $_d_fd
for _d_f in ${(ok)_services}; do for _d_f in ${(ok)_services}; do
print -r - "${(qq)_d_f}" "${(qq)_services[$_d_f]}" print -r - "${(qq)_d_f}" "${(qq)_services[$_d_f]}"
done >> $_d_file done >& $_d_fd
print ")" >> $_d_file print ")" >& $_d_fd
print "\n_patcomps=(" >> $_d_file print "\n_patcomps=(" >& $_d_fd
for _d_f in ${(ok)_patcomps}; do for _d_f in ${(ok)_patcomps}; do
print -r - "${(qq)_d_f}" "${(qq)_patcomps[$_d_f]}" print -r - "${(qq)_d_f}" "${(qq)_patcomps[$_d_f]}"
done >> $_d_file done >& $_d_fd
print ")" >> $_d_file print ")" >& $_d_fd
_d_tmp="_postpatcomps" _d_tmp="_postpatcomps"
print "\n_postpatcomps=(" >> $_d_file print "\n_postpatcomps=(" >& $_d_fd
for _d_f in ${(ok)_postpatcomps}; do for _d_f in ${(ok)_postpatcomps}; do
print -r - "${(qq)_d_f}" "${(qq)_postpatcomps[$_d_f]}" print -r - "${(qq)_d_f}" "${(qq)_postpatcomps[$_d_f]}"
done >> $_d_file done >& $_d_fd
print ")" >> $_d_file print ")" >& $_d_fd
print "\n_compautos=(" >> $_d_file print "\n_compautos=(" >& $_d_fd
for _d_f in "${(ok@)_compautos}"; do for _d_f in "${(ok@)_compautos}"; do
print -r - "${(qq)_d_f}" "${(qq)_compautos[$_d_f]}" print -r - "${(qq)_d_f}" "${(qq)_compautos[$_d_f]}"
done >> $_d_file done >& $_d_fd
print ")" >> $_d_file print ")" >& $_d_fd
print >> $_d_file print >& $_d_fd
# Now dump the key bindings. We dump all bindings for zle widgets # Now dump the key bindings. We dump all bindings for zle widgets
# whose names start with a underscore. # whose names start with a underscore.
@ -90,15 +91,15 @@ zle -lL |
print -r - ${_d_line} print -r - ${_d_line}
_d_bks+=(${_d_line[3]}) _d_bks+=(${_d_line[3]})
fi fi
done >> $_d_file done >& $_d_fd
bindkey | bindkey |
while read -rA _d_line; do while read -rA _d_line; do
if [[ ${_d_line[2]} = (${(j.|.)~_d_bks}) ]]; then if [[ ${_d_line[2]} = (${(j.|.)~_d_bks}) ]]; then
print -r "bindkey '${_d_line[1][2,-2]}' ${_d_line[2]}" print -r "bindkey '${_d_line[1][2,-2]}' ${_d_line[2]}"
fi fi
done >> $_d_file done >& $_d_fd
print >> $_d_file print >& $_d_fd
# Autoloads: look for all defined functions beginning with `_' (that also # Autoloads: look for all defined functions beginning with `_' (that also
@ -109,7 +110,7 @@ _d_als=($^fpath/(${(o~j.|.)$(typeset +fm '_*')})(N:t))
# print them out: about five to a line looks neat # print them out: about five to a line looks neat
integer _i=5 integer _i=5
print -n autoload -Uz >> $_d_file print -n autoload -Uz >& $_d_fd
while (( $#_d_als )); do while (( $#_d_als )); do
if (( ! $+_compautos[$_d_als[1]] )); then if (( ! $+_compautos[$_d_als[1]] )); then
print -n " $_d_als[1]" print -n " $_d_als[1]"
@ -119,19 +120,20 @@ while (( $#_d_als )); do
fi fi
fi fi
shift _d_als shift _d_als
done >> $_d_file done >& $_d_fd
print >> $_d_file print >& $_d_fd
local _c local _c
for _c in "${(ok@)_compautos}"; do for _c in "${(ok@)_compautos}"; do
print "autoload -Uz $_compautos[$_c] $_c" >> $_d_file print "autoload -Uz $_compautos[$_c] $_c" >& $_d_fd
done done
print >> $_d_file print >& $_d_fd
print "typeset -gUa _comp_assocs" >> $_d_file print "typeset -gUa _comp_assocs" >& $_d_fd
print "_comp_assocs=( ${(qq)_comp_assocs} )" >> $_d_file print "_comp_assocs=( ${(qq)_comp_assocs} )" >& $_d_fd
exec {_d_fd}>&-
mv -f $_d_file ${_d_file%.$HOST.$$} mv -f $_d_file ${_d_file%.$HOST.$$}