kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-09-21 11:39:57 +03:00
Code Issues Projects Releases Wiki Activity

Avoid cyclic infinite recursion

Browse Source 
Note that this means that any alias is only expanded once per action
This commit is contained in:
Kovid Goyal 2021-11-23 15:36:58 +05:30
parent 314efe4f68
commit 2ca13e886a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/open_actions.py
View File

@ -61,8 +61,7 @@ def parse(lines: Iterable[str]) -> Iterator[OpenAction]:
alias_name, alias_val = rest.split(maxsplit=1)
except Exception:
continue
is_recursive = alias_name == alias_val.split(maxsplit=1)[0]
alias_map[alias_name] = [ActionAlias(alias_name, alias_val, is_recursive)]
alias_map[alias_name] = [ActionAlias(alias_name, alias_val)]
else:
log_error(f'Ignoring malformed open actions line: {line}')

19
kitty/options/utils.py
View File

@ -819,7 +819,6 @@ def parse_key_action(action: str, action_type: str = 'map') -> KeyAction:
class ActionAlias(NamedTuple):
name: str
value: str
is_recursive: bool
replace_second_arg: bool = False
@ -827,12 +826,10 @@ def build_action_aliases(raw: Dict[str, str], first_arg_replacement: str = '') -
ans: Dict[str, List[ActionAlias]] = {}
if first_arg_replacement:
for alias_name, rest in raw.items():
is_recursive = alias_name == rest.split(maxsplit=1)[0]
ans.setdefault(first_arg_replacement, []).append(ActionAlias(alias_name, rest, is_recursive, True))
ans.setdefault(first_arg_replacement, []).append(ActionAlias(alias_name, rest, True))
else:
for alias_name, rest in raw.items():
is_recursive = alias_name == rest.split(maxsplit=1)[0]
ans[alias_name] = [ActionAlias(alias_name, rest, is_recursive)]
ans[alias_name] = [ActionAlias(alias_name, rest)]
return ans
@ -854,18 +851,14 @@ def resolve_aliases_and_parse_actions(
if parts[0] != alias.name:
continue
new_defn = possible_alias + ' ' + alias.value + ((' ' + parts[1]) if len(parts) > 1 else '')
new_aliases = aliases
if alias.is_recursive:
new_aliases = aliases.copy()
new_aliases[possible_alias] = [a for a in aliases[possible_alias] if a is not alias]
new_aliases = aliases.copy()
new_aliases[possible_alias] = [a for a in aliases[possible_alias] if a is not alias]
yield from resolve_aliases_and_parse_actions(new_defn, new_aliases, map_type)
return
else: # action_alias
new_defn = alias.value + ((' ' + rest) if rest else '')
new_aliases = aliases
if alias.is_recursive:
new_aliases = aliases.copy()
new_aliases.pop(possible_alias)
new_aliases = aliases.copy()
new_aliases.pop(possible_alias)
yield from resolve_aliases_and_parse_actions(new_defn, new_aliases, map_type)
return

5
kitty_tests/options.py
View File

@ -76,6 +76,11 @@ def keys_for_func(opts, name):
self.ae(ka.func, 'launch')
self.ae(ka.args, ('--moo', 'recursive', 'XXX'))
opts = p('clear_all_shortcuts y', 'action_alias launch two 1', 'action_alias two launch 2', 'map f1 launch 3')
ka = tuple(opts.keymap.values())[0][0]
self.ae(ka.func, 'launch')
self.ae(ka.args, ('2', '1', '3'))
opts = p('clear_all_shortcuts y', 'action_alias launch launch --moo', 'map f1 launch XXX')
ka = tuple(opts.keymap.values())[0][0]
self.ae(ka.func, 'launch')