diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | cmd2/cmd2.py | 4 | ||||
| -rwxr-xr-x | tests/test_completion.py | 60 |
3 files changed, 35 insertions, 30 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d662cf3..cb328f11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Setting the following pyscript variables: * `__name__`: __main__ * `__file__`: script path (as typed, ~ will be expanded) + * Only tab complete after redirection tokens if redirection is allowed * Other * Removed undocumented `py run` command since it was replaced by `run_pyscript` a while ago diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index 3b1fbb6f..5a728e56 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -1050,8 +1050,8 @@ class Cmd(cmd.Cmd): in_pipe = False in_file_redir = True - # Not a redirection token - else: + # Only tab complete after redirection tokens if redirection is allowed + elif self.allow_redirection: do_shell_completion = False do_path_completion = False diff --git a/tests/test_completion.py b/tests/test_completion.py index f545c8f9..e13d87de 100755 --- a/tests/test_completion.py +++ b/tests/test_completion.py @@ -902,11 +902,6 @@ class RedirCompType(enum.Enum): DEFAULT = 3, NONE = 4 - """ - fake > > - fake | grep > file - fake | grep > file > - """ @pytest.mark.parametrize('line, comp_type', [ ('fake', RedirCompType.DEFAULT), @@ -933,31 +928,40 @@ class RedirCompType(enum.Enum): ('fake > file >>', RedirCompType.NONE), ]) def test_redirect_complete(cmd2_app, monkeypatch, line, comp_type): - shell_cmd_complete_mock = mock.MagicMock(name='shell_cmd_complete') - monkeypatch.setattr("cmd2.Cmd.shell_cmd_complete", shell_cmd_complete_mock) - - path_complete_mock = mock.MagicMock(name='path_complete') - monkeypatch.setattr("cmd2.Cmd.path_complete", path_complete_mock) - - default_complete_mock = mock.MagicMock(name='fake_completer') - - text = '' - line = '{} {}'.format(line, text) - endidx = len(line) - begidx = endidx - len(text) + # Test both cases of allow_redirection + cmd2_app.allow_redirection = True + for count in range(2): + shell_cmd_complete_mock = mock.MagicMock(name='shell_cmd_complete') + monkeypatch.setattr("cmd2.Cmd.shell_cmd_complete", shell_cmd_complete_mock) + + path_complete_mock = mock.MagicMock(name='path_complete') + monkeypatch.setattr("cmd2.Cmd.path_complete", path_complete_mock) + + default_complete_mock = mock.MagicMock(name='fake_completer') + + text = '' + line = '{} {}'.format(line, text) + endidx = len(line) + begidx = endidx - len(text) + + cmd2_app._redirect_complete(text, line, begidx, endidx, default_complete_mock) + + if comp_type == RedirCompType.SHELL_CMD: + shell_cmd_complete_mock.assert_called_once() + elif comp_type == RedirCompType.PATH: + path_complete_mock.assert_called_once() + elif comp_type == RedirCompType.DEFAULT: + default_complete_mock.assert_called_once() + else: + shell_cmd_complete_mock.assert_not_called() + path_complete_mock.assert_not_called() + default_complete_mock.assert_not_called() - cmd2_app._redirect_complete(text, line, begidx, endidx, default_complete_mock) + # Do the next test with allow_redirection as False + cmd2_app.allow_redirection = False + if comp_type != RedirCompType.DEFAULT: + comp_type = RedirCompType.NONE - if comp_type == RedirCompType.SHELL_CMD: - shell_cmd_complete_mock.assert_called_once() - elif comp_type == RedirCompType.PATH: - path_complete_mock.assert_called_once() - elif comp_type == RedirCompType.DEFAULT: - default_complete_mock.assert_called_once() - else: - shell_cmd_complete_mock.assert_not_called() - path_complete_mock.assert_not_called() - default_complete_mock.assert_not_called() def test_complete_set_value(cmd2_app): text = '' |