[#1273] Bugfix: call Help.createDefaultOptionRenderer when calculating col widths

Closes #1273

Author: remkop

RELEASE-NOTES.md

@@ -266,6 +266,7 @@ Attributes that are _not_ copied include:
 * [#1225] Bugfix: Error message for unmatched positional argument reports incorrect index when value equals a previously matched argument. Thanks to [Vitaly Shukela](https://github.com/vi) for raising this.
 * [#1250] Bugfix: Inherited positional parameter should not be overridden by default value if placed after subcommand. Thanks to [Daniel Gray](https://github.com/danielthegray) for the pull request.
 * [#1183] Bugfix: Prevent `MissingParameterException` thrown when subcommand has required options and help option is specified on parent command. Thanks to [drkilikil](https://github.com/drkilikil) for raising this.
+* [#1273] Bugfix: The `Help.calcLongOptionColumnWidth` now calls `Help.createDefaultOptionRenderer`, so overriding `createDefaultOptionRenderer` uses the correct column width in the options and parameters list.
 * [#1215] DOC: User manual improvements, including more tabs with Kotlin source code. Thanks to [Andreas Deininger](https://github.com/deining) for the pull request.
 * [#1219] DOC: User manual improvements: added more tabs with Kotlin code. Thanks to [Andreas Deininger](https://github.com/deining) for the pull request.
 * [#1220] DOC: User manual improvements: corrections, more Kotlin tabs. Thanks to [Andreas Deininger](https://github.com/deining) for the pull request.

src/main/java/picocli/CommandLine.java

@@ -15473,7 +15473,7 @@ private Layout createLayout(int longOptionsColumnWidth, ColorScheme aColorScheme
          * @since 4.6 */
         public int calcLongOptionColumnWidth(List<OptionSpec> options, List<PositionalParamSpec> positionals, ColorScheme aColorScheme) {
             int max = 0;
-            IOptionRenderer optionRenderer = new DefaultOptionRenderer(false, " ");
+            IOptionRenderer optionRenderer = createDefaultOptionRenderer();
             boolean cjk = commandSpec.usageMessage().adjustLineBreaksForWideCJKCharacters();
             int longOptionsColWidth = commandSpec.usageMessage().longOptionsMaxWidth() + 1; // add 1 space for indentation
             for (OptionSpec option : options) {

src/test/java/picocli/HelpTest.java

@@ -5005,4 +5005,56 @@ class MyTool {
         String actual = new CommandLine(new MyTool()).getUsageMessage();
         assertEquals(expected, actual);
     }
+    @Test
+    public void testIssue1273() {
+        class Issue1273 {
+            @Option(names = {"-u", "--user"}, description = "The connecting user name.")
+            private String user;
+
+            @Option(names = {"-p", "--password"}, interactive = true, description = "Password for the user.")
+            private String password;
+
+            @Option(names = {"-o", "--port"}, description = "Listening port.")
+            private int port;
+        }
+
+        CommandLine cmd = new CommandLine(new Issue1273());
+        cmd.setHelpFactory(new IHelpFactory() {
+            public Help create(final CommandSpec commandSpec, ColorScheme colorScheme) {
+                return new Help(commandSpec, colorScheme) {
+                    @Override
+                    public IOptionRenderer createDefaultOptionRenderer() {
+                        return new IOptionRenderer() {
+                            public Text[][] render(OptionSpec option, IParamLabelRenderer ignored, ColorScheme scheme) {
+                                // assume one line of description text (may contain embedded %n line separators)
+                                String[] description = option.description();
+                                Text[] descriptionFirstLines = scheme.text(description[0]).splitLines();
+
+                                Text EMPTY = Ansi.EMPTY_TEXT;
+                                List<Text[]> result = new ArrayList<Text[]>();
+                                result.add(new Text[] {
+                                        scheme.optionText(String.valueOf(
+                                                option.command().usageMessage().requiredOptionMarker())),
+                                        scheme.optionText(option.shortestName()),
+                                        scheme.text(","), // we assume every option has a short and a long name
+                                        scheme.optionText(option.longestName()), // just the option name without parameter
+                                        descriptionFirstLines[0] });
+                                for (int i = 1; i < descriptionFirstLines.length; i++) {
+                                    result.add(new Text[] { EMPTY, EMPTY, EMPTY, EMPTY, descriptionFirstLines[i] });
+                                }
+                                return result.toArray(new Text[result.size()][]);
+                            }
+                        };
+                    }
+                };
+            }
+        });
+        String expected = String.format("" +
+                "Usage: <main class> [-p] [-o=<port>] [-u=<user>]%n" +
+                "  -o, --port       Listening port.%n" +
+                "  -p, --password   Password for the user.%n" +
+                "  -u, --user       The connecting user name.%n");
+        String actual = cmd.getUsageMessage();
+        assertEquals(expected, actual);
+    }
 }