1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-01 18:30:55 +01:00

43930: Improve _multi_parts performance

This commit is contained in:
dana 2018-12-30 09:38:06 -06:00
parent 7951ede1db
commit 79fae27f7c
2 changed files with 11 additions and 7 deletions

View file

@ -1,5 +1,7 @@
2018-12-30 dana <dana@dana.is>
* 43930: Completion/Base/Utility/_multi_parts: Improve performance
* unposted (per 43938): Src/utils.c: Avoid segfault when
unmetafying empty string

View file

@ -127,8 +127,7 @@ while true; do
return
fi
elif (( $#tmp1 )); then
local ret=1 tt
local -a mm
local ret=1
# More than one match. First we get all strings that match the
# rest from the line.
@ -145,11 +144,14 @@ while true; do
SUFFIX="$suf"
fi
for tt in $tmp1
do
mm+=( "${(@M)matches:#$tt*}" )
done
matches=( $mm )
# The purpose of this check (or one purpose, anyway) seems to be to ensure
# that the suffix for the current segment on the command line doesn't
# match across segments. For example, we want $matches for a<TAB>c to
# include abc/d, but not abd/c. If we don't have anything on the command
# line for this segment, though, we can skip it. (The difference is only
# noticeable when there are a huge number of possibilities)
[[ -n $pre$suf ]] &&
matches=( ${(@M)matches:#(${(j<|>)~${(@b)tmp1}})*} )
if ! zstyle -t ":completion:${curcontext}:" expand suffix ||
[[ -n "$menu" || -z "$compstate[insert]" ]]; then