MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-30 22:54:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #521 from b1101/master

Browse Source 
ui: accept 'q' as quit character
This commit is contained in:
Vladimir Iakovlev
2016-06-27 23:14:16 +03:00
committed by GitHub
parent 4584903beb 01418526b4
commit ea3671f98c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_ui.py
View File

@@ -25,15 +25,16 @@ def test_read_actions(patch_get_key):
# Ignored: # Ignored:
'x', 'y', 'x', 'y',
# Up: # Up:
const.KEY_UP, const.KEY_UP, 'k',
# Down: # Down:
const.KEY_DOWN, const.KEY_DOWN, 'j',
# Ctrl+C: # Ctrl+C:
const.KEY_CTRL_C]) const.KEY_CTRL_C, 'q'])
assert list(islice(ui.read_actions(), 5)) \ assert list(islice(ui.read_actions(), 8)) \
== [const.ACTION_SELECT, const.ACTION_SELECT, == [const.ACTION_SELECT, const.ACTION_SELECT,
const.ACTION_PREVIOUS, const.ACTION_NEXT, const.ACTION_PREVIOUS, const.ACTION_PREVIOUS,
const.ACTION_ABORT] const.ACTION_NEXT, const.ACTION_NEXT,
const.ACTION_ABORT, const.ACTION_ABORT]
def test_command_selector(): def test_command_selector():

2
thefuck/ui.py
View File

@@ -16,7 +16,7 @@ def read_actions():
yield const.ACTION_PREVIOUS yield const.ACTION_PREVIOUS
elif key in (const.KEY_DOWN, 'j'): elif key in (const.KEY_DOWN, 'j'):
yield const.ACTION_NEXT yield const.ACTION_NEXT
elif key == const.KEY_CTRL_C: elif key in (const.KEY_CTRL_C, 'q'):
yield const.ACTION_ABORT yield const.ACTION_ABORT
elif key in ('\n', '\r'): elif key in ('\n', '\r'):
yield const.ACTION_SELECT yield const.ACTION_SELECT