Merge pull request #1133 from oleorhagen/zshbackport

Backport zsh_autocomplete from master to the v1 branch
urfave · May 8, 2020 · 86d8407 · 86d8407
2 parents 1e44266 + 0703fa9
commit 86d8407
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/autocomplete/zsh_autocomplete b/autocomplete/zsh_autocomplete
@@ -3,9 +3,19 @@
 _cli_zsh_autocomplete() {
 
   local -a opts
-  opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+  local cur
+  cur=${words[-1]}
+  if [[ "$cur" == "-"* ]]; then
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
+  else
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+  fi
 
-  _describe 'values' opts
+  if [[ "${opts[1]}" != "" ]]; then
+    _describe 'values' opts
+  else
+    _files
+  fi
 
   return
 }