[core/completion] Support scalar COMPREPLY with compgen -F

oils-for-unix · Jan 2, 2025 · ab988fb · ab988fb
1 parent 1b10aa4
commit ab988fb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/core/completion.py b/core/completion.py
@@ -631,12 +631,16 @@ def Matches(self, comp):
                              self.func.name)
                 return
 
+            elif case(value_e.Str):
+                val = cast(value.Str, UP_val)
+                strs = [val.s]
+
             elif case(value_e.BashArray):
                 val = cast(value.BashArray, UP_val)
                 strs = bash_impl.BashArray_GetValues(val)
 
             else:
-                print_stderr('osh error: COMPREPLY should be an array, got %s' %
+                print_stderr('osh error: COMPREPLY should be an array or a string, got %s' %
                              ui.ValType(val))
                 return
 

diff --git a/spec/builtin-completion.test.sh b/spec/builtin-completion.test.sh
@@ -625,3 +625,16 @@ argv.py "${words[@]}"
 
 ## N-I bash STDOUT:
 ## END
+
+
+#### compgen -F with scalar COMPREPLY
+
+_comp_cmd_test() {
+  unset -v COMPREPLY
+  COMPREPLY=hello
+}
+compgen -F _comp_cmd_test
+
+## STDOUT:
+hello
+## END