mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-06-17 21:18:06 +02:00
Code Releases Activity

Marlon Richert: 51861: fix _approximate when compadd has been overridden

Browse source 
Before this patch, if compadd had been overridden by a function of the
same name, _approximate would not do corrections.
This commit is contained in:
Bart Schaefer 2023-08-27 15:27:45 -07:00
parent 2a854aae48
commit 5f984319b5
2 changed files with 24 additions and 24 deletions
ChangeLog
Completion/Base/Completer
_approximate

4
ChangeLog
View file

@ -1,5 +1,9 @@
2023-08-27 Bart Schaefer <schaefer@zsh.org>
* Marlon Richert: 51861 (tweaked for 52028):
Completion/Base/Completer/_approximate: allow _approximate
to provide corrections even when compadd is overridden
* 52028: Completion/Base/Utility/_shadow, Doc/Zsh/compsys.yo,
Doc/Zsh/contrib.yo, Functions/Misc/mkshadow: improve _shadow
and _unshadow, add helper function and update documentation

44
Completion/Base/Completer/_approximate
View file

@ -12,7 +12,6 @@
local _comp_correct _correct_expl _correct_group comax cfgacc match
local oldcontext="${curcontext}" opm="$compstate[pattern_match]"
local dounfunction
integer ret=1
if [[ "$1" = -a* ]]; then
@ -44,34 +43,31 @@ fi
_tags corrections original
# Otherwise temporarily define a function to use instead of
# the builtin that adds matches. This is used to be able
# to stick the `(#a...)' in the right place (after an
# ignored prefix).
# Otherwise temporarily define a function to use instead of the builtin that
# adds matches. This is used to be able to stick the `(#a...)' in the right
# place (after an ignored prefix).
#
# Current shell structure for use with "always", to make sure
# we unfunction the compadd.
# Current shell structure for use with "always", to make sure we unfunction our
# compadd and restore any compadd function defined previously.
{
if (( ! $+functions[compadd] )); then
dounfunction=1
compadd() {
local ppre="$argv[(I)-p]"
_shadow -s _approximate compadd
compadd() {
local ppre="$argv[(I)-p]"
[[ ${argv[(I)-[a-zA-Z]#U[a-zA-Z]#]} -eq 0 &&
"${#:-$PREFIX$SUFFIX}" -le _comp_correct ]] && return
[[ ${argv[(I)-[a-zA-Z]#U[a-zA-Z]#]} -eq 0 &&
"${#:-$PREFIX$SUFFIX}" -le _comp_correct ]] && return
if [[ "$PREFIX" = \~* && ( ppre -eq 0 || "$argv[ppre+1]" != \~* ) ]]; then
PREFIX="~(#a${_comp_correct})${PREFIX[2,-1]}"
else
PREFIX="(#a${_comp_correct})$PREFIX"
fi
if [[ "$PREFIX" = \~* && ( ppre -eq 0 || "$argv[ppre+1]" != \~* ) ]]; then
PREFIX="~(#a${_comp_correct})${PREFIX[2,-1]}"
else
PREFIX="(#a${_comp_correct})$PREFIX"
fi
(( $_correct_group && ${${argv[1,(r)-(|-)]}[(I)-*[JV]]} )) &&
_correct_expl[_correct_group]=${argv[1,(r)-(-|)][(R)-*[JV]]}
(( $_correct_group && ${${argv[1,(r)-(|-)]}[(I)-*[JV]]} )) &&
_correct_expl[_correct_group]=${argv[1,(r)-(-|)][(R)-*[JV]]}
builtin compadd "$_correct_expl[@]" "$@"
}
fi
compadd@_approximate "$_correct_expl[@]" "$@"
}
_comp_correct=1
@ -115,7 +111,7 @@ while [[ _comp_correct -le comax ]]; do
done
} always {
[[ -n $dounfunction ]] && (( $+functions[compadd] )) && unfunction compadd
_unshadow
}
(( ret == 0 )) && return 0