@@ -26,23 +26,20 @@ __gem() { local gem_command __gem_get_command - case "$prev" in - --config-file) - # leave COMPREPLY blank, let the default handle it - return;; + case $prev in + --config-file) + # leave COMPREPLY blank, let the default handle it + return;; esac local choices - case "$gem_command" in - "") - choices=$commands - ;; - help) - choices="commands examples platforms $commands" - ;; - uninstall | cleanup) - choices=$(__gem_installed_gems) - ;; + case $gem_command in + "") + choices=$commands;; + help) + choices="commands examples platforms $commands";; + uninstall | cleanup) + choices=$(__gem_installed_gems);; esac [[ $cur == -* ]] && choices=$options COMPREPLY=($(compgen -W "$choices" -- "$cur")) @@ -53,17 +50,17 @@ __gem_get_command() { for ((i=1; i < $COMP_CWORD; ++i)); do local arg=${COMP_WORDS[$i]} - case "$arg" in - -h | --help | -v | --version) - # these two options are command-killers - gem_command=- - return;; - --config-file) - # skip argument - ((++i));; - [^-]*) - gem_command=$arg - return;; + case $arg in + -h | --help | -v | --version) + # these two options are command-killers + gem_command=- + return;; + --config-file) + # skip argument + ((++i));; + [^-]*) + gem_command=$arg + return;; esac done } completion-gem @@ -27,7 +27,7 @@ __jruby() { for ((i=1; i < $COMP_CWORD; ++i)); do local arg=${COMP_WORDS[$i]} - case "$arg" in + case $arg in -S) script_in_path=1;; -S*) completion-jruby @@ -13,14 +13,14 @@ __rails() { local prev=$3 COMPREPLY=() - case "$prev" in - -r | --ruby) - # leave it to complete the path to a binary - return;; - -d | --database) - local dbs="mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db" - COMPREPLY=($(compgen -W "$dbs" -- "$cur")) - return;; + case $prev in + -r | --ruby) + # leave it to complete the path to a binary + return;; + -d | --database) + local dbs="mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db" + COMPREPLY=($(compgen -W "$dbs" -- "$cur")) + return;; esac if [[ $cur == -* ]]; then @@ -36,16 +36,16 @@ __rails_script_server() { local prev=$3 COMPREPLY=() - case "$prev" in - -e | --environment) - __rails_complete_environments "$cur" - return;; - *) - if [[ $cur == -* ]]; then - local options=" - -p --port -b --binding -d --daemon -u --debugger -e --environment" - COMPREPLY=($(compgen -W "$options" -- "$cur")) - fi + case $prev in + -e | --environment) + __rails_complete_environments "$cur" + return;; + *) + if [[ $cur == -* ]]; then + local options=" + -p --port -b --binding -d --daemon -u --debugger -e --environment" + COMPREPLY=($(compgen -W "$options" -- "$cur")) + fi esac } completion-rails @@ -14,50 +14,50 @@ __rake() { local prev=$3 COMPREPLY=() - case "$prev" in - -f | --rakefile | -r | --require) - # leave COMPREPLY blank, let the default handle it - return;; - -I | --libdir | -R | --rakelibdir) - _filedir -d - # suffix all entries with a slash - COMPREPLY=("${COMPREPLY[@]/%//}") - return;; - *) - if [[ $cur == -* ]]; then - local options=" - -C --classic-namespace -D --describe -n --dry-run -h --help - -I --libdir -N --nosearch -P --prereqs -q --quiet -f --rakefile - -R --rakelibdir -r --require -s --silent -T --tasks -t --trace - -v --verbose -V --version" - COMPREPLY=($(compgen -W "$options" -- "$cur")) - elif [[ $cur == *'['* ]]; then - # parameter completion (using default compgen) - # $cur: example[param1,param2 - # $args: param1,param2 - local args=${cur#*[} - # $last_arg: param2 - local last_arg=${args##*,} - # $prefix: example[param1, - local prefix=${cur%"$last_arg"} - - # ugh, ugly hack here, but I'm out of ideas - local old_ifs=$IFS IFS=$'\n' - COMPREPLY=($(compgen -o default -- "$last_arg")) - local IFS=$old_ifs - # escape space characters... - COMPREPLY=("${COMPREPLY[@]// /\ }") - # and prepend the prefix to all completion options - COMPREPLY=("${COMPREPLY[@]/#/$prefix}") - - __rake_remove_namespaces - # don't perform usual post-processing - return - else - local rakefile rakedir - __rake_get_rakefile || return - COMPREPLY=($(compgen -W "$(__rake_tasks)" -- "$cur")) - fi + case $prev in + -f | --rakefile | -r | --require) + # leave COMPREPLY blank, let the default handle it + return;; + -I | --libdir | -R | --rakelibdir) + _filedir -d + # suffix all entries with a slash + COMPREPLY=("${COMPREPLY[@]/%//}") + return;; + *) + if [[ $cur == -* ]]; then + local options=" + -C --classic-namespace -D --describe -n --dry-run -h --help + -I --libdir -N --nosearch -P --prereqs -q --quiet -f --rakefile + -R --rakelibdir -r --require -s --silent -T --tasks -t --trace + -v --verbose -V --version" + COMPREPLY=($(compgen -W "$options" -- "$cur")) + elif [[ $cur == *'['* ]]; then + # parameter completion (using default compgen) + # $cur: example[param1,param2 + # $args: param1,param2 + local args=${cur#*[} + # $last_arg: param2 + local last_arg=${args##*,} + # $prefix: example[param1, + local prefix=${cur%"$last_arg"} + + # ugh, ugly hack here, but I'm out of ideas + local old_ifs=$IFS IFS=$'\n' + COMPREPLY=($(compgen -o default -- "$last_arg")) + local IFS=$old_ifs + # escape space characters... + COMPREPLY=("${COMPREPLY[@]// /\ }") + # and prepend the prefix to all completion options + COMPREPLY=("${COMPREPLY[@]/#/$prefix}") + + __rake_remove_namespaces + # don't perform usual post-processing + return + else + local rakefile rakedir + __rake_get_rakefile || return + COMPREPLY=($(compgen -W "$(__rake_tasks)" -- "$cur")) + fi esac __rake_remove_namespaces @@ -95,13 +95,13 @@ __rake_get_rakefile() { for ((i=0; i <= $COMP_CWORD - 1; ++i)); do local arg=${COMP_WORDS[$i]} - case "$arg" in - --rakefile | -f) - rakefile=${COMP_WORDS[$(($i + 1))]} - return;; - --rakefile=* | -f=*) - rakefile=${arg#*=} - return;; + case $arg in + --rakefile | -f) + rakefile=${COMP_WORDS[$(($i + 1))]} + return;; + --rakefile=* | -f=*) + rakefile=${arg#*=} + return;; esac done completion-rake @@ -25,7 +25,7 @@ __ruby() { for ((i=1; i < $COMP_CWORD; ++i)); do local arg=${COMP_WORDS[$i]} - case "$arg" in + case $arg in --) # end of switches switches_accepted="" completion-ruby cc48cfd212bb6e66ee4f36dd84defe080b9b7f51 Daniel Luz dev@mernen.com http://github.com/mernen/completion-ruby/commit/388cd6b4d8921e91cdb805ea9614278a099845f2 388cd6b4d8921e91cdb805ea9614278a099845f2 2009-01-24T15:06:17-08:00 2009-01-24T15:06:17-08:00 More stylistic, no-op changes. a243b3c9e12fce061610b7251a45e22866c0141b Daniel Luz dev@mernen.com