completing commands

completing commands

[Peter Stephenson]

When I try to complete a command word with a path I often get,

Completing executable file or directory
<list of directories>
Completing directory
<the same list of directories>

The second list comes from autocd --- it doesn't need to be the same
list, because it can use cdpath, but often it is the same list because
e.g. I typed ./ first.  Any thoughts about fixing this?  I suspect it's
not trivial because it needs completion functions to be aware of one
another.

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 692070


**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential 
and/or privileged material. 
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by 
persons or entities other than the intended recipient is 
prohibited.  
If you received this in error, please contact the sender and 
delete the material from any computer.
**********************************************************************

PATCH: Re: completing commands

[Oliver Kiddle]

Peter wrote:
> When I try to complete a command word with a path I often get,
> 
> Completing executable file or directory
> <list of directories>
> Completing directory
> <the same list of directories>
> 
> The second list comes from autocd --- it doesn't need to be the same
> list, because it can use cdpath, but often it is the same list because
> e.g. I typed ./ first.  Any thoughts about fixing this?  I suspect it's
> not trivial because it needs completion functions to be aware of one
> another.

In addition to that, it refuses to complete local directories in the
current directory.

There was some effort in _cd to handle the issue but it didn't go far
enough. I think this patch solves the problem.

Index: Completion/Zsh/Command/_cd
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Command/_cd,v
retrieving revision 1.6
diff -u -r1.6 _cd
--- Completion/Zsh/Command/_cd	30 Jan 2002 08:47:55 -0000	1.6
+++ Completion/Zsh/Command/_cd	3 Sep 2003 13:31:19 -0000
@@ -67,14 +67,15 @@
     # Don't complete local directories in command position, that's
     # already handled by _command_names (see _autocd)
 
-    [[ CURRENT -ne 1 ]] &&
+    [[ CURRENT -ne 1 || ( -z "$path[(r).]" && $PREFIX != */* ) ]] &&
         alt=( "${cdpath+local-}directories:${cdpath+local }directory:_path_files -/" "$alt[@]" )
 
     _alternative "$alt[@]" && ret=0
 
     return ret
   fi
-  _wanted directories expl directory _path_files -/ && ret=0
+  [[ CURRENT -ne 1 ]] && _wanted directories expl directory \
+      _path_files -/ && ret=0
 
   return ret
 fi

Re: completing commands

[Bart Schaefer]

On Sep 3, 11:44am, Peter Stephenson wrote:
}
} Completing executable file or directory
} <list of directories>
} Completing directory
} <the same list of directories>
} 
} The second list comes from autocd --- it doesn't need to be the same
} list, because it can use cdpath, but often it is the same list because
} e.g. I typed ./ first.  Any thoughts about fixing this?

zstyle ':completion:*:*:-command-:*:directories' group-name executables

Re: PATCH: Re: completing commands

[Bart Schaefer]

On Sep 3,  3:57pm, Oliver Kiddle wrote:
}
} In addition to that, it refuses to complete local directories in the
} current directory.

Really?  I get them completed in 4.0.6, even without your patch.  Can
you show an example of the before and after behavior?

Re: PATCH: Re: completing commands

[Oliver Kiddle]

Bart wrote:
> On Sep 3,  3:57pm, Oliver Kiddle wrote:
> }
> } In addition to that, it refuses to complete local directories in the
> } current directory.
> 
> Really?  I get them completed in 4.0.6, even without your patch.  Can
> you show an example of the before and after behavior?

I get them completed in 4.0 too.

The cause is the last part of 15945. It prevents (in _cd) local
directory completion in command completion because "that's already
handled by _command_names". However, if you look at _command_names, you
will see that it only completes directories if  
  [[ -n "$path[(r).]" || $PREFIX = */* ]]

So my patch makes _cd again complete local directories when that
condition is not true.

That part of 15945 was an attempt to solve the problem Peter reported
but it only covered one of the two places where _cd was completing
directories.

Oliver