From 4101fdf3bb1b39fa329d780fcc2b5af3f579c472 Mon Sep 17 00:00:00 2001 From: Vladimir Zhelezov Date: Thu, 10 Dec 2020 11:38:07 +0100 Subject: [PATCH] Fix duplicate call of _hledger_compreply_optarg() It was called in both conditional branches so it's moved out before the conditional. --- shell-completion/hledger-completion.bash | 8 +++----- shell-completion/hledger-completion.bash.m4 | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/shell-completion/hledger-completion.bash b/shell-completion/hledger-completion.bash index fcefa4ccc..732f2e148 100644 --- a/shell-completion/hledger-completion.bash +++ b/shell-completion/hledger-completion.bash @@ -49,9 +49,10 @@ _hledger_completion_function() { break done - if [[ -z $subcommand ]]; then - _hledger_compreply_optarg && return + # Option argument completion + _hledger_compreply_optarg && return + if [[ -z $subcommand ]]; then # Completion lists are already sorted at build-time # This keeps commands and options grouped separately compopt -o nosort +o filenames @@ -61,9 +62,6 @@ _hledger_completion_function() { return 0 fi - # Option argument completion after subcommand too - _hledger_compreply_optarg && return - # Avoid setting compopt bellow if completing an option [[ $cur == -* ]] && return diff --git a/shell-completion/hledger-completion.bash.m4 b/shell-completion/hledger-completion.bash.m4 index 03eb32e0e..c63e06007 100644 --- a/shell-completion/hledger-completion.bash.m4 +++ b/shell-completion/hledger-completion.bash.m4 @@ -49,9 +49,10 @@ _hledger_completion_function() { break done - if [[ -z $subcommand ]]; then - _hledger_compreply_optarg && return + # Option argument completion + _hledger_compreply_optarg && return + if [[ -z $subcommand ]]; then # Completion lists are already sorted at build-time # This keeps commands and options grouped separately compopt -o nosort +o filenames @@ -61,9 +62,6 @@ _hledger_completion_function() { return 0 fi - # Option argument completion after subcommand too - _hledger_compreply_optarg && return - # Avoid setting compopt bellow if completing an option [[ $cur == -* ]] && return