diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | cmd2/argparse_completer.py | 20 | ||||
| -rw-r--r-- | cmd2/cmd2.py | 3 | ||||
| -rw-r--r-- | tests/test_argparse_completer.py | 70 |
4 files changed, 66 insertions, 29 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ef17000..bd5fb102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ * Added user-settable option called `always_show_hint`. If True, then tab completion hints will always display even when tab completion suggestions print. Arguments whose help or hint text is suppressed will not display hints even when this setting is True. + * argparse tab completion now groups flag names which run the same action. Optional flags are wrapped + in brackets like it is done in argparse usage text. * Bug Fixes * Fixed issue where flag names weren't always sorted correctly in argparse tab completion diff --git a/cmd2/argparse_completer.py b/cmd2/argparse_completer.py index 535caf88..316d4666 100644 --- a/cmd2/argparse_completer.py +++ b/cmd2/argparse_completer.py @@ -472,7 +472,25 @@ class ArgparseCompleter: if action.help != argparse.SUPPRESS: match_against.append(flag) - return self._cmd2_app.basic_complete(text, line, begidx, endidx, match_against) + matches = self._cmd2_app.basic_complete(text, line, begidx, endidx, match_against) + + # Build a dictionary linking actions with their matched flag names + matched_actions = dict() # type: Dict[argparse.Action, List[str]] + for flag in matches: + action = self._flag_to_action[flag] + matched_actions.setdefault(action, []) + matched_actions[action].append(flag) + + # For tab completion suggestions, group matched flags by action + for action, option_strings in matched_actions.items(): + flag_text = ', '.join(option_strings) + + # Mark optional flags with brackets + if not action.required: + flag_text = '[' + flag_text + ']' + self._cmd2_app.display_matches.append(flag_text) + + return matches def _format_completions(self, arg_state: _ArgumentState, completions: List[Union[str, CompletionItem]]) -> List[str]: # Check if the results are CompletionItems and that there aren't too many to display diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index 4e88c4ff..172d5264 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -2075,8 +2075,7 @@ class Cmd(cmd.Cmd): # we need to run the finalization hooks raise EmptyStatement - # This will be a utils.RedirectionSavedState object for the command - redir_saved_state = None + redir_saved_state = None # type: Optional[utils.RedirectionSavedState] try: # Get sigint protection while we set up redirection diff --git a/tests/test_argparse_completer.py b/tests/test_argparse_completer.py index 3ee9766e..5c579b5c 100644 --- a/tests/test_argparse_completer.py +++ b/tests/test_argparse_completer.py @@ -65,6 +65,7 @@ class ArgparseCompleterTester(cmd2.Cmd): flag_parser.add_argument('-c', '--count_flag', help='count flag', action='count') flag_parser.add_argument('-s', '--suppressed_flag', help=argparse.SUPPRESS, action='store_true') flag_parser.add_argument('-r', '--remainder_flag', nargs=argparse.REMAINDER, help='a remainder flag') + flag_parser.add_argument('-q', '--required_flag', required=True, help='a required flag', action='store_true') @with_argparser(flag_parser) def do_flag(self, args: argparse.Namespace) -> None: @@ -73,6 +74,7 @@ class ArgparseCompleterTester(cmd2.Cmd): # Uses non-default flag prefix value (+) plus_flag_parser = Cmd2ArgumentParser(prefix_chars='+') plus_flag_parser.add_argument('+n', '++normal_flag', help='a normal flag', action='store_true') + plus_flag_parser.add_argument('+q', '++required_flag', required=True, help='a required flag', action='store_true') @with_argparser(plus_flag_parser) def do_plus_flag(self, args: argparse.Namespace) -> None: @@ -366,61 +368,77 @@ def test_subcommand_completions(ac_app, subcommand, text, completions): assert ac_app.completion_matches == sorted(completions, key=ac_app.default_sort_key) -@pytest.mark.parametrize('command_and_args, text, completions', [ +@pytest.mark.parametrize('command_and_args, text, completion_matches, display_matches', [ # Complete all flags (suppressed will not show) - ('flag', '-', ['--append_const_flag', '--append_flag', '--count_flag', '--help', '--normal_flag', - '--remainder_flag', '-a', '-c', '-h', '-n', '-o', '-r']), - ('flag', '--', ['--append_const_flag', '--append_flag', '--count_flag', '--help', - '--normal_flag', '--remainder_flag']), + ('flag', '-', + ['--append_const_flag', '--append_flag', '--count_flag', '--help', '--normal_flag', + '--remainder_flag', '--required_flag', '-a', '-c', '-h', '-n', '-o', '-q', '-r'], + ['-q, --required_flag', '[-o, --append_const_flag]', '[-a, --append_flag]', '[-c, --count_flag]', '[-h, --help]', + '[-n, --normal_flag]', '[-r, --remainder_flag]']), + ('flag', '--', + ['--append_const_flag', '--append_flag', '--count_flag', '--help', + '--normal_flag', '--remainder_flag', '--required_flag'], + ['--required_flag', '[--append_const_flag]', '[--append_flag]', '[--count_flag]', '[--help]', + '[--normal_flag]', '[--remainder_flag]']), # Complete individual flag - ('flag', '-n', ['-n ']), - ('flag', '--n', ['--normal_flag ']), + ('flag', '-n', ['-n '], ['[-n]']), + ('flag', '--n', ['--normal_flag '], ['[--normal_flag]']), # No flags should complete until current flag has its args - ('flag --append_flag', '-', []), + ('flag --append_flag', '-', [], []), # Complete REMAINDER flag name - ('flag', '-r', ['-r ']), - ('flag', '--r', ['--remainder_flag ']), + ('flag', '-r', ['-r '], ['[-r]']), + ('flag', '--rem', ['--remainder_flag '], ['[--remainder_flag]']), # No flags after a REMAINDER should complete - ('flag -r value', '-', []), - ('flag --remainder_flag value', '--', []), + ('flag -r value', '-', [], []), + ('flag --remainder_flag value', '--', [], []), # Suppressed flag should not complete - ('flag', '-s', []), - ('flag', '--s', []), + ('flag', '-s', [], []), + ('flag', '--s', [], []), # A used flag should not show in completions - ('flag -n', '--', ['--append_const_flag', '--append_flag', '--count_flag', '--help', '--remainder_flag']), + ('flag -n', '--', + ['--append_const_flag', '--append_flag', '--count_flag', '--help', '--remainder_flag', '--required_flag'], + ['--required_flag', '[--append_const_flag]', '[--append_flag]', '[--count_flag]', '[--help]', '[--remainder_flag]']), # Flags with actions set to append, append_const, and count will always show even if they've been used - ('flag --append_const_flag -c --append_flag value', '--', ['--append_const_flag', '--append_flag', '--count_flag', - '--help', '--normal_flag', '--remainder_flag']), + ('flag --append_const_flag -c --append_flag value', '--', + ['--append_const_flag', '--append_flag', '--count_flag', '--help', + '--normal_flag', '--remainder_flag', '--required_flag'], + ['--required_flag', '[--append_const_flag]', '[--append_flag]', '[--count_flag]', '[--help]', + '[--normal_flag]', '[--remainder_flag]']), # Non-default flag prefix character (+) - ('plus_flag', '+', ['++help', '++normal_flag', '+h', '+n']), - ('plus_flag', '++', ['++help', '++normal_flag']), + ('plus_flag', '+', + ['++help', '++normal_flag', '+h', '+n', '+q', '++required_flag'], + ['+q, ++required_flag', '[+h, ++help]', '[+n, ++normal_flag]']), + ('plus_flag', '++', + ['++help', '++normal_flag', '++required_flag'], + ['++required_flag', '[++help]', '[++normal_flag]']), # Flag completion should not occur after '--' since that tells argparse all remaining arguments are non-flags - ('flag --', '--', []), - ('flag --help --', '--', []), - ('plus_flag --', '++', []), - ('plus_flag ++help --', '++', []) + ('flag --', '--', [], []), + ('flag --help --', '--', [], []), + ('plus_flag --', '++', [], []), + ('plus_flag ++help --', '++', [], []) ]) -def test_autcomp_flag_completion(ac_app, command_and_args, text, completions): +def test_autcomp_flag_completion(ac_app, command_and_args, text, completion_matches, display_matches): line = '{} {}'.format(command_and_args, text) endidx = len(line) begidx = endidx - len(text) first_match = complete_tester(text, line, begidx, endidx, ac_app) - if completions: + if completion_matches: assert first_match is not None else: assert first_match is None - assert ac_app.completion_matches == sorted(completions, key=ac_app.default_sort_key) + assert (ac_app.completion_matches == sorted(completion_matches, key=ac_app.default_sort_key) and + ac_app.display_matches == sorted(display_matches, key=ac_app.default_sort_key)) @pytest.mark.parametrize('flag, text, completions', [ |