Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
umount /f/b<TAB> → /foo/bar
- X-seq: zsh-workers 39070
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: umount /f/b<TAB> → /foo/bar
- Date: Fri, 19 Aug 2016 15:56:51 +0000
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=Qe3yXi00DrLVpE2Y5lEbS6W6UAI=; b=Tj1ZP4 LFmq+OjbtuIEFjGhq4AVNR9eTkVEeQSjTdzgUEaeJ7VHAFcj0oDByK9ccRk9E8A8 mXLjJLVKLqaaKSCtvVFUuvGqWO3i2eykMxy+XmlFN4mDKbDNB3BcEAt8rzUL36ls ycrY+tGlrjXofVeYlQQI5TJiRSm8akYDVMlnw=
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=Qe3yXi00DrLVpE2Y5lEbS6W6UAI=; b=YX77R fVtsOKfXVwwJjMChZ33EOEdeqBYz7/GhIV0Pl2SVESA6WatFDOGVP2AbDZpGYt3j xQOedLT6ou+/Mn5Sw7W0qLVRjo5oa5jQVVxIgUxzC/ffSwhR2bJALN7WOEZhZFrS 2twgx7vZCs414aawci2srzTpsKbQGuXTczoLwI=
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
I'd like «umount /f/b<TAB>» to complete to «umount /foo/bar». Currently
it doesn't, due to _canonical_paths_add_paths() doing its own matching
obliviously to matchspecs in effect.
I tried to patch this. I got it partly working: with the following
patch, «umount /f/b<TAB>» would honour matchspecs but «umount ../f/b<TAB>»
would not. See the '###' comment within for the point I'm stuck at.
Hints?
Cheers,
Daniel
[[[
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index a3b58bb..a43085a 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -965,8 +965,8 @@ udevordir)
_alternative \
'device-labels:device label:compadd -a dev_tmp' \
- 'device-paths: device path:_canonical_paths -A dpath_tmp -N device-paths device\ path' \
- 'directories:mount point:_canonical_paths -A mp_tmp -N directories mount\ point' && ret=0
+ 'device-paths: device path:_canonical_paths -A dpath_tmp -N -M "r:|/=* r:|=*" device-paths device\ path' \
+ 'directories:mount point:_canonical_paths -A mp_tmp -N -M "r:|/=* r:|=*" directories mount\ point' && ret=0
;;
labels)
_wanted labels expl 'disk label' compadd /dev/disk/by-label/*(:t) && ret=0
diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths
index 2fdbaa6..542f418 100644
--- a/Completion/Unix/Type/_canonical_paths
+++ b/Completion/Unix/Type/_canonical_paths
@@ -59,6 +59,11 @@ _canonical_paths_get_canonical_path() {
}
_canonical_paths_add_paths () {
+ # origpref = original prefix
+ # expref = expanded prefix
+ # curpref = current prefix
+ # canpref = canonical prefix
+ # rltrim = suffix to trim and readd
local origpref=$1 expref rltrim curpref canpref subdir
[[ $2 != add ]] && matches=()
expref=${~origpref} 2>/dev/null
@@ -73,13 +78,34 @@ _canonical_paths_add_paths () {
[[ $curpref == */ && $canpref == *[^/] ]] && canpref+=/
canpref+=$rltrim
[[ $expref == *[^/] && $canpref == */ ]] && origpref+=/
- matches+=(${${(M)files:#$canpref*}/$canpref/$origpref})
+
+ # Append to $matches the subset of $files that matches $canpref.
+ if [[ $canpref == $origpref ]]; then
+ # This codepath honours any -M matchspec parameters.
+ () {
+ local -a tmp_buffer
+ compadd -A tmp_buffer "$__gopts[@]" -a files
+ matches+=( "${(@)tmp_buffer/$canpref/$origpref}" )
+ }
+ else
+ # ### Ideally, this codepath would do what the 'if' above does,
+ # ### but telling compadd to pretend the "word on the command line"
+ # ### is ${"the word on the command line"/$origpref/$canpref}.
+ matches+=(${${(M)files:#$canpref*}/$canpref/$origpref})
+ fi
+
for subdir in $expref?*(@); do
_canonical_paths_add_paths ${subdir/$expref/$origpref} add
done
}
_canonical_paths() {
+ # The following parameters are used by callee functions:
+ # __gopts
+ # matches
+ # files
+ # (possibly others)
+
local __index
typeset -a __gopts __opts
]]]
Messages sorted by:
Reverse Date,
Date,
Thread,
Author