Skip to content

Bashcomp: add missing options and speed up #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 26, 2015
Merged

Bashcomp: add missing options and speed up #1835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb4d3d8
Bashcomp: add missing options, add --vcs completion
gentoo90 Jul 26, 2015
3f49c79
Bashcomp: improve performance
gentoo90 Jul 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/etc/cargo.bashcomp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ _cargo()

cmd=${words[1]}

local commands=$(cargo --list | tail -n +2)
local vcs='git hg none'

local opt_common='-h --help -v --verbose'
local opt_help='-h --help'
local opt_verbose='-v --verbose'
local opt_quiet='-q --quiet'
local opt_common="$opt_help $opt_verbose $opt_quiet"
local opt_pkg='-p --package'
local opt_feat='--features --no-default-features'
local opt_mani='--manifest-path'
Expand All @@ -30,33 +33,36 @@ _cargo()
local opt__owner="$opt_common -a --add -r --remove -l --list --index --token"
local opt__pkgid="${opt__fetch}"
local opt__publish="$opt_common $opt_mani --host --token --no-verify"
local opt__read_manifest="${opt__fetch}"
local opt__read_manifest="$opt_help $opt_verbose $opt_mani"
local opt__run="$opt_common $opt_feat $opt_mani $opt_jobs --target --bin --example --release"
local opt__rustc="$opt_common $opt_pkg $opt_feat $opt_mani $opt_jobs --target --lib --bin --test --bench --example --release"
local opt__search="$opt_common --host"
local opt__test="$opt_common $opt_pkg $opt_feat $opt_mani $opt_jobs --target --lib --bin --test --bench --example --no-run --release"
local opt__update="$opt_common $opt_pkg $opt_mani --aggressive --precise"
local opt__package="$opt_common $opt_mani -l --list --no-verify --no-metadata"
local opt__verify_project="${opt__fetch}"
local opt__version="$opt_common"
local opt__version="$opt_help $opt_verbose"
local opt__yank="$opt_common --vers --undo --index --token"

if [[ $cword -eq 1 ]]; then
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) )
else
COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) )
fi
elif [[ $cword -ge 2 ]]; then
case "${prev}" in
--vcs)
COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) )
;;
--manifest-path)
_filedir toml
;;
--example)
COMPREPLY=( $( compgen -W "$(_get_examples)" -- "$cur" ) )
;;
help)
COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) )
;;
*)
local opt_var=opt__${cmd//-/_}
Expand All @@ -71,6 +77,8 @@ _cargo()
} &&
complete -F _cargo cargo

__cargo_commands=$(cargo --list | tail -n +2)

_locate_manifest(){
local manifest=`cargo locate-project 2>/dev/null`
# regexp-replace manifest '\{"root":"|"\}' ''
Expand Down