From ceeebaba04790bab2ecd03caded488528b0caf97 Mon Sep 17 00:00:00 2001
From: Andrzej Ressel <jereksel@gmail.com>
Date: Thu, 21 Jul 2016 00:02:16 +0200
Subject: [PATCH] [PoC] Improve zsh autocompletions

---
 autocomplete/zsh_autocomplete | 14 ++++++++++----
 help.go                       |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/autocomplete/zsh_autocomplete b/autocomplete/zsh_autocomplete
index 5430a18..371420c 100644
--- a/autocomplete/zsh_autocomplete
+++ b/autocomplete/zsh_autocomplete
@@ -1,5 +1,11 @@
-autoload -U compinit && compinit
-autoload -U bashcompinit && bashcompinit
+_cli_zsh_autocomplete() {
 
-script_dir=$(dirname $0)
-source ${script_dir}/bash_autocomplete
+  local -a opts
+  opts=("${(@f)$(${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+
+  _describe 'values' opts
+
+  return
+}
+
+compdef _cli_zsh_autocomplete $PROG
diff --git a/help.go b/help.go
index ba34719..5d24f04 100644
--- a/help.go
+++ b/help.go
@@ -129,7 +129,7 @@ func DefaultAppComplete(c *Context) {
 			continue
 		}
 		for _, name := range command.Names() {
-			fmt.Fprintln(c.App.Writer, name)
+			fmt.Fprintf(c.App.Writer, "%s:%s\n", name, command.Usage)
 		}
 	}
 }