ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show the user an error message when pressing a key results in an exception

Browse source
This commit is contained in:
Kovid Goyal 2021-11-22 23:01:44 +05:30
parent d7f569b341
commit 9161c71b51
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kitty/boss.py
View file

@ -1133,10 +1133,14 @@ def report_match(f: Callable[..., Any]) -> None:
''')
def combine(self, actions: Tuple[KeyAction, ...], window_for_dispatch: Optional[Window] = None, dispatch_type: str = 'KeyPress') -> bool:
consumed = False
if self.dispatch_action(actions[0], window_for_dispatch, dispatch_type):
try:
if self.dispatch_action(actions[0], window_for_dispatch, dispatch_type):
consumed = True
if len(actions) > 1:
self.drain_actions(list(actions[1:]), window_for_dispatch, dispatch_type)
except Exception as e:
self.show_error('Key action failed', f'{actions[0].pretty()}\n{e}')
consumed = True
if len(actions) > 1:
self.drain_actions(list(actions[1:]), window_for_dispatch, dispatch_type)
return consumed
def on_focus(self, os_window_id: int, focused: bool) -> None:

6
kitty/conf/utils.py
View file

@ -260,6 +260,12 @@ def __repr__(self) -> str:
return f'KeyAction({self.func!r}, {self.args!r})'
return f'KeyAction({self.func!r})'
def pretty(self) -> str:
ans = self.func
for x in self.args:
ans += f' {x}'
return ans
def parse_kittens_func_args(action: str, args_funcs: Dict[str, KeyFunc[Tuple[str, Any]]]) -> KeyAction:
parts = action.strip().split(' ', 1)