Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions src/main/java/picocli/AutoComplete.java
Original file line number Diff line number Diff line change
Expand Up @@ -777,11 +777,17 @@ private static void generatePositionParamCompletionCandidates(StringBuilder buff
}

private static void generateCompletionCandidates(StringBuilder buff, OptionSpec f) {
buff.append(format(" local %s_option_args=(\"%s\") # %s values\n",
bashify(f.paramLabel()),
concat("\" \"", extract(f.completionCandidates())).trim(),
f.longestName()));
buff.append(generateCompletionCandidates(f));
}

private static String generateCompletionCandidates(OptionSpec f) {
return format(" local %s_%s_option_args=(\"%s\") # %s values\n",
bashify(f.longestName()).replaceFirst("^_+", ""),
bashify(f.paramLabel()),
concat("\" \"", extract(f.completionCandidates())).trim(),
f.longestName());
}

private static List<String> extract(Iterable<String> generator) {
List<String> result = new ArrayList<String>();
for (String e : generator) {
Expand Down Expand Up @@ -848,7 +854,7 @@ private static String generateOptionsCases(List<OptionSpec> argOptionFields, Str
if (option.completionCandidates() != null) {
buff.append(format("%s %s)\n", indent, concat("|", option.names(), null, new SingleQuoteFunction()))); // " -u|--timeUnit)\n"
buff.append(format("%s local IFS=$'\\n'\n", indent));
buff.append(format("%s COMPREPLY=( $( compReplyArray \"${%s_option_args[@]}\" ) )\n", indent, bashify(option.paramLabel())));
buff.append(format("%s COMPREPLY=( $( compReplyArray \"${%s_option_args[@]}\" ) )\n", indent, generateCompletionCandidates(option)));
buff.append(format("%s return $?\n", indent));
buff.append(format("%s ;;\n", indent));
} else if (type.equals(File.class) || "java.nio.file.Path".equals(type.getName())) {
Expand Down
Loading