CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-06-26 02:41:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix literal field parsing

Browse source
This commit is contained in:
Kovid Goyal 2023-12-03 20:55:47 +05:30
parent d191896528
commit d483c3eb33
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kitty/config.py
View file

@ -111,7 +111,12 @@ def finalize_keys(opts: Options, accumulate_bad_lines: Optional[List[BadLine]] =
try:
m = modes[defn.options.mode]
except KeyError:
log_error(f'The keyboard mode {defn.options.mode} is unknown, ignoring the mapping: {defn}')
kerr = f'The keyboard mode {defn.options.mode} is unknown, ignoring the mapping'
if accumulate_bad_lines is None:
log_error(kerr)
else:
dl = defn.definition_location
accumulate_bad_lines.append(BadLine(dl.number, dl.line, KeyError(kerr), dl.file))
continue
m.keymap[defn.trigger].append(defn)
opts.keyboard_modes = modes

8
kitty/options/utils.py
View file

@ -1170,7 +1170,7 @@ class LiteralField(Generic[T]):
def __set__(self, obj: object, value: str) -> None:
if value not in self._vals:
raise KeyError(f'Invalid value for {self._name[1:]}: {value!r}')
setattr(obj, self._name, value)
object.__setattr__(self, self._name, value)
OnUnknown = Literal['beep', 'end', 'ignore', 'passthrough']
@ -1182,8 +1182,8 @@ class KeyMapOptions:
when_focus_on: str = ''
new_mode: str = ''
mode: str = ''
on_unknown = LiteralField[OnUnknown](get_args(OnUnknown))
on_action = LiteralField[OnAction](get_args(OnAction))
on_unknown: LiteralField[OnUnknown] = LiteralField[OnUnknown](get_args(OnUnknown))
on_action: LiteralField[OnAction] = LiteralField[OnAction](get_args(OnAction))
default_key_map_options = KeyMapOptions()
@ -1259,7 +1259,7 @@ def parse_options_for_map(val: str) -> Tuple[KeyMapOptions, str]:
k = k.replace('-', '_')
expecting_arg = k
if expecting_arg not in allowed_key_map_options:
raise KeyError(f'The map option {x} is unknown')
raise KeyError(f'The map option {x} is unknown. Allowed options: {", ".join(allowed_key_map_options)}')
if sep == '=':
object.__setattr__(ans, k, v)
expecting_arg = ''