HelpCommand, trying to fix remkop#2355 [ci skip]

Author: marco-brandizi

.gitignore

@@ -17,3 +17,7 @@ picocli.iml
 /src/test/dejagnu.tests/tmp/
 /picocli-tests-java567/gradle/wrapper/dists/**/*.lck
 /picocli-tests-java567/gradle/wrapper/dists/**/*.ok
+# Eclipse files
+.classpath
+.project
+.settings/

src/main/java/picocli/CommandLine.java

@@ -15346,7 +15346,7 @@ static class AutoHelpMixin {
             synopsisHeading = "%nUsage: ", helpCommand = true,
             description = {"%nWhen no COMMAND is given, the usage help for the main command is displayed.",
                     "If a COMMAND is specified, the help for that command is shown.%n"})
-    public static final class HelpCommand implements IHelpCommandInitializable, IHelpCommandInitializable2, Runnable {
+    public static final class HelpCommand implements IHelpCommandInitializable, IHelpCommandInitializable2, Callable<Integer> {
 
         @Option(names = {"-h", "--help"}, usageHelp = true, descriptionKey = "helpCommand.help",
                 description = "Show usage help for the help command and exit.")
@@ -15365,9 +15365,11 @@ public static final class HelpCommand implements IHelpCommandInitializable, IHel
         private Help.ColorScheme colorScheme;
 
         /** Invokes {@link #usage(PrintStream, Help.ColorScheme) usage} for the specified command, or for the parent command. */
-        public void run() {
+        @Override
+        public Integer call () {
+        		// TODO: self can't be null here, why the check?
             CommandLine parent = self == null ? null : self.getParent();
-            if (parent == null) { return; }
+            if (parent == null) { return self.getCommandSpec ().exitCodeOnUsageHelp (); }
             Help.ColorScheme colors = colorScheme != null ? colorScheme : Help.defaultColorScheme(ansi);
             if (commands != null) {
                 Map<String, CommandLine> parentSubcommands = parent.getCommandSpec().subcommands();
@@ -15382,6 +15384,7 @@ public void run() {
                     } else {
                         subcommand.usage(out, colors); // for compatibility with pre-4.0 clients
                     }
+                    return subcommand.getCommandSpec ().exitCodeOnUsageHelp ();
                 } else {
                     throw new ParameterException(parent, "Unknown subcommand '" + commands + "'.", null, commands);
                 }
@@ -15391,6 +15394,7 @@ public void run() {
                 } else {
                     parent.usage(out, colors); // for compatibility with pre-4.0 clients
                 }
+                return parent.getCommandSpec ().exitCodeOnUsageHelp ();
             }
         }
         /** {@inheritDoc} */