KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better naming of action parsers

Browse Source
This commit is contained in:
Kovid Goyal 2021-05-26 13:56:27 +05:30
parent 27a459b0dd
commit 2fd4487922
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kitty/config.py
View File

@ -23,8 +23,8 @@ from .constants import cache_dir, defconf, is_macos
from .options_stub import Options as OptionsStub
from .options_types import (
FuncArgsType, KeyDefinition, KeyMap, MouseMap, MouseMapping, SequenceMap,
env, font_features, func_with_args, parse_key, parse_key_action,
parse_mouse_action, symbol_map
env, font_features, func_with_args, parse_map, parse_key_action,
parse_mouse_map, symbol_map
)
from .typing import TypedDict
from .utils import log_error
@ -343,7 +343,7 @@ def parse_send_text(val: str, key_definitions: List[KeyDefinition]) -> None:
mode, sc = parts[:2]
text = ' '.join(parts[2:])
key_str = '{} send_text {} {}'.format(sc, mode, text)
for k in parse_key(key_str):
for k in parse_map(key_str):
key_definitions.append(k)
@ -366,13 +366,13 @@ def deprecated_handler(*names: str) -> Callable[[SpecialHandlerFunc], SpecialHan
@special_handler
def handle_map(key: str, val: str, ans: Dict[str, Any]) -> None:
for k in parse_key(val):
for k in parse_map(val):
ans['key_definitions'].append(k)
@special_handler
def handle_mouse_map(key: str, val: str, ans: Dict[str, Any]) -> None:
for ma in parse_mouse_action(val):
for ma in parse_mouse_map(val):
ans['mouse_mappings'].append(ma)

4
kitty/options_types.py
View File

@ -489,7 +489,7 @@ class KeyDefinition(BaseDefinition):
self.rest = tuple(map(r, self.rest))
def parse_key(val: str) -> Iterable[KeyDefinition]:
def parse_map(val: str) -> Iterable[KeyDefinition]:
parts = val.split(maxsplit=1)
if len(parts) != 2:
return
@ -539,7 +539,7 @@ def parse_key(val: str) -> Iterable[KeyDefinition]:
yield KeyDefinition(False, paction, mods, is_native, key)
def parse_mouse_action(val: str) -> Iterable[MouseMapping]:
def parse_mouse_map(val: str) -> Iterable[MouseMapping]:
parts = val.split(maxsplit=3)
if len(parts) != 4:
log_error(f'Ignoring invalid mouse action: {val}')