Fix bug where choice() didn't consume params on successful matching

andsens · Aug 17, 2024 · ef01e29 · ef01e29
1 parent 10220fc
commit ef01e29
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/docopt_sh/docopt.sh b/docopt_sh/docopt.sh
@@ -346,8 +346,9 @@ choice() {
   : $((testdepth--))
   # Check if any subtree matched
   if [[ -n $best_match_idx ]]; then
-    # Let the best-matching subtree set the variables
-    [[ $testdepth -eq 0 ]] && "node_$best_match_idx"
+    # Let the best-matching subtree consume the params
+    # and potentially set the variables
+    "node_$best_match_idx"
     return 0
   fi
   return 1

diff --git a/tests/docopt-sh-usecases.txt b/tests/docopt-sh-usecases.txt
@@ -137,3 +137,14 @@ Ending with an escaped doublequote: \"
 """
 $ prog
 {}
+
+#
+# Sequence of choices works
+#
+
+r"""Usage:
+  prog (a|b) (c|d)
+
+"""
+$ prog a d
+{"a": true, "b": false, "c": false, "d": true}