[#1076] Bugfix: Don't generate Autocomplete for hidden commands

RELEASE-NOTES.md

@@ -222,6 +222,7 @@ To use the `ManPageGenerator` tool as a subcommand, you will need the `picocli-c
 * [#1055] Bugfix: The parser will no longer assign values that match an option name to options that take a parameter, unless the value is in quotes. Thanks to [waacc-gh](https://github.com/waacc-gh) for raising this.
 * [#1015] Bugfix: Parser improvement: varargs positional arguments no longer consume unmatched options unless `unmatchedOptionsArePositionalParams` is configured. Thanks to [Chris Smowton](https://github.com/smowton) for raising this.
 * [#1071] Bugfix: Usage help no longer renders options header when it is specified via `optionListHeading` when all options are hidden.
+* [#1076] Bugfix: Don't generate Autocomplete for hidden commands. Thanks to [power721](https://github.com/power721) for raising this.
 * [#1081] Bugfix: `CommandLine.Help` constructor no longer calls overridable methods `addAllSubcommands` and `createDefaultParamLabelRenderer`.
 * [#1065] Bugfix: With a `List<>` option in `@ArgGroup`, group incorrectly appears twice in the synopsis. Thanks to [kap4lin](https://github.com/kap4lin) for raising this.
 * [#1067] Bugfix: `ParserSpec::initFrom` was not copying `useSimplifiedAtFiles`.

src/main/java/picocli/AutoComplete.java

@@ -605,7 +605,12 @@ private static String generateFunctionForCommand(String functionName, String com
  List<OptionSpec> argOptionFields = filter(commandSpec.options(), negate(new BooleanArgFilter()));
  String argOptionNames = optionNames(argOptionFields);
 
- Set<String> subCommands = commandLine.getSubcommands().keySet();
+ Set<String> subCommands = new LinkedHashSet<String>();
+ for (String sub : commandLine.getSubcommands().keySet()) {
+ if (!commandLine.getSubcommands().get(sub).getCommandSpec().usageMessage().hidden()) {
+ subCommands.add(sub); // #1076 Don't generate Autocomplete for hidden commands
+ }
+ }
  // If the command is a HelpCommand, append parent subcommands to the autocompletion list.
  if (commandLine.getParent() != null && commandLine.getCommand() instanceof HelpCommand) {
  subCommands = new LinkedHashSet<String>(subCommands);

src/test/java/picocli/AutoCompleteTest.java

@@ -1738,7 +1738,7 @@ private String getCompletionScriptTextWithHidden(String commandName) {
  "function _complete_%1$s() {\n" +
  " local cmds0=(help)\n" +
  "\n" +
- " if CompWordsContainsArray \"${cmds0[@]}\"; then _picocli_CompletionDemo_help; return $?; fi\n" +
+ " if CompWordsContainsArray \"${cmds0[@]}\"; then _picocli_%1$s_help; return $?; fi\n" +
  "\n" +
  " # No subcommands were specified; generate completions for the top-level command.\n" +
  " _picocli_%1$s; return $?;\n" +
@@ -1750,9 +1750,9 @@ private String getCompletionScriptTextWithHidden(String commandName) {
  " local curr_word=${COMP_WORDS[COMP_CWORD]}\n" +
  " local prev_word=${COMP_WORDS[COMP_CWORD-1]}\n" +
  "\n" +
- " local commands=\"generate-completion help\"\n" +
+ " local commands=\"help\"\n" + // NOTE: no generate-completion: this command is hidden
  " local flag_opts=\"\"\n" +
- " local arg_opts=\"--apples --bbb\"\n" +
+ " local arg_opts=\"--apples --bbb\"\n" + // NOTE: no --aaa: this option is hidden
  "\n" +
  " compopt +o default\n" +
  "\n" +