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

Simplify sub-command loop logic

Browse Source 
If the cursor is on the sub-command, just offer sub-command
completions and be done with it. It was way over complicated.
This commit is contained in:
Vladimir Zhelezov 2020-12-13 07:43:29 +01:00
parent f5d2a6bcc3
commit 046421e712
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,16 +36,10 @@ _hledger_completion_function() {
# $subcommand == bal --> balance, balancesheet, balancesheetequity, etc. # $subcommand == bal --> balance, balancesheet, balancesheetequity, etc.
# Do not ignore them! # Do not ignore them!
if ((i == cword)); then if ((i == cword)); then
local subcommandMatches compopt +o filenames
subcommandMatches=$(grep -c "^$subcommand" <<< "$_hledger_complist_commands") _hledger_compreply "$(_hledger_compgen "$_hledger_complist_commands")"
if ((subcommandMatches > 1)); then
subcommand=
break
else
_hledger_compreply "$subcommand"
return 0 return 0
fi fi
fi
break break
done done

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

@ -36,16 +36,10 @@ _hledger_completion_function() {
# $subcommand == bal --> balance, balancesheet, balancesheetequity, etc. # $subcommand == bal --> balance, balancesheet, balancesheetequity, etc.
# Do not ignore them! # Do not ignore them!
if ((i == cword)); then if ((i == cword)); then
local subcommandMatches compopt +o filenames
subcommandMatches=$(grep -c "^$subcommand" <<< "$_hledger_complist_commands") _hledger_compreply "$(_hledger_compgen "$_hledger_complist_commands")"
if ((subcommandMatches > 1)); then
subcommand=
break
else
_hledger_compreply "$subcommand"
return 0 return 0
fi fi
fi
break break
done done