From 748fe05362d3e4568526bcbd2afb786d07a37c66 Mon Sep 17 00:00:00 2001
From: Shengjing Zhu <i@zhsj.me>
Date: Mon, 10 Feb 2020 01:27:45 +0800
Subject: [PATCH] Fix zsh completion scripts

This fix completion when argument startswith -
And prevent completing a space when no candidates
---
 autocomplete/zsh_autocomplete | 12 ++++++++++--
 docs/v2/manual.md             |  7 ++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/autocomplete/zsh_autocomplete b/autocomplete/zsh_autocomplete
index e4fddbe8ec..e2c7921212 100644
--- a/autocomplete/zsh_autocomplete
+++ b/autocomplete/zsh_autocomplete
@@ -3,9 +3,17 @@
 _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
+  fi
 
   return
 }
diff --git a/docs/v2/manual.md b/docs/v2/manual.md
index 78a810072c..eba98b5a80 100644
--- a/docs/v2/manual.md
+++ b/docs/v2/manual.md
@@ -21,9 +21,14 @@ cli v2 manual
   * [Exit code](#exit-code)
   * [Combining short options](#combining-short-options)
   * [Bash Completion](#bash-completion)
+    + [Default auto-completion](#default-auto-completion)
+    + [Custom auto-completion](#custom-auto-completion)
     + [Enabling](#enabling)
-    + [Distribution](#distribution)
+    + [Distribution and Persistent Autocompletion](#distribution-and-persistent-autocompletion)
     + [Customization](#customization)
+    + [ZSH Support](#zsh-support)
+    + [ZSH default auto-complete example](#zsh-default-auto-complete-example)
+    + [ZSH custom auto-complete example](#zsh-custom-auto-complete-example)
   * [Generated Help Text](#generated-help-text)
     + [Customization](#customization-1)
   * [Version Flag](#version-flag)