diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-02-23 00:10:24 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-02-23 00:10:24 +0000 |
| commit | 485a008075ce19bfdf19922c803d1637ebb5255e (patch) | |
| tree | fce4fa1a9d5ca8b236760b8c9b05bb06e7d9a801 /Completion/Unix/Type/_path_files | |
| parent | 21307324337a613ef53e437219ddcbc3f3bb53ff (diff) | |
| download | zsh-485a008075ce19bfdf19922c803d1637ebb5255e.tar.gz zsh-485a008075ce19bfdf19922c803d1637ebb5255e.tar.xz zsh-485a008075ce19bfdf19922c803d1637ebb5255e.zip | |
24585: completion for glob qualifiers plus
bug fix for _alternative
Diffstat (limited to 'Completion/Unix/Type/_path_files')
| -rw-r--r-- | Completion/Unix/Type/_path_files | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files index 4176005c3..e75e81efd 100644 --- a/Completion/Unix/Type/_path_files +++ b/Completion/Unix/Type/_path_files @@ -6,8 +6,9 @@ local linepath realpath donepath prepath testpath exppath skips skipped local tmp1 tmp2 tmp3 tmp4 i orig eorig pre suf tpre tsuf opre osuf cpre local pats haspats ignore pfx pfxsfx sopt gopt opt sdirs ignpar cfopt listsfx -local nm=$compstate[nmatches] menu matcher mopts sort match mid accex fake +local nm=$compstate[nmatches] menu matcher mopts sort mid accex fake local listfiles listopts tmpdisp +local -a match mbegin mend typeset -U prepaths exppaths @@ -349,7 +350,19 @@ for prepath in "$prepaths[@]"; do tmp2=( "$tmp1[@]" ) - if [[ "$tpre$tsuf" = */* ]]; then + # Look for glob qualifiers. + # Extra nastiness to be careful about a quoted parenthesis. + # The initial tests look for parentheses with zero or an + # even number of backslashes in front. + # The later test looks for an outstanding quote. + if [[ ( -o bareglobqual && \ + "$tpre/$tsuf" = (#b)((*[^\\]|)(\\\\)#\()([^\)]#) || \ + -o extendedglob && \ + "$tpre/$tsuf" = (#b)((*[^\\]|)(\\\\)#"(#q")([^\)]#) \ + ) && -z $compstate[quote] ]]; then + compset -p ${#match[1]} + _globquals + elif [[ "$tpre$tsuf" = */* ]]; then compfiles -P$cfopt tmp1 accex "$skipped" "$_matcher $matcher[2]" "$sdirs" fake elif [[ "$sopt" = *[/f]* ]]; then compfiles -p$cfopt tmp1 accex "$skipped" "$_matcher $matcher[2]" "$sdirs" fake "$pats[@]" |