Skip to content

Fix #2498 by dropping down hyphen to underscore in autocomplete bash script #2499

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

Open
btw04 wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −1
Open

Fix #2498 by dropping down hyphen to underscore in autocomplete bash script #2499

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bc9966
drop down hyphen to underscore in autocomplete bash script
btw04 Jan 12, 2026
be5a83b
check and remove duplicate function sub hierarchy aliases
btwCQSE Jan 14, 2026
42958e8
refactor for java 5
btwCQSE Jan 19, 2026
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
12 changes: 11 additions & 1 deletion src/main/java/picocli/AutoComplete.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
Expand Down Expand Up @@ -260,7 +261,7 @@ private static String bashify(CharSequence value) {
char c = value.charAt(i);
if (Character.isLetterOrDigit(c) || c == '_') {
builder.append(c);
} else if (Character.isSpaceChar(c)) {
} else if (Character.isSpaceChar(c) || c == '-') {
builder.append('_');
}
}
Expand Down Expand Up @@ -549,11 +550,20 @@ private static List<CommandDescriptor> createHierarchy(String scriptName, Comman

private static void createSubHierarchy(String scriptName, String parentWithoutTopLevelCommand, CommandLine commandLine, List<CommandDescriptor> out) {
// breadth-first: generate command lists and function calls for predecessors + each subcommand
Map<String, Integer> functionAliasCounts = new HashMap<String, Integer>();
for (Map.Entry<String, CommandLine> entry : commandLine.getSubcommands().entrySet()) {
CommandSpec spec = entry.getValue().getCommandSpec();
if (spec.usageMessage().hidden()) { continue; } // #887 skip hidden subcommands
String commandName = entry.getKey(); // may be an alias
String functionNameWithoutPrefix = bashify(concat("_", parentWithoutTopLevelCommand.replace(' ', '_'), commandName));
Integer functionAliasCount = functionAliasCounts.get(functionNameWithoutPrefix);
if (functionAliasCount == null) {
functionAliasCount = 0;
}
functionAliasCounts.put(functionNameWithoutPrefix, functionAliasCount + 1);
if (functionAliasCount > 0) {
functionNameWithoutPrefix = concat("_", functionNameWithoutPrefix, "alias", String.valueOf(functionAliasCount));
}
String functionName = concat("_", "_picocli", scriptName, functionNameWithoutPrefix);
String parentFunctionName = parentWithoutTopLevelCommand.length() == 0
? concat("_", "_picocli", scriptName)
Expand Down