From 8feb9053ec47dc3acd425e4f22cf9f669468999f Mon Sep 17 00:00:00 2001
From: Vladimir Zhelezov <zhelezov@gmail.com>
Date: Sat, 12 Dec 2020 10:47:15 +0100
Subject: [PATCH] Append `=` to long options requiring an argument

Make it obvious that the option expects an argument by appending
the equal sign on completion. Suspend space in this case. The
regular expression in `output-options.sh` is adjusted to take into
account this on processing option strings.
---
 shell-completion/hledger-completion.bash    | 970 ++++++++++----------
 shell-completion/hledger-completion.bash.m4 |   8 +
 shell-completion/output-options.sh          |   2 +-
 3 files changed, 509 insertions(+), 471 deletions(-)

diff --git a/shell-completion/hledger-completion.bash b/shell-completion/hledger-completion.bash
index b8b678548..fa4670e95 100644
--- a/shell-completion/hledger-completion.bash
+++ b/shell-completion/hledger-completion.bash
@@ -52,6 +52,11 @@ _hledger_completion_function() {
             # 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
@@ -64,6 +69,9 @@ _hledger_completion_function() {
         compopt +o filenames
         if [[ $cur == -* ]]; then
             _hledger_compreply "$(_hledger_compgen "$_hledger_complist_generic_options")"
+
+            # Suspend space on completion of long options requiring an argument
+            [[ ${COMPREPLY[0]} == --*= ]] && compopt -o nospace
         else
             _hledger_compreply "$(_hledger_compgen "$_hledger_complist_commands")"
         fi
@@ -420,22 +428,22 @@ tag:
 TEXT
 
 read -r -d "" _hledger_complist_generic_options <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -443,13 +451,13 @@ read -r -d "" _hledger_complist_generic_options <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
@@ -459,24 +467,26 @@ TEXT
 # Referenced by indirect expansion of $subcommandOptions
 
 read -r -d "" _hledger_complist_options_accounts <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
+--debug=
 --declared
 --depth
+--depth=
 --drop
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
 --help
@@ -485,37 +495,37 @@ read -r -d "" _hledger_complist_options_accounts <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --tree
 --unmarked
 --used
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_activity <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -523,48 +533,48 @@ read -r -d "" _hledger_complist_options_activity <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_add <<TEXT
---alias
+--alias=
 --anon
---debug
---file
+--debug=
+--file=
 --help
 --ignore-assertions
 --no-new-accounts
---pivot
---rules-file
+--pivot=
+--rules-file=
 --version
 TEXT
 
 read -r -d "" _hledger_complist_options_areg <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -572,40 +582,40 @@ read -r -d "" _hledger_complist_options_areg <<TEXT
 --market
 --monthly
 --no-elide
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --txn-dates
 --unmarked
---value
+--value=
 --version
 --weekly
---width
+--width=
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_aregister <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -613,49 +623,53 @@ read -r -d "" _hledger_complist_options_aregister <<TEXT
 --market
 --monthly
 --no-elide
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --txn-dates
 --unmarked
---value
+--value=
 --version
 --weekly
---width
+--width=
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_bal <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
 --begin
+--begin=
 --budget
 --change
 --cleared
---color
+--color=
 --colour
 --cost
 --cumulative
 --daily
 --date2
---debug
+--debug=
 --depth
+--depth=
 --drop
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
 --format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -665,53 +679,57 @@ read -r -d "" _hledger_complist_options_bal <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --transpose
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_balance <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
 --begin
+--begin=
 --budget
 --change
 --cleared
---color
+--color=
 --colour
 --cost
 --cumulative
 --daily
 --date2
---debug
+--debug=
 --depth
+--depth=
 --drop
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
 --format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -721,34 +739,34 @@ read -r -d "" _hledger_complist_options_balance <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --transpose
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_balancesheet <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -756,16 +774,16 @@ read -r -d "" _hledger_complist_options_balancesheet <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -774,33 +792,33 @@ read -r -d "" _hledger_complist_options_balancesheet <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_balancesheetequity <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -808,16 +826,16 @@ read -r -d "" _hledger_complist_options_balancesheetequity <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -826,33 +844,33 @@ read -r -d "" _hledger_complist_options_balancesheetequity <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_bs <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -860,16 +878,16 @@ read -r -d "" _hledger_complist_options_bs <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -878,33 +896,33 @@ read -r -d "" _hledger_complist_options_bs <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_bse <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -912,16 +930,16 @@ read -r -d "" _hledger_complist_options_bse <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -930,33 +948,33 @@ read -r -d "" _hledger_complist_options_bse <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_cashflow <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -964,16 +982,16 @@ read -r -d "" _hledger_complist_options_cashflow <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -982,33 +1000,33 @@ read -r -d "" _hledger_complist_options_cashflow <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_cf <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -1016,16 +1034,16 @@ read -r -d "" _hledger_complist_options_cf <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -1034,43 +1052,43 @@ read -r -d "" _hledger_complist_options_cf <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_check_dates <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1078,36 +1096,36 @@ read -r -d "" _hledger_complist_options_check_dates <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --strict
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_check_dupes <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1115,39 +1133,40 @@ read -r -d "" _hledger_complist_options_check_dupes <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_close <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --close
---close-acct
+--close-acct=
 --close-desc
+--close-desc=
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
+--end=
+--exchange=
 --explicit
---file
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1157,16 +1176,18 @@ read -r -d "" _hledger_complist_options_close <<TEXT
 --monthly
 --open
 --open-acct
+--open-acct=
 --open-desc
+--open-desc=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --show-costs
 --unmarked
---value
+--value=
 --version
 --weekly
 --x
@@ -1174,22 +1195,22 @@ read -r -d "" _hledger_complist_options_close <<TEXT
 TEXT
 
 read -r -d "" _hledger_complist_options_codes <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1197,47 +1218,47 @@ read -r -d "" _hledger_complist_options_codes <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_commodities <<TEXT
---alias
+--alias=
 --anon
---debug
---file
+--debug=
+--file=
 --help
 --ignore-assertions
---pivot
---rules-file
+--pivot=
+--rules-file=
 --version
 TEXT
 
 read -r -d "" _hledger_complist_options_descriptions <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1245,51 +1266,52 @@ read -r -d "" _hledger_complist_options_descriptions <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_diff <<TEXT
---alias
+--alias=
 --anon
---debug
---file
+--debug=
+--file=
 --help
 --ignore-assertions
---pivot
---rules-file
+--pivot=
+--rules-file=
 --version
 TEXT
 
 read -r -d "" _hledger_complist_options_equity <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --close
---close-acct
+--close-acct=
 --close-desc
+--close-desc=
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
+--end=
+--exchange=
 --explicit
---file
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1299,16 +1321,18 @@ read -r -d "" _hledger_complist_options_equity <<TEXT
 --monthly
 --open
 --open-acct
+--open-acct=
 --open-desc
+--open-desc=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --show-costs
 --unmarked
---value
+--value=
 --version
 --weekly
 --x
@@ -1316,14 +1340,14 @@ read -r -d "" _hledger_complist_options_equity <<TEXT
 TEXT
 
 read -r -d "" _hledger_complist_options_files <<TEXT
---alias
+--alias=
 --anon
---debug
---file
+--debug=
+--file=
 --help
 --ignore-assertions
---pivot
---rules-file
+--pivot=
+--rules-file=
 --version
 TEXT
 
@@ -1336,24 +1360,24 @@ read -r -d "" _hledger_complist_options_help <<TEXT
 TEXT
 
 read -r -d "" _hledger_complist_options_import <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --catchup
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --dry-run
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1362,25 +1386,25 @@ read -r -d "" _hledger_complist_options_import <<TEXT
 --monthly
 --new
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_incomestatement <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -1388,16 +1412,16 @@ read -r -d "" _hledger_complist_options_incomestatement <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -1406,33 +1430,33 @@ read -r -d "" _hledger_complist_options_incomestatement <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_is <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --change
 --cleared
 --colour
@@ -1440,16 +1464,16 @@ read -r -d "" _hledger_complist_options_is <<TEXT
 --cumulative
 --daily
 --date2
---debug
---depth
---drop
+--debug=
+--depth=
+--drop=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
---format
+--format=
 --help
 --historical
 --ignore-assertions
@@ -1458,43 +1482,43 @@ read -r -d "" _hledger_complist_options_is <<TEXT
 --monthly
 --no-elide
 --no-total
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
 --percent
---period
---pivot
+--period=
+--pivot=
 --pretty-tables
 --quarterly
 --real
 --row-total
---rules-file
+--rules-file=
 --sort-amount
 --tree
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_notes <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1502,35 +1526,35 @@ read -r -d "" _hledger_complist_options_notes <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_payees <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1538,36 +1562,36 @@ read -r -d "" _hledger_complist_options_payees <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_prices <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --costs
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1576,76 +1600,76 @@ read -r -d "" _hledger_complist_options_prices <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_print <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
+--end=
+--exchange=
 --explicit
---file
+--file=
 --forecast
 --help
 --ignore-assertions
 --infer-market-price
 --market
---match
+--match=
 --monthly
 --new
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_print_unique <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1653,37 +1677,38 @@ read -r -d "" _hledger_complist_options_print_unique <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_reg <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --cleared
 --colour
 --cost
 --cumulative
 --daily
 --date2
---debug
+--debug=
 --depth
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --historical
@@ -1692,42 +1717,44 @@ read -r -d "" _hledger_complist_options_reg <<TEXT
 --invert
 --market
 --monthly
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
 --related
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --width
+--width=
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_register <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
 --average
---begin
+--begin=
 --cleared
 --colour
 --cost
 --cumulative
 --daily
 --date2
---debug
+--debug=
 --depth
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --historical
@@ -1736,40 +1763,41 @@ read -r -d "" _hledger_complist_options_register <<TEXT
 --invert
 --market
 --monthly
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
 --related
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --width
+--width=
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_register_match <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1777,13 +1805,13 @@ read -r -d "" _hledger_complist_options_register_match <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
@@ -1791,23 +1819,25 @@ TEXT
 
 read -r -d "" _hledger_complist_options_rewrite <<TEXT
 --add-posting
---alias
+--add-posting=
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --diff
 --empty
---end
---exchange
+--end=
+--exchange=
 --file
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1815,112 +1845,112 @@ read -r -d "" _hledger_complist_options_rewrite <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_roi <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cashflow
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
 --infer-value
 --inv
---investment
+--investment=
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --pnl
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_stats <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
 --infer-market-price
 --market
 --monthly
---output-file
+--output-file=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_tags <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --forecast
 --help
 --ignore-assertions
@@ -1929,13 +1959,13 @@ read -r -d "" _hledger_complist_options_tags <<TEXT
 --monthly
 --parsed
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --values
 --version
 --weekly
@@ -1943,71 +1973,71 @@ read -r -d "" _hledger_complist_options_tags <<TEXT
 TEXT
 
 read -r -d "" _hledger_complist_options_test <<TEXT
---color
---debug
+--color=
+--debug=
 --help
 --version
 TEXT
 
 read -r -d "" _hledger_complist_options_txns <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
+--end=
+--exchange=
 --explicit
---file
+--file=
 --forecast
 --help
 --ignore-assertions
 --infer-market-price
 --market
---match
+--match=
 --monthly
 --new
---output-file
---output-format
+--output-file=
+--output-format=
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---rules-file
+--rules-file=
 --unmarked
---value
+--value=
 --version
 --weekly
 --yearly
 TEXT
 
 read -r -d "" _hledger_complist_options_ui <<TEXT
---alias
+--alias=
 --anon
 --auto
 --aux-date
---begin
+--begin=
 --change
 --cleared
 --colour
 --cost
 --daily
 --date2
---debug
---depth
+--debug=
+--depth=
 --empty
---end
---exchange
---file
+--end=
+--exchange=
+--file=
 --flat
 --forecast
 --help
@@ -2016,16 +2046,16 @@ read -r -d "" _hledger_complist_options_ui <<TEXT
 --market
 --monthly
 --pending
---period
---pivot
+--period=
+--pivot=
 --quarterly
 --real
---register
---rules-file
---theme
+--register=
+--rules-file=
+--theme=
 --tree
 --unmarked
---value
+--value=
 --version
 --watch
 --weekly
diff --git a/shell-completion/hledger-completion.bash.m4 b/shell-completion/hledger-completion.bash.m4
index 02b1d36bc..06de7ce71 100644
--- a/shell-completion/hledger-completion.bash.m4
+++ b/shell-completion/hledger-completion.bash.m4
@@ -52,6 +52,11 @@ _hledger_completion_function() {
             # 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
@@ -64,6 +69,9 @@ _hledger_completion_function() {
         compopt +o filenames
         if [[ $cur == -* ]]; then
             _hledger_compreply "$(_hledger_compgen "$_hledger_complist_generic_options")"
+
+            # Suspend space on completion of long options requiring an argument
+            [[ ${COMPREPLY[0]} == --*= ]] && compopt -o nospace
         else
             _hledger_compreply "$(_hledger_compgen "$_hledger_complist_commands")"
         fi
diff --git a/shell-completion/output-options.sh b/shell-completion/output-options.sh
index 76642e24c..80b47fb21 100755
--- a/shell-completion/output-options.sh
+++ b/shell-completion/output-options.sh
@@ -17,7 +17,7 @@ main() {
 
     # Do not print '=' after long options with arg because it makes completion
     # for option arguments harder.
-    sed -rn 's/.* (--[a-zA-Z][-_a-zA-Z0-9]*)=?.*/\1/gp' < "$tmp"
+    sed -rn 's/.* (--[a-zA-Z][-_a-zA-Z0-9]*=?).*/\1/gp' < "$tmp"
 }
 
 main "$@"