Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] _bindkey: Fix first argument completion.

X-seq: zsh-workers 33977
From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
To: zsh-workers@xxxxxxx
Subject: [PATCH] _bindkey: Fix first argument completion.
Date: Tue, 16 Dec 2014 01:37:23 +0000
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=x-sasl-enc:date:from:to:subject:message-id :mime-version:content-type; s=mesmtp; bh=C7CIiA5R27GYtzl/0eZ70E4 i7rw=; b=QWh0dqhxSzw0HFbPDp4l0wk2LaGEpanu+FeL/sYahUF7xtGHJq4B27K xs7KHPX2uwTnLWA63lggnbeTo8QyF5fEJvj8T28q7grUQUriPteW4SKY+J94w3AM a27ZmjSGDffKQjVn2cs/XApZGF1gU2vKerzKBdfFs75LOZ5GcMKM=
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:date:from:to:subject :message-id:mime-version:content-type; s=smtpout; bh=C7CIiA5R27G Ytzl/0eZ70E4i7rw=; b=UjAqyuVIxpw2hrYMbYW4NzNjsG9ZIi1u/AF5gxQ7MTG zxN47A9w20TAB0o7eSaOdv5YQzgDJmDa84BWlSTEGO3DI2SbkQTIgoVTHn03LsIF BEjoFGheGsa0Z4bJBdbUNMhPj+wSKXjV1ynXQuv7pYbpDL0QXDvBKi8QMlHbqqBQ =
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm

Before this commit, 'bindkey -<TAB>' would offer screenfuls of widgets, rather
than just the options.  That was caused by the 'r:|-=* r:|=*' matcher being
applied, which considered the "-" a possible positional argument.

Fix the problem by informing _arguments that the first positional argument can
never be a widget.
---
 Completion/Zsh/Command/_bindkey |    1 +
 1 file changed, 1 insertion(+)

diff --git a/Completion/Zsh/Command/_bindkey b/Completion/Zsh/Command/_bindkey
index 045cba9..4c4aeda 100644
--- a/Completion/Zsh/Command/_bindkey
+++ b/Completion/Zsh/Command/_bindkey
@@ -26,6 +26,7 @@ _arguments -C -s -S \
   '(-l -L -d -D -A -N -m -s *)-r[unbind specified in-strings]:*:in-string' \
   '(-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
 
 case $state in
-- 
1.7.10.4

From f7aafab1fbeba95ad601fb67d0ae40d7f8cba6ce Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
Date: Mon, 15 Dec 2014 17:31:35 +0000
Subject: [PATCH] _bindkey: Fix first argument completion.

Before this commit, 'bindkey -<TAB>' would offer screenfuls of widgets, rather
than just the options.  That was caused by the 'r:|-=* r:|=*' matcher being
applied, which considered the "-" a possible positional argument.

Fix the problem by informing _arguments that the first positional argument can
never be a widget.
---
 Completion/Zsh/Command/_bindkey |    1 +
 1 file changed, 1 insertion(+)

diff --git a/Completion/Zsh/Command/_bindkey b/Completion/Zsh/Command/_bindkey
index 045cba9..4c4aeda 100644
--- a/Completion/Zsh/Command/_bindkey
+++ b/Completion/Zsh/Command/_bindkey
@@ -26,6 +26,7 @@ _arguments -C -s -S \
   '(-l -L -d -D -A -N -m -s *)-r[unbind specified in-strings]:*:in-string' \
   '(-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

 case $state in
-- 
1.7.10.4

Messages sorted by: Reverse Date, Date, Thread, Author