Don't show a global-options section if all options were hidden.

toitlang · Aug 9, 2024 · 8a4bf1f · 8a4bf1f
1 parent cc4c9c9
commit 8a4bf1f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/help-generator_.toit b/src/help-generator_.toit
@@ -281,9 +281,6 @@ class HelpGenerator:
   build-options_ --title/string options/List --add-help/bool=false --rest/bool=false -> none:
     if options.is-empty and not add-help: return
 
-    ensure-vertical-space_
-    writeln_ "$title:"
-
     if add-help:
       has-help-flag := false
       has-short-help-flag := false
@@ -340,6 +337,12 @@ class HelpGenerator:
 
       options-type-defaults-and-help.add [option-str, help-str]
 
+    if options-type-defaults-and-help.is-empty:
+      // All options were hidden.
+      return
+
+    ensure-vertical-space_
+    writeln_ "$title:"
     write-table_ options-type-defaults-and-help --indentation=2
 
   /**

diff --git a/tests/help_test.toit b/tests/help_test.toit
@@ -584,6 +584,22 @@ test-options:
   expect-equals sub-local-expected sub-local-actual
   expect-equals sub-global-expected sub-global-actual
 
+  // When the global options are hidden, they are not shown.
+  cmd = cli.Command "root"
+      --options=[
+        cli.OptionInt "option1" --help="Option 1." --default=42 --hidden,
+      ]
+
+  sub = cli.Command "sub"
+      --options=[
+        cli.OptionInt "option_sub1" --help="Option 1." --default=42,
+      ]
+      --run=:: unreachable
+  cmd.add sub
+
+  sub-global-actual = build-global-options.call [cmd, sub]
+  expect-equals "" sub-global-actual
+
   cmd = cli.Command "root"
       --options=[
         cli.OptionInt "option1" --short-name="h" --help="Option 1." --default=42,