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

Fix completion of kitten names not working

Browse Source
This commit is contained in:
Kovid Goyal 2018-08-27 13:23:17 +05:30
parent 1c11ba8dbd
commit 0c1b76c17a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/complete.py
View File

@ -6,7 +6,7 @@ import os
import shlex import shlex
import sys import sys
from kittens.runner import get_kitten_cli_docs from kittens.runner import get_kitten_cli_docs, all_kitten_names
from .cli import options_for_completion, parse_option_spec from .cli import options_for_completion, parse_option_spec
from .cmds import cmap from .cmds import cmap
@ -279,13 +279,25 @@ def find_completions(words, new_word, entry_points, namespaced_entry_points):
prefix = words[1] if len(words) > 1 else '' prefix = words[1] if len(words) > 1 else ''
ans.match_groups['Entry points'] = {c: None for c in namespaced_entry_points if c.startswith(prefix)} ans.match_groups['Entry points'] = {c: None for c in namespaced_entry_points if c.startswith(prefix)}
else: else:
complete_kitten(ans, words[1], words[2:], new_word) if words[1] == 'kitten':
if len(words) == 2 or (len(words) == 3 and not new_word):
ans.match_groups['Kittens'] = dict.fromkeys(k for k in all_kitten_names() if k.startswith('' if len(words) == 2 else words[2]))
else:
complete_kitten(ans, words[2], words[3:], new_word)
return ans return ans
if words[0].startswith('+'): if words[0].startswith('+'):
if len(words) == 1 and not new_word: if len(words) == 1:
if new_word:
if words[0] == '+kitten':
ans.match_groups['Kittens'] = dict.fromkeys(all_kitten_names())
else:
prefix = words[0] prefix = words[0]
ans.match_groups['Entry points'] = {c: None for c in namespaced_entry_points if c.startswith(prefix)} ans.match_groups['Entry points'] = {c: None for c in namespaced_entry_points if c.startswith(prefix)}
else: else:
if len(words) == 2 and not new_word:
ans.match_groups['Kittens'] = dict.fromkeys(k for k in all_kitten_names() if k.startswith(words[1]))
else:
if words[0] == '+kitten':
complete_kitten(ans, words[1], words[2:], new_word) complete_kitten(ans, words[1], words[2:], new_word)
else: else:
complete_cli(ans, words, new_word, options_for_completion(), complete_kitty_cli_arg) complete_cli(ans, words, new_word, options_for_completion(), complete_kitty_cli_arg)