slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactor of main function

Browse Source 
No functional changes except special treatment of `help` subcommand
This commit is contained in:
Vladimir Zhelezov 2020-12-11 09:53:16 +01:00
parent b195826c0f
commit c139bb24a7
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shell-completion/hledger-completion.bash
View File

@ -65,19 +65,21 @@ _hledger_completion_function() {
# Avoid setting compopt bellow if completing an option # Avoid setting compopt bellow if completing an option
[[ $cur == -* ]] && return [[ $cur == -* ]] && return
# Almost all subcommands accept [QUERY] # Query completion
# -> always add accounts to completion list
# Except for those few that will complain
local noQuery=(files help test)
# shellcheck disable=2076
[[ " ${noQuery[*]} " =~ " $subcommand " ]] && return
# Add any other subcommand special treatment here, or if it becomes unwieldy
# move it out in say _hledger_compreply_subcommand() and return on success.
# Query specific completions
_hledger_compreply_query && return _hledger_compreply_query && return
# Do not sort, keep accounts and query filters grouped separately # Subcommand specific
case $subcommand in
files|test) return 0 ;;
help)
compopt -o nosort +o filenames
_hledger_compreply_append "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")"
return 0
;;
esac
# Offer query filters and accounts for the rest
# Do not sort. Keep options, accounts and query filters grouped separately
compopt -o nosort -o nospace compopt -o nosort -o nospace
_hledger_compreply_append "$(_hledger_compgen "$_hledger_complist_query_filters")" _hledger_compreply_append "$(_hledger_compgen "$_hledger_complist_query_filters")"
if [[ -z $cur ]]; then if [[ -z $cur ]]; then

24
shell-completion/hledger-completion.bash.m4
View File

@ -65,19 +65,21 @@ _hledger_completion_function() {
# Avoid setting compopt bellow if completing an option # Avoid setting compopt bellow if completing an option
[[ $cur == -* ]] && return [[ $cur == -* ]] && return
# Almost all subcommands accept [QUERY] # Query completion
# -> always add accounts to completion list
# Except for those few that will complain
local noQuery=(files help test)
# shellcheck disable=2076
[[ " ${noQuery[*]} " =~ " $subcommand " ]] && return
# Add any other subcommand special treatment here, or if it becomes unwieldy
# move it out in say _hledger_compreply_subcommand() and return on success.
# Query specific completions
_hledger_compreply_query && return _hledger_compreply_query && return
# Do not sort, keep accounts and query filters grouped separately # Subcommand specific
case $subcommand in
files|test) return 0 ;;
help)
compopt -o nosort +o filenames
_hledger_compreply_append "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")"
return 0
;;
esac
# Offer query filters and accounts for the rest
# Do not sort. Keep options, accounts and query filters grouped separately
compopt -o nosort -o nospace compopt -o nosort -o nospace
_hledger_compreply_append "$(_hledger_compgen "$_hledger_complist_query_filters")" _hledger_compreply_append "$(_hledger_compgen "$_hledger_complist_query_filters")"
if [[ -z $cur ]]; then if [[ -z $cur ]]; then