mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2026-01-01 20:11:06 +01:00
Code Releases Activity

zsh-workers/10230

Browse source
This commit is contained in:
Tanaka Akira 2000-03-24 12:35:07 +00:00
parent ad108b3277
commit a2876b6db3
14 changed files with 110 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Completion/Builtins/_zstyle
View file

@ -49,7 +49,6 @@ styles=(
packageset c:packageset
path 'c:_wanted directories expl directory _path_files -/'
ports c:_ports
prefer-ignored c:bool
prefix-hidden c:bool
prefix-needed c:bool
prompt c:
@ -215,7 +214,7 @@ while [[ -n $state ]]; do
;;
single-ignored)
_wanted values expl 'how to handle single alternate match' \
_wanted values expl 'how to handle a single ignored match' \
compadd - show menu
;;

5
Completion/Core/_description
View file

@ -29,8 +29,9 @@ zstyle -s ":completion:${curcontext}:$1" matcher match &&
opts=($opts -M "${(q)match}")
[[ -n "$_matcher" ]] && opts=($opts -M "${(q)_matcher}")
if zstyle -a ":completion:${curcontext}:$1" ignored-patterns _comp_ignore; then
opts=( $opts -F _comp_ignore)
if [[ -z "$_comp_no_ignore" ]] &&
zstyle -a ":completion:${curcontext}:$1" ignored-patterns _comp_ignore; then
opts=( $opts -F _comp_ignore )
else
_comp_ignore=()
fi

32
Completion/Core/_ignored Normal file
View file

@ -0,0 +1,32 @@
#autoload
# Use ignored matches.
(( $compstate[ignored] )) || return 1
local curcontext="${curcontext/:[^:]#:/:ignored-${(M)#_completers[1,_completer_num]:#_ignored}:}"
local comp i _comp_no_ignore=yes tmp expl
zstyle -a ":completion:${curcontext}:" completer comp ||
comp=( "${(@)_completers[1,_completer_num-1][(R)_ignored,-1]}" )
for i in "$comp[@]"; do
if [[ "$i" != _ignored ]] && "$i"; then
if zstyle -s ":completion:${curcontext}:" single-ignored tmp &&
[[ $compstate[old_list] != shown && $compstate[nmatches] -eq 1 ]]; then
case "$tmp" in
show) compstate[insert]='' compstate[list]='list force' tmp='' ;;
menu)
compstate[insert]=menu
_description original expl original
compadd "$expl[@]" -S '' - "$PREFIX$SUFFIX"
;;
*) tmp='' ;;
esac
fi
return 0
fi
done
return 1

36
Completion/Core/_main_complete
View file

