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

f656ff8 made another early return possible, so do it

Browse Source 
Also it made a couple of statements redundant, cleaned up.
This commit is contained in:
Vladimir Zhelezov 2020-12-12 07:43:12 +01:00
parent e6d54f79d7
commit 09132ace80
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@ _hledger_completion_function() {
# Replace dashes with underscores and use indirect expansion # Replace dashes with underscores and use indirect expansion
subcommandOptions=_hledger_complist_options_${subcommand//-/_} subcommandOptions=_hledger_complist_options_${subcommand//-/_}
_hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")" _hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")"
return 0
fi fi
break break
done done
@ -70,9 +71,6 @@ _hledger_completion_function() {
return 0 return 0
fi fi
# Avoid setting compopt bellow if completing an option
[[ $cur == -* ]] && return
# Query completion # Query completion
_hledger_compreply_query && return _hledger_compreply_query && return
@ -81,7 +79,7 @@ _hledger_completion_function() {
files|test) return 0 ;; files|test) return 0 ;;
help) help)
compopt -o nosort +o filenames compopt -o nosort +o filenames
_hledger_compreply_append "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")" _hledger_compreply "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")"
return 0 return 0
;; ;;
esac esac
@ -89,7 +87,7 @@ _hledger_completion_function() {
# Offer query filters and accounts for the rest # Offer query filters and accounts for the rest
# Do not sort. Keep options, accounts and query filters grouped separately # 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 "$(_hledger_compgen "$_hledger_complist_query_filters")"
if [[ -z $cur ]]; then if [[ -z $cur ]]; then
_hledger_compreply_append "$(_hledger_compgen "$(_hledger accounts --flat --depth 1)")" _hledger_compreply_append "$(_hledger_compgen "$(_hledger accounts --flat --depth 1)")"
else else

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

@ -52,6 +52,7 @@ _hledger_completion_function() {
# Replace dashes with underscores and use indirect expansion # Replace dashes with underscores and use indirect expansion
subcommandOptions=_hledger_complist_options_${subcommand//-/_} subcommandOptions=_hledger_complist_options_${subcommand//-/_}
_hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")" _hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")"
return 0
fi fi
break break
done done
@ -70,9 +71,6 @@ _hledger_completion_function() {
return 0 return 0
fi fi
# Avoid setting compopt bellow if completing an option
[[ $cur == -* ]] && return
# Query completion # Query completion
_hledger_compreply_query && return _hledger_compreply_query && return
@ -81,7 +79,7 @@ _hledger_completion_function() {
files|test) return 0 ;; files|test) return 0 ;;
help) help)
compopt -o nosort +o filenames compopt -o nosort +o filenames
_hledger_compreply_append "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")" _hledger_compreply "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")"
return 0 return 0
;; ;;
esac esac
@ -89,7 +87,7 @@ _hledger_completion_function() {
# Offer query filters and accounts for the rest # Offer query filters and accounts for the rest
# Do not sort. Keep options, accounts and query filters grouped separately # 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 "$(_hledger_compgen "$_hledger_complist_query_filters")"
if [[ -z $cur ]]; then if [[ -z $cur ]]; then
_hledger_compreply_append "$(_hledger_compgen "$(_hledger accounts --flat --depth 1)")" _hledger_compreply_append "$(_hledger_compgen "$(_hledger accounts --flat --depth 1)")"
else else