csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use _split_longopt to improve and clean up aspell completion.

Browse Source
This commit is contained in:
Ville Skyttä 2009-04-14 23:35:33 +03:00
parent 45182e1809
commit fc2c8a5a8e
2 changed files with 43 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -34,6 +34,7 @@ bash-completion (1.x)
input in external command arguments. input in external command arguments.
* Add _split_longopt() helper for improved handling of long options that * Add _split_longopt() helper for improved handling of long options that
take arguments in both "--foo bar" and "--foo=bar" formats. take arguments in both "--foo bar" and "--foo=bar" formats.
* Use _split_longopt to improve and clean up aspell completion.
[ Todd Zullinger ] [ Todd Zullinger ]
* Make yum complete on filenames after install, deplist, update and upgrade * Make yum complete on filenames after install, deplist, update and upgrade

97
bash_completion
View File

@ -6824,82 +6824,69 @@ _aspell_dictionary()
_aspell() _aspell()
{ {
local cur prev local cur prev split=false
COMPREPLY=() COMPREPLY=()
cur=`_get_cword` cur=`_get_cword`
prev=${COMP_WORDS[COMP_CWORD-1]} prev=${COMP_WORDS[COMP_CWORD-1]}
# --name value style option _split_longopt && split=true
case "$prev" in case "$prev" in
@(-c|-p|check)) -c|-p|check|--@(conf|personal|repl|per-conf))
_filedir _filedir
return 0 return 0
;; ;;
@(dump|create|merge)) --@(conf-dir|data-dir|dict-dir|home-dir|local-data-dir|prefix))
_filedir -d
return 0
;;
dump|create|merge)
COMPREPLY=( $( compgen -W 'master personal repl' -- $cur ) ) COMPREPLY=( $( compgen -W 'master personal repl' -- $cur ) )
return 0 return 0
;; ;;
-d) --mode)
COMPREPLY=( $( compgen -W 'none url email sgml tex' -- $cur ) )
return 0
;;
--sug-mode)
COMPREPLY=( $( compgen -W 'ultra fast normal bad-speller' -- $cur ) )
return 0
;;
--keymapping)
COMPREPLY=( $( compgen -W 'aspell ispell' -- $cur ) )
return 0
;;
-d|--master)
_aspell_dictionary _aspell_dictionary
return 0 return 0
;; ;;
esac esac
# --name=value style option $split && return 0
if [[ "$cur" == *=* ]]; then
prev=${cur/=*/}
cur=${cur/*=/}
case "$prev" in
--@(conf|personal|repl|per-conf))
_filedir
return 0
;;
--@(conf-dir|data-dir|dict-dir|home-dir|local-data-dir|prefix))
_filedir -d
return 0
;;
--master)
_aspell_dictionary
return 0
;;
--mode)
COMPREPLY=( $( compgen -W 'none url email sgml tex' -- $cur ) )
return 0
;;
--sug-mode)
COMPREPLY=( $( compgen -W 'ultra fast normal bad-speller' -- $cur ) )
return 0
;;
--keymapping)
COMPREPLY=( $( compgen -W 'aspell ispell' -- $cur ) )
return 0
;;
esac
fi
if [[ "$cur" == -* ]]; then if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--conf= --conf-dir= --data-dir= --dict-dir= \ COMPREPLY=( $( compgen -W '--conf --conf-dir --data-dir --dict-dir \
--encoding= --add-filter= --rem-filter= --mode= -e \ --encoding --add-filter --rem-filter --mode -e \
-H -t --add-extra-dicts= --rem-extra-dicts= \ -H -t --add-extra-dicts --rem-extra-dicts \
--home-dir= -W --ignore= --ignore-accents \ --home-dir -W --ignore --ignore-accents \
--dont-ignore-accents --ignore-case --dont-ignore-case \ --dont-ignore-accents --ignore-case --dont-ignore-case \
--ignore-repl --dont-ignore-repl --jargon= --keyboard= \ --ignore-repl --dont-ignore-repl --jargon --keyboard \
--lang= --language-tag= --local-data-dir= -d --master= \ --lang --language-tag --local-data-dir -d --master \
--module= --add-module-search-order= \ --module --add-module-search-order \
--rem-module-search-order= --per-conf= -p --personal= \ --rem-module-search-order --per-conf -p --personal \
--prefix= --repl= -C -B --run-together --dont-run-together \ --prefix --repl -C -B --run-together --dont-run-together \
--run-together-limit= --run-together-min= --save-repl \ --run-together-limit --run-together-min --save-repl \
--dont-save-repl --set-prefix --dont-set-prefix --size= \ --dont-save-repl --set-prefix --dont-set-prefix --size \
--spelling= --strip-accents --dont-strip-accents \ --spelling --strip-accents --dont-strip-accents \
--sug-mode= --add-word-list-path= --rem-word-list-path= \ --sug-mode --add-word-list-path --rem-word-list-path \
-b -x --backup -b|-x --dont-backup --reverse --dont-reverse \ -b -x --backup -b|-x --dont-backup --reverse --dont-reverse \
--time --dont-time --keymapping= --add-email-quote= \ --time --dont-time --keymapping --add-email-quote \
--rem-email-quote= --email-margin= --add-tex-command= \ --rem-email-quote --email-margin --add-tex-command \
--rem-tex-command= --tex-check-comments \ --rem-tex-command --tex-check-comments \
--dont-tex-check-comments --add-tex-extension= \ --dont-tex-check-comments --add-tex-extension \
--rem-tex-extension= --add-sgml-check= --rem-sgml-check= \ --rem-tex-extension --add-sgml-check --rem-sgml-check \
--add-sgml-extension= --rem-sgml-extension=' -- $cur ) ) --add-sgml-extension --rem-sgml-extension' -- $cur ) )
else else
COMPREPLY=( $( compgen -W '-? help -c check -a pipe -l list \ COMPREPLY=( $( compgen -W '-? help -c check -a pipe -l list \
config config soundslike filter -v version dump \ config config soundslike filter -v version dump \