@ -19,7 +19,7 @@
setopt localoptions nullglob rcexpandparam extendedglob
unsetopt markdirs globsubst shwordsplit nounset ksharrays
local ctxt func funcs ret=1 tmp _compskip format _comp_ignore \
local func funcs ret=1 tmp _compskip format _comp_ignore \
_completers _completer _completer_num curtag \
_matchers _matcher _matcher_num _comp_tags \
context state line opt_args val_args curcontext="$curcontext" \
@ -61,7 +61,8 @@ _last_menu_style=()
# Get the names of the completers to use in the positional parameters.
(( $# )) || zstyle -a ":completion:${curcontext}:" completer argv || set _complete
(( $# )) || zstyle -a ":completion:${curcontext}:" completer argv ||
set _complete
# And now just call the completer functions defined.
@ -77,14 +78,8 @@ for func in "$funcs[@]"; do
done
for _completer; do
ctxt=":completion:${curcontext/::/:${_completer[2,-1]}-${(M)#_completers[1,_completer_num]:#$_completer}:}:"
if zstyle -t "$ctxt" prefer-ignored && (( $compstate[alternate_nmatches] )); then
ret=0
break;
fi
zstyle -a "$ctxt" matcher-list _matchers ||
zstyle -a ":completion:${curcontext/::/:${_completer[2,-1]}-${(M)#_completers[1,_completer_num]:#$_completer}:}:" matcher-list _matchers ||
_matchers=( '' )
_matcher_num=1
@ -98,26 +93,9 @@ for _completer; do
(( _completer_num++ ))
done
if zstyle -s ":completion:${curcontext}:" single-ignored tmp &&
[[ $compstate[old_list] != shown &&
$compstate[alternate_nmatches] = 1 ]]; then
case "$tmp" in
show) compstate[insert]='' compstate[list]='list force' tmp='' ;;
menu)
local expl
compstate[insert]='menu'
_description original expl original
compadd "$expl[@]" -a -S '' - "$PREFIX$SUFFIX"
;;
*) tmp='' ;;
esac
fi
if [[ -n "$tmp" || $compstate[old_list] = keep ||
$compstate[nmatches]+$compstate[alternate_nmatches] -gt 1 ]]; then
[[ _last_nmatches -ge 0 &&
_last_nmatches -ne $compstate[nmatches]+$compstate[alternate_nmatches] ]] &&
$compstate[nmatches] -gt 1 ]]; then
[[ _last_nmatches -ge 0 && _last_nmatches -ne $compstate[nmatches] ]] &&
_menu_style=( "$_last_menu_style[@]" "$_menu_style[@]" )
if [[ "$compstate[insert]" = "$_saved_insert" ]]; then
@ -170,7 +148,7 @@ if [[ -n "$tmp" || $compstate[old_list] = keep ||
fi
fi
fi
elif [[ $compstate[nmatches]+$compstate[alternate_nmatches] -eq 0 &&
elif [[ $compstate[nmatches] -eq 0 &&
$#_lastdescr -ne 0 && $compstate[old_list] != keep ]] &&
zstyle -s ":completion:${curcontext}:warnings" format format; then

7
Completion/Core/_path_files
View file

@ -142,8 +142,9 @@ eorig="$orig"
# If given no `-F' option, we may want to use $fignore, turned into patterns.
[[ $#ignore -eq 0 && ( -z $gopt || "$pats" = \ #\*\ # ) && -n $FIGNORE ]] &&
ignore=( "?*${^fignore[@]}" )
[[ -z "$_comp_no_ignore" && $#ignore -eq 0 &&
( -z $gopt || "$pats" = \ #\*\ # ) && -n $FIGNORE ]] &&
ignore=( "?*${^fignore[@]}" )
if (( $#ignore )); then
_comp_ignore=( "$_comp_ignore[@]" "$ignore[@]" )
@ -350,7 +351,7 @@ for prepath in "$prepaths[@]"; do
continue 2
fi
if [[ "$tpre$tsuf" != */* && $#tmp1 -ne 0 ]] &&
if [[ -z "$_comp_no_ignore" && "$tpre$tsuf" != */* && $#tmp1 -ne 0 ]] &&
zstyle -s ":completion:${curcontext}:files" ignore-parents rem &&
[[ ( "$rem" != *dir* || "$pats" = '*(-/)' ) &&
( "$rem" != *..* || "$tmp1" = *../* ) ]]; then

2
Completion/Core/_prefix
View file

@ -7,7 +7,7 @@
local curcontext="${curcontext/:[^:]#:/:prefix-${(M)#_completers[1,_completer_num]:#_prefix}:}" comp i
zstyle -a ":completion:${curcontext}:" completer comp ||
comp=( "${(@)_completers[1,_completer_num][(R)_prefix,-1]}" )
comp=( "${(@)_completers[1,_completer_num-1][(R)_prefix,-1]}" )
if zstyle -t ":completion:${curcontext}:" add-space; then
ISUFFIX=" $SUFFIX"

2
Completion/Core/_setup
View file

@ -54,7 +54,7 @@ fi
_menu_style=( "$_last_menu_style[@]" "$_menu_style[@]" )
if zstyle -a ":completion:${curcontext}:$1" menu val; then
_last_nmatches=$(( $nm + $compstate[alternate_nmatches] ))
_last_nmatches=$nm
_last_menu_style=( "$val[@]" )
else
_last_nmatches=-1

55
Doc/Zsh/compsys.yo
View file

@ -979,8 +979,9 @@ if the value contains the string tt(directory), then the tests will
only be performed if only names of directories are completed.
Note that names of directories ignored because of one of the tests
will be placed in the alternate set of completions so that they will
be completed if there are no other possible completions.
will be ignored in the same way as the matches ignored because of the
tt(ignored-patterns) style. I.e. by using the tt(_ignored) completer
it is possible to complete these directories nonetheless.
)
item(tt(ignored-patterns))(
This style is used with the tags used when adding matches and defines a
@ -1283,26 +1284,6 @@ A style holding the service names of ports to complete. If this is
not set by the user, the service names from `tt(/etc/services)' will
be used.
)
item(tt(prefer-ignored))(
This style is tested by the main completion function before calling a
completer. The context name is formed in the same way as for the
tt(matcher-list) style, i.e. it contains the name of the completer
that will be called plus a hyphen and the number of the call to that
completer.
If the style is set to true and completion did not generate any normal
matches yet, but there are matches that were ignored because they
matched one of the patterns given with the tt(fignore) array or the
tt(ignored-patterns) style, these ignored matches are used immediatly
and no other completer will be called.
It is sometimes useful to set this style for the tt(correct) or
tt(approximate) completer so that ignored matches are prefered over
corrections.
example(zstyle ':completion:*:complete-2:*' prefer-ignored yes
zstyle ':completion:*:(correct|approximate)-1:*' prefer-ignored yes)
)
item(tt(prefix-hidden))(
This is used when matches with a common prefix are added (e.g. option
names). If it is `true', this prefix will not be shown in the list of
@ -1330,11 +1311,8 @@ matches have no common prefix different from the word on the line or
if there is such a common prefix, respectively. The sequence `tt(%c)'
is replaced by the name of the completer function that generated the
matches (without the leading underscore). Finally, `tt(%n)' is
replaced by the number of matches generated, `tt(%a)' is replaced by
an empty string if the matches are in the normal set (i.e. the one
without file names with one of the suffixes from the
tt(ignored-suffixes) style) and with `tt( -alt-)' if the matches are
in the alternate set, and if the tt(list) style is set, `tt(%l)' is
replaced by the number of matches generated
and if the tt(list) style is set, `tt(%l)' is
replaced by `tt(...)' if the list of matches is too long to fit on the
screen and with an empty string otherwise. If the tt(list) style is
`false', `tt(%l)' will always be removed.
@ -1345,12 +1323,9 @@ all duplicate matches should be removed, rather than just consecutive
duplicates.
)
item(tt(single-ignored))(
Using styles like tt(ignored-patterns) allows one to put some matches
in the alternate set of matches which is only used if there are no
`normal' matches. Having only one such normally ignored match is often
a special case because one probably doesn't want that match to be
inserted immediatly. This style allows to configure what to do in such
a case. If its value is tt(show), the single match will only be shown,
This is used by the tt(_ignored) completer. It allows to specify what
should be done if it can generate only one match, which is often a
special case. If its value is tt(show), the single match will only be shown,
not inserted. If the value is tt(menu), then the single match and the
original string are both added as matches and menucompletion is
started so that one can easily select either of them.
@ -1837,6 +1812,20 @@ tt(COMPLETE_IN_WORD) option is set. Because otherwise the cursor will
be set after the word before the completion code is called and hence
there will be no suffix.
)
findex(_ignored)
item(tt(_ignored))(
Using the tt(ignored-patterns) style it is possible to make some
matches be ignored. This completer allows to complete these matches as
if no tt(ignored-patterns) style were set. Which completers are called
for this is determined in the same way as for the tt(_prefix)
completer.
Finally, tt(_ignored) uses the tt(single-ignored) style if only one
match could be generated. It can be set to tt(show) to make that match
be only displayed, not inserted into the line or it can be set to
tt(menu) to make the single match and the original string from the
line be offered in a menucompletion.
)
findex(_menu)
item(tt(_menu))(
This completer is a simple example function implemented to show how

31
Doc/Zsh/compwid.yo
View file

@ -197,15 +197,12 @@ level.
)
item(tt(nmatches))(
The number of matches generated and accepted by the completion code so
far, excluding those matches that are only accepted by ignoring the
tt(fignore) parameter and the tt(-a) option of the tt(compadd) builtin
command.
far.
)
item(tt(alternate_nmatches))(
Like tt(nmatches), but counts only matches in the alternate set. I.e. file
names with one of the suffixes from the tt(fignore) array and matches
put into the alternate set using the tt(-a) option of the tt(compadd)
builtin command (see below) are not counted.
item(tt(ignored))(
The number of words that were ignored because they matched one of the
patterns given with the tt(-F) option to the tt(compadd) builtin
command.
)
item(tt(restore))(
This is set to tt(auto) before a function is entered, which forces the
@ -518,23 +515,9 @@ with any prefix specified by the tt(-p) option to form a complete filename
for testing. Hence it is only useful if combined with the tt(-f) flag, as
the tests will not otherwise be performed.
)
item(tt(-a))(
The completion code may build two sets of matches: the normal and the
alternate set. Normally only the matches in the first set are used,
but if this set is empty, the words from the alternate set are
used. The completion code uses this mechanism, for example, to make
filenames without one of the suffixes defined with the tt(fignore)
shell parameter be preferred over filenames with one of these
suffixes.
With the tt(-a)-flag given, the var(words) are stored in the alternate
set unless this flag is overridden by the tt(-F) option.
)
item(tt(-F) var(array))(
Specifies an array containing patterns.
Words matching one of these patterns are stored in
the alternate set of matches and words that match none of the patterns
are stored in the normal set.
Specifies an array containing patterns. Words matching one of these
patterns are ignored, i.e. not considered to be possible matches.
The var(array) may be the name of an array parameter or a list of
literal patterns enclosed in parentheses and quoted, as in `tt(-F "(*?.o

16
Functions/Zle/incremental-complete-word
View file

@ -17,7 +17,7 @@ incremental-complete-word() {
unsetopt autolist menucomplete automenu # doesn't work well
local key lbuf="$LBUFFER" rbuf="$RBUFFER" pmpt pstr word
local lastl lastr wid twid num alt post toolong
local lastl lastr wid twid num post toolong
local curcontext="${curcontext}" stop brk
[[ -z "$curcontext" ]] && curcontext=:::
@ -41,10 +41,6 @@ incremental-complete-word() {
LBUFFER="$lbuf"
RBUFFER="$rbuf"
num=$_lastcomp[nmatches]
if (( ! num )); then
num="${_lastcomp[alternate_nmatches]}"
alt=' -alt-'
fi
if (( ! num )); then
word=''
state='-no match-'
@ -55,7 +51,7 @@ incremental-complete-word() {
word="${_lastcomp[unambiguous]}"
state=''
fi
zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" "a:$alt" \
zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \
"l:$toolong" "c:${_lastcomp[completer][2,-1]}"
zle -R "$pstr"
read -k key
@ -87,12 +83,6 @@ incremental-complete-word() {
LBUFFER="$lastl"
RBUFFER="$lastr"
num=$_lastcomp[nmatches]
if (( ! num )); then
num="${_lastcomp[alternate_nmatches]}"
alt=' -alt-'
else
alt=''
fi
if (( ! num )); then
word=''
state='-no match-'
@ -103,7 +93,7 @@ incremental-complete-word() {
word="${_lastcomp[unambiguous]}"
state=''
fi
zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" "a:$alt" \
zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \
"l:$toolong" "c:${_lastcomp[completer][2,-1]}"
zle -R "$pstr"
read -k key

15
Src/Zle/comp.h
View file

@ -229,10 +229,9 @@ struct menuinfo {
#define CAF_QUOTE 1
#define CAF_NOSORT 2
#define CAF_ALT 4
#define CAF_MATCH 8
#define CAF_UNIQCON 16
#define CAF_UNIQALL 32
#define CAF_MATCH 4
#define CAF_UNIQCON 8
#define CAF_UNIQALL 16
/* Data for compadd and addmatches() */
@ -351,12 +350,12 @@ typedef void (*CLPrintFunc)(Cmgroup, Cmatch *, int, int, int, int,
#define CP_OLDINS (1 << CPN_OLDINS)
#define CPN_VARED 20
#define CP_VARED (1 << CPN_VARED)
#define CPN_ANMATCHES 21
#define CP_ANMATCHES (1 << CPN_ANMATCHES)
#define CPN_LISTLINES 22
#define CPN_LISTLINES 21
#define CP_LISTLINES (1 << CPN_LISTLINES)
#define CPN_QUOTES 23
#define CPN_QUOTES 22
#define CP_QUOTES (1 << CPN_QUOTES)
#define CPN_IGNORED 23
#define CP_IGNORED (1 << CPN_IGNORED)
#define CP_KEYPARAMS 24
#define CP_ALLKEYS ((unsigned int) 0xffffff)

31
Src/Zle/compcore.c
View file

@ -307,6 +307,7 @@ do_completion(Hookdef dummy, Compldat dat)
hasmatched = hasunmatched = 0;
minmlen = 1000000;
maxmlen = -1;
compignored = 0;
/* Make sure we have the completion list and compctl. */
if (makecomplist(s, incmd, lst)) {
@ -1463,7 +1464,7 @@ addmatches(Cadata dat, char **argv)
int lpl, lsl, pl, sl, bcp = 0, bcs = 0, bpadd = 0, bsadd = 0;
int ppl = 0, psl = 0;
int llpl = 0, llsl = 0, nm = mnum, gflags = 0, ohp = haspattern;
int oisalt = 0, isalt, isexact, doadd, ois = instring, oib = inbackt;
int isexact, doadd, ois = instring, oib = inbackt;
Cline lc = NULL, pline = NULL, sline = NULL;
Cmatch cm;
struct cmlist mst;
@ -1743,7 +1744,6 @@ addmatches(Cadata dat, char **argv)
} else
dat->prpre = dupstring(dat->prpre);
/* Select the set of matches. */
oisalt = (dat->aflags & CAF_ALT);
if (dat->remf) {
dat->remf = dupstring(dat->remf);
@ -1761,7 +1761,7 @@ addmatches(Cadata dat, char **argv)
/* Walk through the matches given. */
obpl = bpl;
obsl = bsl;
if (!oisalt && (aign || pign)) {
if (aign || pign) {
int max = 0;
char **ap = argv;
@ -1780,9 +1780,8 @@ addmatches(Cadata dat, char **argv)
disp = NULL;
}
sl = strlen(s);
isalt = oisalt;
if (!isalt && (aign || pign)) {
int il = ppl + sl + psl;
if (aign || pign) {
int il = ppl + sl + psl, addit = 1;
if (ppl)
memcpy(ibuf, dat->ppre, ppl);
@ -1796,15 +1795,19 @@ addmatches(Cadata dat, char **argv)
char **pt = aign;
int filell;
for (isalt = 0; !isalt && *pt; pt++)
isalt = ((filell = strlen(*pt)) < il &&
!strcmp(*pt, ibuf + il - filell));
for (; addit && *pt; pt++)
addit = !((filell = strlen(*pt)) < il &&
!strcmp(*pt, ibuf + il - filell));
}
if (!isalt && pign) {
if (addit && pign) {
Patprog *pt = pign;
for (isalt = 0; !isalt && *pt; pt++)
isalt = pattry(*pt, ibuf);
for (; addit && *pt; pt++)
addit = !pattry(*pt, ibuf);
}
if (!addit) {
compignored++;
continue;
}
}
if (!(dat->aflags & CAF_MATCH)) {
@ -1832,7 +1835,7 @@ addmatches(Cadata dat, char **argv)
for (bp = obsl; bp; bp = bp->next)
bp->curpos += bsadd;
if ((cm = add_match_data(isalt, ms, lc, dat->ipre, NULL,
if ((cm = add_match_data(0, ms, lc, dat->ipre, NULL,
dat->isuf, dat->pre, dat->prpre,
dat->ppre, pline,
dat->psuf, sline,
@ -2175,6 +2178,8 @@ add_match_data(int alt, char *str, Cline line,
newmatches = 1;
mgroup->new = 1;
if (alt)
compignored++;
if (!complastprompt || !*complastprompt)
dolastprompt = 0;

17
Src/Zle/complete.c
View file

@ -36,7 +36,8 @@
mod_export zlong compcurrent;
/**/
zlong complistmax,
complistlines;
complistlines,
compignored;
/**/
mod_export
@ -476,9 +477,6 @@ bin_compadd(char *name, char **argv, char *ops, int func)
sp = &(dat.prpre);
e = "string expected after -%c";
break;
case 'a':
dat.aflags |= CAF_ALT;
break;
case 'M':
sp = &m;
e = "matching specification expected after -%c";
@ -912,9 +910,9 @@ static struct compparam compkparams[] = {
{ "old_list", PM_SCALAR, VAL(compoldlist), NULL, NULL },
{ "old_insert", PM_SCALAR, VAL(compoldins), NULL, NULL },
{ "vared", PM_SCALAR, VAL(compvared), NULL, NULL },
{ "alternate_nmatches", PM_INTEGER | PM_READONLY, NULL, NULL, VAL(get_anmatches) },
{ "list_lines", PM_INTEGER | PM_READONLY, NULL, NULL, VAL(get_listlines) },
{ "all_quotes", PM_SCALAR | PM_READONLY, VAL(compqstack), NULL, NULL },
{ "ignored", PM_INTEGER | PM_READONLY, VAL(compignored), NULL, NULL },
{ NULL, 0, NULL, NULL, NULL }
};
@ -1025,14 +1023,7 @@ set_compstate(Param pm, HashTable ht)
static zlong
get_nmatches(Param pm)
{
return num_matches(1);
}
/**/
static zlong
get_anmatches(Param pm)
{
return num_matches(0);
return (permmatches(0) ? 0 : nmatches);
}
/**/

16
Src/Zle/compresult.c
View file

@ -1102,22 +1102,6 @@ do_ambig_menu(void)
minfo.cur = mc;
}
/* Return the real number of matches. */
/**/
zlong
num_matches(int normal)
{
int alt;
alt = permmatches(0);
if (normal)
return (alt ? 0 : nmatches);
else
return (alt ? nmatches : 0);
}
/* Return the number of screen lines needed for the list. */
/**/