Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: [Pkg-zsh-devel] Bug#679824: zsh: Buggy perl completion with -e [origin: vincent@xxxxxxxxxx]
2014/06/30 22:02, Jun T. <takimoto-j@xxxxxxxxxxxxxxxxx> wrote:
> python -c '...' <TAB>
> ruby -e '...' <TAB>
>
> these will complete a command name, not a file name.
The following is a patch to fix this.
In the case of ruby, the current _ruby contains
'(-)1:script file:_files'
This means all files (foo.rb, bar.py, junk.c, etc.) are
offered as Ruby scripts, but I didn't change this in the
patch. I have no experience with ruby and don't know
what most ruby users expect here.
diff --git a/Completion/Unix/Command/_python b/Completion/Unix/Command/_python
index edc49b7..da84b30 100644
--- a/Completion/Unix/Command/_python
+++ b/Completion/Unix/Command/_python
@@ -24,12 +24,12 @@ fi
_arguments -C -s -S "$args[@]" \
"-B[don't write .py\[co\] files on import]" \
- '(1 -)-c+[program passed in as string (terminates option list)]:python command:' \
+ '(-)-c+[program passed in as string (terminates option list)]:python command:' \
'-d[debug output from parser]' \
'-E[ignore PYTHON* environment variables (such as PYTHONPATH)]' \
'(1 * -)-h[display help information]' \
'-i[inspect interactively after running script]' \
- '(1 * -)-m[run library module as a script (terminates option list)]:module:->modules' \
+ '(-)-m[run library module as a script (terminates option list)]:module:->modules' \
'-O[optimize generated bytecode slightly]' \
'-OO[remove doc-strings in addition to the -O optimizations]' \
"-s[don't add user site directory to sys.path]" \
@@ -39,16 +39,27 @@ _arguments -C -s -S "$args[@]" \
'(1 * -)-V[display version information]' \
'-W+[warning control]:warning filter (action\:message\:category\:module\:lineno):(default always ignore module once error)' \
'-x[skip first line of source, allowing use of non-Unix forms of #!cmd]' \
- '(-)1:script file:_files -g "*.py(|c|o)(-.)"' \
+ '(-)1:script_or_arg:->script_or_arg' \
'*::script argument: _normal' && return
-if [[ "$state" = modules ]]; then
- local -a modules
- modules=(
- ${${=${(f)"$(_call_program modules $words[1] -c \
- 'from\ pydoc\ import\ help\;\ help\(\"modules\"\)')"}[2,-3]}:#\(package\)}
- )
- _wanted modules expl module compadd -a modules && return
-fi
+case "$state" in
+ modules)
+ local -a modules
+ modules=(
+ ${${=${(f)"$(_call_program modules $words[1] -c \
+ 'from\ pydoc\ import\ help\;\ help\(\"modules\"\)')"}[2,-3]}:#\(package\)}
+ )
+ _wanted modules expl module compadd -a modules && return
+ ;;
+ script_or_arg)
+ if [[ -n "$opt_args[(I)-(c|m)]" ]]; then
+ _description arg expl 'file'
+ _files "$expl[@]" && return
+ else
+ _description script expl 'Python script'
+ _files "$expl[@]" -g "*.py(|c|o)(-.)" && return
+ fi
+ ;;
+esac
return 1
diff --git a/Completion/Unix/Command/_ruby b/Completion/Unix/Command/_ruby
index 03f4e60..80f92d5 100644
--- a/Completion/Unix/Command/_ruby
+++ b/Completion/Unix/Command/_ruby
@@ -8,7 +8,7 @@ typeset -A opt_args
local -a args opts
args=(
- '(-)1:script file:_files'
+ '(-)1:script or argument:->script_or_arg'
'*::script argument: _normal'
)
@@ -18,7 +18,7 @@ opts=(
'-c[check syntax only]'
'-C+[cd to directory, before executing your script]:directory:_files -/'
'(-d --debug)'{-d,--debug}'[set debugging flags (set $DEBUG to true)]'
- "(1)*-e+[one line of script (several -e's allowed, omit program file)]:one line of script:"
+ "*-e+[one line of script (several -e's allowed, omit program file)]:one line of script:"
'-F-[split() pattern for autosplit (-a)]:input field separator:'
'-i-[edit ARGV files in place (make backup if extension supplied)]:suffix for in-place-edit mode:(.bak)'
'*-I+[specify $LOAD_PATH directory (may be used more than once)]:library directory:_files -/'
@@ -67,6 +67,16 @@ case "$state" in
dirs=( $(_call_program directories $cmd -e 'puts\ \$:' 2>/dev/null) ${(s.:.)opt_args[-I]} )
_wanted libraries expl library _path_files -W dirs && ret=0
;;
+ script_or_arg)
+ if [[ -n "$opt_args[(I)-e]" ]]; then
+ _description arg expl 'file'
+ _files "$expl[@]" && ret=0
+ else
+ _description script expl 'Ruby script'
+ _files "$expl[@]" && ret=0
+ #_files "$expl[@]" -g "*.rb(-.)" && ret=0
+ fi
+ ;;
esac
return ret
Messages sorted by:
Reverse Date,
Date,
Thread,
Author