From 54d5f8e3632ca3698d90662d49d1320f91827078 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Thu, 28 Jul 2016 16:12:59 +0200
Subject: 38956: factor out zle widget completion into its own function

---
 ChangeLog                                    | 6 ++++++
 Completion/Zsh/Command/_bindkey              | 7 ++-----
 Completion/Zsh/Command/_vared                | 4 ++--
 Completion/Zsh/Command/_zle                  | 8 ++++----
 Completion/Zsh/Function/_add-zle-hook-widget | 5 ++---
 Completion/Zsh/Type/_widgets                 | 9 +++++++++
 6 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 Completion/Zsh/Type/_widgets

diff --git a/ChangeLog b/ChangeLog
index 4c208cbcf..6a5b0e5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-07-28  Oliver Kiddle  <opk@zsh.org>
 
+	* 38956: Completion/Zsh/Command/_bindkey,
+	Completion/Zsh/Command/_vared, Completion/Zsh/Command/_zle,
+	Completion/Zsh/Function/_add-zle-hook-widget,
+	Completion/Zsh/Type/_widgets: factor out zle widget completion
+	into its own function
+
 	* unposted: Functions/Zle/vi-pipe: fix for visual mode
 
 2016-07-28  Peter Stephenson  <p.stephenson@samsung.com>
diff --git a/Completion/Zsh/Command/_bindkey b/Completion/Zsh/Command/_bindkey
index 4c4aeda9d..81ae69974 100644
--- a/Completion/Zsh/Command/_bindkey
+++ b/Completion/Zsh/Command/_bindkey
@@ -27,14 +27,11 @@ _arguments -C -s -S \
   '(-l -L -d -D -A -N -m -p -r *)-s[bind each in-string to each out-string]:*:key string' \
   '(-e -v -a -M -l -L -d -D -A -N -m -p)-R[interpret in-strings as ranges]' \
   '(-l -L -d -A -N -m -p -r -s):in-string' \
-  '(-l -L -d -A -N -m -p -r -s)*::widgets:->widget' && ret=0
+  '(-l -L -d -A -N -m -p -r -s)*::widgets:_widgets' && ret=0
 
 case $state in
   keymap)
-    _wanted -C -M keymaps expl keymap compadd -a keymaps && ret=0
-  ;;
-  widget)
-    _wanted widgets expl widget compadd -M 'r:|-=* r:|=*' -k widgets && ret=0
+    _wanted keymaps expl keymap compadd -a keymaps && ret=0
   ;;
 esac
 
diff --git a/Completion/Zsh/Command/_vared b/Completion/Zsh/Command/_vared
index 2bcc87bc8..aba64880a 100644
--- a/Completion/Zsh/Command/_vared
+++ b/Completion/Zsh/Command/_vared
@@ -6,8 +6,8 @@ _arguments -s -A "-*" \
   "-c[create parameter or change type]" \
   '-p+[specify left prompt]:prompt' \
   '-r+[specify right prompt]:right prompt' \
-  '-i+[specify initialisation widget]:widget:compadd -M "r\:|-=* r\:|=*" -k widgets' \
-  '-f+[specify finish widget]:widget:compadd -M "r\:|-=* r\:|=*" -k widgets' \
+  '-i+[specify initialisation widget]:widget:_widgets' \
+  '-f+[specify finish widget]:widget:_widgets' \
   '-h[allow access to history]' \
   '-e[exit on EOF (^D)]' \
   '1:parameter spec:_vars'
diff --git a/Completion/Zsh/Command/_zle b/Completion/Zsh/Command/_zle
index 3ed373348..f189b8fd9 100644
--- a/Completion/Zsh/Command/_zle
+++ b/Completion/Zsh/Command/_zle
@@ -48,20 +48,20 @@ case "$state[1]" in
       '(-)*:widget arguments: ' && ret=0
     ;;
   (widget*)
-    _wanted -C "$context[1]" widgets expl "${state_descr[1]:-widget}" compadd -k widgets && ret=0
+    _wanted -C "$context[1]" widgets expl "${state_descr[1]:-widget}" _widgets && ret=0
     ;&
   (function)
     [[ $state[1] != *function ]] ||	# Handle fall-through
     _wanted -C "$context[1]" functions expl 'widget shell function' \
-      compadd -k functions && ret=0
+      compadd -M 'r:|-=* r:|=*' -k functions && ret=0
     ;;
   (comp-widget)
     _wanted -C "$context[1]" widgets expl 'completion widget' \
-      compadd -k "widgets[(R)(*:|)(.|)(${(j(|))compwids})(|:*)]" && ret=0
+      _widgets -g "(*:|)(.|)(${(j(|))compwids})(|:*)" && ret=0
     ;&
   (builtin-comp-widget)
     _wanted -C "$context[1]" widgets expl 'builtin completion widget' \
-      compadd -k "widgets[(I)(.|)(${(j(|))compwids})]" && ret=0
+      compadd -M 'r:|-=* r:|=*' -k "widgets[(I)(.|)(${(j(|))compwids})]" && ret=0
     ;;
   (redisplay)
     _arguments -s -S '!-R' \
diff --git a/Completion/Zsh/Function/_add-zle-hook-widget b/Completion/Zsh/Function/_add-zle-hook-widget
index da65dd6e9..93954a2bb 100644
--- a/Completion/Zsh/Function/_add-zle-hook-widget
+++ b/Completion/Zsh/Function/_add-zle-hook-widget
@@ -4,7 +4,7 @@ _add-zle-hook-widget_types() {
   local -a tmp
 
   autoload -U add-zle-hook-widget
-  add-zle-hook-widget -h > /dev/null # sets the zstyle
+  add-zle-hook-widget -h >&/dev/null # sets the zstyle
   zstyle -g tmp zle-hook types
 
   compadd "$@" -M 'L:|=zle-' -M 'r:|-=* r:|=*' -- zle-${^tmp}
@@ -16,8 +16,7 @@ _add-zle-hook-widget_widgets() {
     zstyle -g tmp $line[1] widgets
     _wanted widgets expl "installed hook" compadd -- ${tmp#<->:} && return 0
   else
-    local -a user_widgets=( ${(k)widgets[(R)user:*]} )
-    _wanted widgets expl widget compadd -M 'r:|-=* r:|=*' -a user_widgets && return 0
+    _wanted widgets expl widget _widgets -g 'user:*' && return 0
   fi
   return 1
 }
diff --git a/Completion/Zsh/Type/_widgets b/Completion/Zsh/Type/_widgets
new file mode 100644
index 000000000..fdab2814e
--- /dev/null
+++ b/Completion/Zsh/Type/_widgets
@@ -0,0 +1,9 @@
+#autoload
+
+local expl pattern
+
+pattern=( -g \* )
+zparseopts -D -K -E g:=pattern
+
+_description widgets expl widget
+compadd "$@" "$expl[@]" -M 'r:|-=* r:|=*' - "${(@k)widgets[(R)${pattern[2]}]}"
-- 
cgit 1.4.1