Browse Source

completion: zsh: simplify compadd functions

We don't need to override IFS, zsh has a native way of splitting by new
lines: the expansion flag (f).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 4 years ago committed by Junio C Hamano
parent
commit
2f459b0060
  1. 15
      contrib/completion/git-completion.zsh

15
contrib/completion/git-completion.zsh

@ -100,9 +100,8 @@ __gitcomp_direct ()
{ {
emulate -L zsh emulate -L zsh


local IFS=$'\n'
compset -P '*[=:]' compset -P '*[=:]'
compadd -Q -- ${${=1}% } && _ret=0 compadd -Q -- ${${(f)1}% } && _ret=0
} }


__gitcomp_direct_append () __gitcomp_direct_append ()
@ -114,34 +113,30 @@ __gitcomp_nl ()
{ {
emulate -L zsh emulate -L zsh


local IFS=$'\n'
compset -P '*[=:]' compset -P '*[=:]'
compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
} }


__gitcomp_nl_append () __gitcomp_nl_append ()
{ {
emulate -L zsh emulate -L zsh


local IFS=$'\n'
compset -P '*[=:]' compset -P '*[=:]'
compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
} }


__gitcomp_file_direct () __gitcomp_file_direct ()
{ {
emulate -L zsh emulate -L zsh


local IFS=$'\n' compadd -f -- ${(f)1} && _ret=0
compadd -f -- ${=1} && _ret=0
} }


__gitcomp_file () __gitcomp_file ()
{ {
emulate -L zsh emulate -L zsh


local IFS=$'\n' compadd -p "${2-}" -f -- ${(f)1} && _ret=0
compadd -p "${2-}" -f -- ${=1} && _ret=0
} }


__git_zsh_bash_func () __git_zsh_bash_func ()

Loading…
Cancel
Save