Support compopt in completion functions

iterative · Jun 8, 2022 · 38e334b · 38e334b
1 parent cf19980
commit 38e334b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/shtab/__init__.py b/shtab/__init__.py
@@ -421,9 +421,14 @@ def complete_bash(parser, root_prefix=None, preamble="", choice_functions=None):
     COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
   else
     # use choices & compgen
-    COMPREPLY=( $(compgen -W "${current_action_choices}" -- "${completing_word}"; \\
-                  [ -n "${current_action_compgen}" ] \\
-                  && "${current_action_compgen}" "${completing_word}") )
+    # call current_action_compgen without a subshell to support compopt
+    tmpfile="$(mktemp)"
+    [ -n "${current_action_compgen}" ] && \\
+        "${current_action_compgen}" "${completing_word}" > "$tmpfile"
+    mapfile current_action_compreply < $tmpfile
+    rm "$tmpfile"
+    COMPREPLY=( $(compgen -W "${current_action_choices}" -- "${completing_word}") \\
+        ${current_action_compreply[@]} )
   fi
 
   return 0