Skip to content

Commit

Permalink
[#513] Simplify AutoCompletion script generator code.
Browse files Browse the repository at this point in the history
  • Loading branch information
remkop committed Oct 12, 2018
1 parent b3f0769 commit 162ae0f
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/main/java/picocli/AutoComplete.java
Original file line number Diff line number Diff line change
Expand Up @@ -696,19 +696,17 @@ private static void addCandidatesForArgsFollowing(CommandSpec commandSpec, List<
}
private static void addCandidatesForArgsFollowing(OptionSpec optionSpec, List<CharSequence> candidates) {
if (optionSpec != null) {
addCompletionCandidates(optionSpec.completionCandidates(), optionSpec.type(), candidates);
addCompletionCandidates(optionSpec.completionCandidates(), candidates);
}
}
private static void addCandidatesForArgsFollowing(PositionalParamSpec positionalSpec, List<CharSequence> candidates) {
if (positionalSpec != null) {
addCompletionCandidates(positionalSpec.completionCandidates(), positionalSpec.type(), candidates);
addCompletionCandidates(positionalSpec.completionCandidates(), candidates);
}
}
private static void addCompletionCandidates(Iterable<String> completionCandidates, Class<?> type, List<CharSequence> candidates) {
private static void addCompletionCandidates(Iterable<String> completionCandidates, List<CharSequence> candidates) {
if (completionCandidates != null) {
for (String candidate : completionCandidates) { candidates.add(candidate); }
} else if (type != null && type.isEnum()) {
for (Object constant : type.getEnumConstants()) { candidates.add(String.valueOf(constant)); }
}
}
}

0 comments on commit 162ae0f

Please sign in to comment.