Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tcsh: Fix autocompletion for no single-hyphen args #112

Merged
merged 5 commits into from
Jun 14, 2023
Merged

tcsh: Fix autocompletion for no single-hyphen args #112

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2cea5cd
tcsh: Fix autocompletion for no single-hyphen args
simaoafonso-pwt Oct 28, 2022
43142ce
tcsh: Tweak template generation code
simaoafonso-pwt Oct 28, 2022
75f4e5f
Appease pre-commit and Sourcery
simaoafonso-pwt Oct 28, 2022
f329692
tcsh: Fixup autocompletion for list of choices
simaoafonso-pwt Jun 14, 2023
3df3b2c
slight tidy
casperdcl Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions shtab/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ def recurse(parser, prefix, paths=None):
format_positional(opt) for opt in subparser._get_positional_actions()
if not isinstance(opt.choices, dict) if opt.help != SUPPRESS)

new_pref = prefix + "_" + wordify(cmd)
new_pref = f"{prefix}_{wordify(cmd)}"
options = all_commands[new_pref] = {
"cmd": cmd, "help": (subparser.description or "").strip().split("\n")[0],
"arguments": arguments, "paths": [*paths, cmd]}
Expand Down Expand Up @@ -655,7 +655,10 @@ def complete_tcsh(parser, root_prefix=None, preamble="", choice_functions=None):
"""
Return tcsh syntax autocompletion script.

See `complete` for arguments.
root_prefix:
ignored (tcsh has no support for functions)

See `complete` for other arguments.
"""
optionals_single = set()
optionals_double = set()
Expand Down Expand Up @@ -716,31 +719,36 @@ def recurse_parser(cparser, positional_idx, requirements=None):
# Multiple requirements
nlist = []
for nn, arg in ndict.items():
checks = [f'[ "$cmd[{iidx}]" == "{n}" ]' for iidx, n in enumerate(nn, start=2)]
if arg.choices:
nlist.append('( {}echo "{}" || false )'.format(
' && '.join(checks + ['']), # Append the separator
'\\n'.join(arg.choices),
))

checks = [f'[ "$cmd[{iidx}]" == "{n}" ]' for iidx, n in enumerate(nn, start=2)]
choices_str = "' '".join(arg.choices)
checks_str = ' && '.join(checks + [f"echo '{choices_str}'"])
nlist.append(f"( {checks_str} || false )")
# Ugly hack
nlist_str = ' || '.join(nlist)
specials.append(f"'p@{str(idx)}@`set cmd=($COMMAND_LINE); {nlist_str}`@'")

if optionals_double:
if optionals_single:
optionals_single.add('-')
else:
# Don't add a space after completing "--" from "-"
optionals_single = ('-', '-')

return Template("""\
# AUTOMATICALLY GENERATED by `shtab`

${preamble}

complete ${prog} \\
'c/--/(${optionals_double_str})/' \\
'c/-/(${optionals_single_str} -)/' \\
'c/-/(${optionals_single_str})/' \\
${optionals_special_str} \\
'p/*/()/'""").safe_substitute(
preamble=("\n# Custom Preamble\n" + preamble +
"\n# End Custom Preamble\n" if preamble else ""), root_prefix=root_prefix,
prog=parser.prog, optionals_double_str=' '.join(optionals_double),
optionals_single_str=' '.join(optionals_single),
prog=parser.prog, optionals_double_str=' '.join(sorted(optionals_double)),
optionals_single_str=' '.join(sorted(optionals_single)),
optionals_special_str=' \\\n '.join(specials))


Expand Down