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

Move sub-command options reply out of the for-loop

Browse Source 
It was just before the `break` statement anyways
This commit is contained in:
Vladimir Zhelezov 2020-12-13 07:14:33 +01:00
parent e2b2c2fb2e
commit f5d2a6bcc3
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,10 +24,8 @@ _hledger_completion_function() {
compopt -o filenames compopt -o filenames
local subcommand local subcommand
local subcommandOptions
local i local i
for ((i=1; i<${#words[@]}; i++)); do
for (( i=1; i<${#words[@]}; i++ )); do
subcommand=${words[i]} subcommand=${words[i]}
if ! grep -Fxqe "$subcommand" <<< "$_hledger_complist_commands"; then if ! grep -Fxqe "$subcommand" <<< "$_hledger_complist_commands"; then
subcommand= subcommand=
@ -48,17 +46,6 @@ _hledger_completion_function() {
return 0 return 0
fi fi
fi fi
if [[ $cur == -* ]]; then
# Replace dashes with underscores and use indirect expansion
subcommandOptions=_hledger_complist_options_${subcommand//-/_}
_hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")"
# Suspend space on completion of long options requiring an argument
[[ ${COMPREPLY[0]} == --*= ]] && compopt -o nospace
compopt +o filenames
return 0
fi
break break
done done
@ -79,6 +66,19 @@ _hledger_completion_function() {
return 0 return 0
fi fi
if [[ $cur == -* ]]; then
local subcommandOptions
# Replace dashes with underscores and use indirect expansion
subcommandOptions=_hledger_complist_options_${subcommand//-/_}
_hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")"
# Suspend space on completion of long options requiring an argument
[[ ${COMPREPLY[0]} == --*= ]] && compopt -o nospace
compopt +o filenames
return 0
fi
# Query completion # Query completion
_hledger_compreply_query && return _hledger_compreply_query && return

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

@ -24,10 +24,8 @@ _hledger_completion_function() {
compopt -o filenames compopt -o filenames
local subcommand local subcommand
local subcommandOptions
local i local i
for ((i=1; i<${#words[@]}; i++)); do
for (( i=1; i<${#words[@]}; i++ )); do
subcommand=${words[i]} subcommand=${words[i]}
if ! grep -Fxqe "$subcommand" <<< "$_hledger_complist_commands"; then if ! grep -Fxqe "$subcommand" <<< "$_hledger_complist_commands"; then
subcommand= subcommand=
@ -48,17 +46,6 @@ _hledger_completion_function() {
return 0 return 0
fi fi
fi fi
if [[ $cur == -* ]]; then
# Replace dashes with underscores and use indirect expansion
subcommandOptions=_hledger_complist_options_${subcommand//-/_}
_hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")"
# Suspend space on completion of long options requiring an argument
[[ ${COMPREPLY[0]} == --*= ]] && compopt -o nospace
compopt +o filenames
return 0
fi
break break
done done
@ -79,6 +66,19 @@ _hledger_completion_function() {
return 0 return 0
fi fi
if [[ $cur == -* ]]; then
local subcommandOptions
# Replace dashes with underscores and use indirect expansion
subcommandOptions=_hledger_complist_options_${subcommand//-/_}
_hledger_compreply "$(_hledger_compgen "${!subcommandOptions}")"
# Suspend space on completion of long options requiring an argument
[[ ${COMPREPLY[0]} == --*= ]] && compopt -o nospace
compopt +o filenames
return 0
fi
# Query completion # Query completion
_hledger_compreply_query && return _hledger_compreply_query && return