From 2fd0845b7730f861a2cc672af7d760d13498a29d Mon Sep 17 00:00:00 2001
From: Takeshi Banse <takebi@laafc.net>
Date: Fri, 7 Jan 2011 21:43:09 +0900
Subject: [PATCH] Recreate the completion widget with its own function.

Currently, each completion widgets will be re-installed, but its
function will be statically associated with `_main_complete`.

We can get this function name via $widget[$event] which is the
zsh's zsh/zleparameter module's feature. We can use this information
for `zle -C`ing.

Signed-off-by: Takeshi Banse <takebi@laafc.net>
---
 zsh-syntax-highlighting.zsh | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh
index ed932cf..957684a 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -215,24 +215,27 @@ _zsh_highlight-zle-buffer() {
 
 # Bind all ZLE events from zle -la to highlighting function.
 _zsh_highlight-install() {
+  zmodload zsh/zleparameter 2>/dev/null || {
+    echo 'zsh-syntax-highlighting:zmoadload error. exiting.' >&2; return -1
+  }
+  local -a events; : ${(A)events::=${@:#(_*|orig-*|.run-help|.which-command)}}
   local clean_event
-  for event in "$@"; do
-    case $event in
-      _*|orig-*|.run-help|.which-command)
-        ;;
-      accept-and-menu-complete)
-        eval "$event() { builtin zle .$event && _zsh_highlight-zle-buffer } ; zle -N $event"
-        ;;
-      [^\.]*complete*)
-        eval "zle -C orig-$event .$event _main_complete ; $event() { builtin zle orig-$event && _zsh_highlight-zle-buffer } ; zle -N $event"
-        ;;
-      .*)
-        clean_event=$event[2,${#event}] # Remove the leading dot in the event name
-        eval "$clean_event() { builtin zle $event && _zsh_highlight-zle-buffer } ; zle -N $clean_event"
-        ;;
-      *)
-        ;;
-    esac
+  for event in $events; do
+    if [[ "$widgets[$event]" == completion:* ]]; then
+      eval "zle -C orig-$event ${${${widgets[$event]}#*:}/:/ } ; $event() { builtin zle orig-$event && _zsh_highlight-zle-buffer } ; zle -N $event"
+    else
+      case $event in
+        accept-and-menu-complete)
+          eval "$event() { builtin zle .$event && _zsh_highlight-zle-buffer } ; zle -N $event"
+          ;;
+        .*)
+          clean_event=$event[2,${#event}] # Remove the leading dot in the event name
+          eval "$clean_event() { builtin zle $event && _zsh_highlight-zle-buffer } ; zle -N $clean_event"
+          ;;
+        *)
+          ;;
+      esac
+    fi
   done
 }
 _zsh_highlight-install "${(@f)"$(zle -la)"}"