zev/babi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow differentiating cancel and empty string in prompt()

Browse Source
This commit is contained in:
Anthony Sottile
2019-12-07 12:21:03 -08:00
parent 35f60540b5
commit 33fd403cd1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
babi.py
View File

@@ -262,7 +262,7 @@ class Status:
*, *,
history: Optional[str] = None, history: Optional[str] = None,
default_prev: bool = False, default_prev: bool = False,
) -> str: ) -> Optional[str]:
self.clear() self.clear()
if history is not None: if history is not None:
lst = [*self._history[history], ''] lst = [*self._history[history], '']
@@ -374,7 +374,7 @@ class Status:
elif key.keyname == b'^R': elif key.keyname == b'^R':
reverse_idx = max(0, reverse_idx - 1) reverse_idx = max(0, reverse_idx - 1)
elif key.keyname == b'^C': elif key.keyname == b'^C':
return '' return None
elif key.key == ord('\r'): elif key.key == ord('\r'):
return _save_history_and_get_retv() return _save_history_and_get_retv()
else: else:
@@ -383,7 +383,7 @@ class Status:
break # pragma: no cover break # pragma: no cover
elif key.keyname == b'^C': elif key.keyname == b'^C':
return '' return None
elif key.key == ord('\r'): elif key.key == ord('\r'):
return _save_history_and_get_retv() return _save_history_and_get_retv()
@@ -1059,7 +1059,7 @@ def _edit(screen: Screen) -> EditResult:
screen.file.redo(screen.status, screen.margin) screen.file.redo(screen.status, screen.margin)
elif key.keyname == b'^_': elif key.keyname == b'^_':
response = screen.status.prompt(screen, 'enter line number') response = screen.status.prompt(screen, 'enter line number')
if response == '': if not response:
screen.status.update('cancelled') screen.status.update('cancelled')
else: else:
try: try:
@@ -1072,7 +1072,7 @@ def _edit(screen: Screen) -> EditResult:
response = screen.status.prompt( response = screen.status.prompt(
screen, 'search', history='search', default_prev=True, screen, 'search', history='search', default_prev=True,
) )
if response == '': if not response:
screen.status.update('cancelled') screen.status.update('cancelled')
else: else:
try: try:
@@ -1092,7 +1092,7 @@ def _edit(screen: Screen) -> EditResult:
elif response == ':wq': elif response == ':wq':
screen.file.save(screen, screen.status) screen.file.save(screen, screen.status)
return EditResult.EXIT return EditResult.EXIT
elif response != '': # noop / cancel elif response: # noop / cancel
screen.status.update(f'invalid command: {response}') screen.status.update(f'invalid command: {response}')
elif key.keyname == b'^S': elif key.keyname == b'^S':
screen.file.save(screen, screen.status) screen.file.save(screen, screen.status)