diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-09-28 17:46:37 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-10-07 13:56:31 +0000 |
| commit | 7ad0001183688c56bd1edfc8fc08467e380910a4 (patch) | |
| tree | 7df8833fee6f39f5a77dacec68f5824077418886 /Completion/Zsh | |
| parent | a96e34b459d55240b0f4af37ac73aca916720883 (diff) | |
| download | zsh-7ad0001183688c56bd1edfc8fc08467e380910a4.tar.gz zsh-7ad0001183688c56bd1edfc8fc08467e380910a4.tar.xz zsh-7ad0001183688c56bd1edfc8fc08467e380910a4.zip | |
39479 + 39481 minus _path_files hunk (see 39489): Completion: audit 'compset -P' calls to use shortest match where applicable, plus random drive-by tweaks.
Found by grepping for patterns that can match needles of various lengths:
:grep 'compset -[PS].*[\#^*()\|<>?~\]' Completion/
Diffstat (limited to 'Completion/Zsh')
| -rw-r--r-- | Completion/Zsh/Command/_fc | 2 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_arrays | 2 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_globflags | 3 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_ps1234 | 3 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_vars | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/Completion/Zsh/Command/_fc b/Completion/Zsh/Command/_fc index 68456cc3d..b90436a01 100644 --- a/Completion/Zsh/Command/_fc +++ b/Completion/Zsh/Command/_fc @@ -68,7 +68,7 @@ esac if [[ -n $state ]]; then zstyle -s ":completion:${curcontext}:" list-separator sep || sep=-- - if [[ -z ${line:#*=*} ]] && compset -P '*='; then + if [[ -z ${line:#*=*} ]] && compset -P 1 '*='; then _message -e replacements 'replacement' elif [[ -prefix [0-9] ]]; then events=( ${(0)"$(printf "%-${#HISTNO}.${#HISTNO}s $sep %s\0" "${(kv)history[@]}")"} ) diff --git a/Completion/Zsh/Type/_arrays b/Completion/Zsh/Type/_arrays index 24c8957e8..c28fb179e 100644 --- a/Completion/Zsh/Type/_arrays +++ b/Completion/Zsh/Type/_arrays @@ -2,4 +2,4 @@ local expl -_wanted arrays expl array _parameters "$@" - -g '*array*' +_wanted arrays expl array _parameters "$@" -g '*array*' diff --git a/Completion/Zsh/Type/_globflags b/Completion/Zsh/Type/_globflags index 5833dc8f1..13ef14c17 100644 --- a/Completion/Zsh/Type/_globflags +++ b/Completion/Zsh/Type/_globflags @@ -1,5 +1,8 @@ #autoload +# Complete 'globbing flags', i.e., '(#x)'; everything up to the '#' will +# have been "compset -P"'d by the caller. + local ret=1 local -a flags diff --git a/Completion/Zsh/Type/_ps1234 b/Completion/Zsh/Type/_ps1234 index 8edf0d0cb..0671cebb2 100644 --- a/Completion/Zsh/Type/_ps1234 +++ b/Completion/Zsh/Type/_ps1234 @@ -58,11 +58,14 @@ if compset -P '%[FK]'; then fi if compset -P '%[0-9-\\]#(\\|)\([0-9-]#[^0-9]'; then + # ternary conditional: first delimiter compset -S '*' _delimiters && ret=0 elif compset -P '%[0-9-\\]#[<>\]]'; then + # truncation _message -e replacements 'replacement string' elif compset -P '%[0-9-\\]#(\\|)\([0-9-]#'; then + # ternary conditional: condition character compset -S '[.:+/-%]*' || suf=( -S . ) compset -S '*' specs=( diff --git a/Completion/Zsh/Type/_vars b/Completion/Zsh/Type/_vars index 0f97d6cda..ec59c03be 100644 --- a/Completion/Zsh/Type/_vars +++ b/Completion/Zsh/Type/_vars @@ -1,7 +1,7 @@ #compdef getopts unset # This will handle completion of keys of associative arrays, e.g. at -# `vared foo[<TAB>'. +# `vared foo[<TAB>' could complete to `vared foo[key]'. local ret=1 |