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

Allow entry points and external command combined completion on first word

Browse Source
This commit is contained in:
Kovid Goyal 2020-03-30 11:38:54 +05:30
parent 5b4844e71e
commit 6e13509720
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kitty/complete.py
View File

@ -159,6 +159,21 @@ def fish_input_parser(data: str) -> ParseResult:
@output_serializer @output_serializer
def zsh_output_serializer(ans: Completions) -> str: def zsh_output_serializer(ans: Completions) -> str:
lines = [] lines = []
for description, matches in ans.match_groups.items():
cmd = ['compadd', '-U', '-J', shlex.quote(description), '-X', shlex.quote(description)]
if description in ans.no_space_groups:
cmd += ['-S', '""']
if description in ans.files_groups:
cmd.append('-f')
common_prefix = os.path.commonprefix(tuple(matches))
if common_prefix:
cmd.extend(('-p', shlex.quote(common_prefix)))
matches = {k[len(common_prefix):]: v for k, v in matches.items()}
cmd.append('--')
for word in matches:
cmd.append(shlex.quote(word))
lines.append(' '.join(cmd) + ';')
if ans.delegate: if ans.delegate:
if ans.delegate.num_of_unknown_args == 1 and not ans.delegate.new_word: if ans.delegate.num_of_unknown_args == 1 and not ans.delegate.new_word:
lines.append('_command_names -e') lines.append('_command_names -e')
@ -166,22 +181,7 @@ def zsh_output_serializer(ans: Completions) -> str:
for i in range(ans.delegate.pos + 1): for i in range(ans.delegate.pos + 1):
lines.append('shift words') lines.append('shift words')
lines.append('(( CURRENT-- ))') lines.append('(( CURRENT-- ))')
lines.append('_normal -p ' + ans.delegate.precommand) lines.append(f'_normal -p "{ans.delegate.precommand}"')
else:
for description, matches in ans.match_groups.items():
cmd = ['compadd', '-U', '-J', shlex.quote(description), '-X', shlex.quote(description)]
if description in ans.no_space_groups:
cmd += ['-S', '""']
if description in ans.files_groups:
cmd.append('-f')
common_prefix = os.path.commonprefix(tuple(matches))
if common_prefix:
cmd.extend(('-p', shlex.quote(common_prefix)))
matches = {k[len(common_prefix):]: v for k, v in matches.items()}
cmd.append('--')
for word in matches:
cmd.append(shlex.quote(word))
lines.append(' '.join(cmd) + ';')
# debug('\n'.join(lines)) # debug('\n'.join(lines))
return '\n'.join(lines) return '\n'.join(lines)