From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23308 invoked by alias); 27 Jul 2016 22:34:06 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 38956 Received: (qmail 28583 invoked from network); 27 Jul 2016 22:34:06 -0000 X-Qmail-Scanner-Diagnostics: from nm17-vm8.bullet.mail.ir2.yahoo.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(212.82.96.223):SA:0(0.0/5.0):. Processed in 0.224472 secs); 27 Jul 2016 22:34:06 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM,SPF_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: okiddle@yahoo.co.uk X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.mail.yahoo.com designates 212.82.96.223 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1469658455; bh=wuKTH26MTCvEFl/jDdpuLokdaG2ZOjmsk7adlzyhJ8Y=; h=From:To:Subject:Date:From:Subject; b=Qo3jlmaGg4lb8SrWSoUuTauoaj/2QF6TWsGiZSQ3RxizeiCi86OJpGYuuwgo9Ifcxeq0vPxSRb/3JoSL8xAyZS7SF5zdoOk6F7lN1jDzJex0T5uT0GAwdZ+sGbPKya1AZuLE2triBktPARL7gYtp4UtPkEunU7biq+k+2xbpk5ChwAWeUvWjcg2cwAdw0E/uH8LmPlk8+vbczCoHXxHTZaA2bCrXzZKzm01cEZ7cXCc4jtGdtPSk/RNsULd8IOxhQg6z7bK3qQjjsxcP0ZIXGi4iN4lCGB1doRUzjAnXJJkXTeKjGzjZMryFO/l2S5dK6ORYISG1PC4I4id7pwv7kg== X-Yahoo-Newman-Id: 989527.78358.bm@smtp122.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Ii2J4DIVM1lqrhJHMVD6MyXLtEqUgoD_.FiXEhkCC9HG9cJ 8MD4NVUlKR8yYxkEUP.T3bZE4P3PIqTg7S6qm.kzkOr1PpNQJo1Rp.d0noyo 5WlVYKD3yHNST4iZsrOYuIZeuzqY3mGzrPdLnF6raVpXHiTwfXSJZLGUmSkr tdH.ePKdzwEq74TNe343XY.9Up514DoFvdet3b7.3KNHTfWHzpYo5IZ2POkT yYJTMiYst_LnzmP8_QJ2tnN2fFOk9UeOCjPcTeOFtFh9rDPipkIUr1JneP1q wx69RI9CVrjIMsLMXxAIcNH76mUbsyA4DdkeYLe4eN4QbTbQEb2tzEIOZHGr WnFaFaDVDBSyrcn7ywlZqejf3i3ik_GGFyLXIfXpWcLkbbJ4tkw.Q2HITMS3 QRlvsgpJETs6aHKp1INSHMaBOwKcN0YIPa63wdngrqXuYpa3igOk3sj9B7bC kyaNQbu5doB7uP4t9IcSsXHbkVFwfomewuNaQLf_aS3cU9d8Dy8K2pfwnMvd ZSeOIHJoy2_u4nLPQIxxaaVD1VTeaGGV5hhEf.QBfBD4- X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI- From: Oliver Kiddle To: Zsh workers Subject: PATCH: widget completion MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <83383.1469658454.1@hydra.kiddle.eu> Date: Thu, 28 Jul 2016 00:27:34 +0200 Message-ID: <83384.1469658454@hydra.kiddle.eu> We've got quite a few functions that need to complete zle widgets so it seems to warrant factoring out into an _widgets function. This at least encapsulates the matching control. Like _parameters and _files, this takes a -g option to glob match against the values in $widgets. Oliver diff --git a/Completion/Zsh/Command/_bindkey b/Completion/Zsh/Command/_bindkey index 4c4aeda..81ae699 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 2bcc87b..aba6488 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 3ed3733..f189b8f 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 da65dd6..93954a2 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 0000000..fdab281 --- /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]}]}"