[#1696] Fix asciidoc output for nested ArgGroups

remkop · Jun 6, 2022 · bb05724 · bb05724
1 parent 1128dcf
commit bb05724
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java b/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java
@@ -500,7 +500,7 @@ static void genOptions(PrintWriter pw, CommandSpec spec) {
         IParameterRenderer parameterRenderer = spec.commandLine().getHelp().createDefaultParameterRenderer();
 
         List<ArgGroupSpec> groups = optionListGroups(spec);
-        for (ArgGroupSpec group : groups) { options.removeAll(group.options()); }
+        for (ArgGroupSpec group : groups) { options.removeAll(group.allOptionsNested()); }
 
         if (options.isEmpty() && !spec.usageMessage().showEndOfOptionsDelimiterInUsageHelp()) {
             pw.printf("// tag::picocli-generated-man-section-options[]%n");
@@ -534,12 +534,12 @@ static void genOptions(PrintWriter pw, CommandSpec spec) {
             String heading = makeHeading(group.heading(), "Options Group");
             pw.printf("== %s%n", COLOR_SCHEME.text(heading));
 
-            for (PositionalParamSpec positional : group.positionalParameters()) {
+            for (PositionalParamSpec positional : group.allPositionalParametersNested()) {
                 if (!positional.hidden()) {
                     writePositional(pw, positional, parameterRenderer, paramLabelRenderer);
                 }
             }
-            List<OptionSpec> groupOptions = new ArrayList<OptionSpec>(group.options());
+            List<OptionSpec> groupOptions = new ArrayList<OptionSpec>(group.allOptionsNested());
             if (optionSort != null) {
                 Collections.sort(groupOptions, optionSort);
             }