[PATCH] Re: zsh completion for umount

[PATCH] Re: zsh completion for umount

[Bart Schaefer]

On Oct 31, 12:47am, Bart Schaefer wrote:
}
} "_canonical_paths_add_path $PREFIX" is called which, if prefix is not
} empty, tries calling zstat to see if it is a real file.  Of course
} this fails because it's not a file, it's only a prefix of a filename

OK, this is a lot better:

diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths
index 9bccc7f..dde41f3 100644
--- a/Completion/Unix/Type/_canonical_paths
+++ b/Completion/Unix/Type/_canonical_paths
@@ -69,7 +69,10 @@ _canonical_paths_add_paths () {
   expref=${~origpref} 2>/dev/null
   [[ $origpref == (|*/). ]] && rltrim=.
   curpref=${${expref%$rltrim}:-./}
-  if zstat $curpref >&/dev/null; then
+  if [[ $expref:h == (.|..) ]]; then
+    _canonical_paths_pwd $expref:h
+    canpref=$REPLY/$expref:t
+  elif zstat $curpref >&/dev/null; then
     _canonical_paths_get_canonical_path $curpref
     canpref=$REPLY
   else


The remaining problem is that _canonical_paths_pwd screws up "cd -" and
friends by frobbing the directory stack with pushd/popd.  I may go back
to that in another thread.

Re: [PATCH] Re: zsh completion for umount

[Fourhundred Thecat]

> On Oct 31, 12:47am, Bart Schaefer wrote:
> OK, this is a lot better:
> 
> diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths
> index 9bccc7f..dde41f3 100644
> --- a/Completion/Unix/Type/_canonical_paths
> +++ b/Completion/Unix/Type/_canonical_paths
> @@ -69,7 +69,10 @@ _canonical_paths_add_paths () {
>    expref=${~origpref} 2>/dev/null
>    [[ $origpref == (|*/). ]] && rltrim=.
>    curpref=${${expref%$rltrim}:-./}
> -  if zstat $curpref >&/dev/null; then
> +  if [[ $expref:h == (.|..) ]]; then
> +    _canonical_paths_pwd $expref:h
> +    canpref=$REPLY/$expref:t
> +  elif zstat $curpref >&/dev/null; then
>      _canonical_paths_get_canonical_path $curpref
>      canpref=$REPLY
>    else
> 

works great !

thanks for the quick fix

Cheers,

Re: [PATCH] Re: zsh completion for umount

[Bart Schaefer]

On Oct 31,  8:06am, Bart Schaefer wrote:
}
} The remaining problem is that _canonical_paths_pwd screws up "cd -"

Patch below attempts to fix that.

This whole file relies on native zsh mode, but never declares that anywhere
I guess that's OK as long as always called from completion.


diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths
index 6482602..4b6b0c0 100644
--- a/Completion/Unix/Type/_canonical_paths
+++ b/Completion/Unix/Type/_canonical_paths
@@ -16,11 +16,13 @@
 _canonical_paths_pwd() {
   # Get the canonical directory name by changing to it.
   integer chaselinks
+  local oldpwd=$OLDPWD
   [[ -o chaselinks ]] && (( chaselinks = 1 ))
-  setopt localoptions nopushdignoredups chaselinks
+  setopt localoptions nopushdignoredups chaselinks noautopushd
   if builtin pushd -q -- $1 2>/dev/null; then
     REPLY=$PWD
     (( chaselinks )) || unsetopt chaselinks
+    [[ -n $oldpwd && -d $oldpwd ]] && builtin cd -q $oldpwd	# For "cd -"
     builtin popd -q
   else
     REPLY=$1

Re: [PATCH] Re: zsh completion for umount

[Daniel Shahaf]

Bart Schaefer wrote on Mon, Oct 31, 2016 at 12:32:52 -0700:
> On Oct 31,  8:06am, Bart Schaefer wrote:
> }
> } The remaining problem is that _canonical_paths_pwd screws up "cd -"
> 
> Patch below attempts to fix that.
> 
> diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths
> index 6482602..4b6b0c0 100644
> --- a/Completion/Unix/Type/_canonical_paths
> +++ b/Completion/Unix/Type/_canonical_paths
> @@ -16,11 +16,13 @@
>  _canonical_paths_pwd() {
>    # Get the canonical directory name by changing to it.
>    integer chaselinks
> +  local oldpwd=$OLDPWD
>    [[ -o chaselinks ]] && (( chaselinks = 1 ))
> -  setopt localoptions nopushdignoredups chaselinks
> +  setopt localoptions nopushdignoredups chaselinks noautopushd
>    if builtin pushd -q -- $1 2>/dev/null; then
>      REPLY=$PWD
>      (( chaselinks )) || unsetopt chaselinks
> +    [[ -n $oldpwd && -d $oldpwd ]] && builtin cd -q $oldpwd	# For "cd -"
>      builtin popd -q

Couldn't we avoid calling pushd/cd entirely?  I.e., something along the
lines of

    if [[ -o chaselinks ]]; then REPLY=$1:A; else REPLY=$1:P; fi

?

>    else
>      REPLY=$1
>