Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: PATCH Re: squeeze-slashes false not working?



On 14 May 2011 07:58, Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx> wrote:
> On May 13, 10:07pm, Mikael Magnusson wrote:
> }
> } Okay, I'll try to sum up :). Starting from zsh -f + compinit, with
> } path-files on and squeeze-slashes off (the default), I get this
> } behaviour: ls ////<tab> jumps back to the first slash and allows me to
> } complete components in /.
>
> Yep, I get that too.  But once something is completed (e.g. /home///),
> subsequent completions treat the trailing "///" as if it were a
> single slash.  This certainly contradicts the assertion in the doc
> for squeeze-slashes that by default it behaves as if /*/*/.
>
> } With the same and path-files off, it simply behaves as if I had ls
> } /<tab>, ie it completes components in / after the four slashes.
>
> You mean path-completion off, but yes.  In this case it *should* be
> happening this way because

So maybe the squeeze-slashes entry should mention something to the
effect that disabling it will only allow other options to do stuff,
but maybe nothing will. But in a less stupid way.

> } squeeze-slashes on and path-completion on behaves as the second case.
> } squeeze-slashes on and path-completion off behaves the same way.
>
> These are as expected.  Once it has skipped the slashes there's nothing
> for path-completion to act upon.

Right, just wanted to be complete. :)

> } When I type ls /*/*/<tab>, all paths matching that glob are inserted
> } on the command line, this does not equal any of the above results.
>
> Red herring.  Tab is expand-or-complete and as soon as you explicitly
> put in glob characters you're invoking the "expand" instead of the
> "complete".

I retried this with bindkey '^I' complete-word; setopt globcomplete.
With or without your patch, ls /*/*/cit completes to
/home/mikachu/citat and /home/mikachu/citat-private and lets me cycle
between them. Without your patch, ls ///cit completes to /tmp/citat
and /tmp/citat.private. With your patch, ls ///cit acts as /*/*/cit
did, which makes me happy. All of this of course with squeeze-slashes
off and path-completion on.

[snip explainy bits as i have nothing helpful to add]

> So try this; but there may be other places where similar things have
> been missed as this function evolved ...
>
> Index: Completion/Unix/Type/_path_files
> ===================================================================
> RCS file: /extra/cvsroot/zsh/zsh-4.0/Completion/Unix/Type/_path_files,v
> retrieving revision 1.23
> diff -u -r1.23 _path_files
> --- Completion/Unix/Type/_path_files    6 May 2011 15:29:05 -0000       1.23
> +++ Completion/Unix/Type/_path_files    14 May 2011 05:53:20 -0000
> @@ -574,7 +574,7 @@
>     # slash be added.
>
>     tmp1=( ${tmp1//(#b)([][()|*?^#~<>\\=])/\\${match[1]}} )
> -    tmp2="${(M)tpre##((.|..|)/)##}"
> +    tmp2="${(M)tpre##${~skips}}"
>     if [[ -n "$tmp2" ]]; then
>       skipped="/$tmp2"
>       tpre="${tpre#$tmp2}"

This seems to work great in my zsh -f. My next project is working out
why none of this helps with my zshrc loaded :). Thanks.

-- 
Mikael Magnusson



Messages sorted by: Reverse Date, Date, Thread, Author