Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: [PATCH] Completion: audit 'compset -P' calls to use shortest match where applicable, plus random drive-by tweaks.
- X-seq: zsh-workers 39481
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: Re: [PATCH] Completion: audit 'compset -P' calls to use shortest match where applicable, plus random drive-by tweaks.
- Date: Wed, 28 Sep 2016 18:18:18 +0000
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=MUTQTRMT3ANuEVK3aG4CZWFpMLM=; b=N/9itD Q+TOS5Nh0/zwjW4bgcHaLNcRLfUghn//YP/YEuCppuur5psXa7M3rFIPln3PaAob njSmyin2P4uHLQhBut0jX/TgaJBeT1LV90CUMISno9GHCfMxIbEPmU370O8JcsNJ pomuQ76MCEs5eqb6jJ/mYkxGGsDJu0CagPrz8=
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=MUTQTRMT3ANuEVK3aG4CZWFpMLM=; b=ejbuj ahnAuA0cJHBYCqx9uqDIJOZnI+wQD6nNsIcgSS6bKJPSROR6I22RpY7aS7L34FpN E4G6k6zDS3w818Lw3CyyYwvW2cHoNJs8C49murJ8os8Umu9OtghJJBhJBsGYVcVR YJ/FwtlPFjdIv7niwQ4NpICLEUNbU9bbCz/v0A=
- In-reply-to: <1475084797-17029-1-git-send-email-danielsh@fujitsu.shahaf.local2>
- 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
- References: <1475084797-17029-1-git-send-email-danielsh@fujitsu.shahaf.local2>
Daniel Shahaf wrote on Wed, Sep 28, 2016 at 17:46:37 +0000:
> Found by grepping for patterns that can match needles of various lengths:
>
> :grep 'compset -[PS].*[\#^*()\|<>?~\]' Completion/
A few more hunks of the same patch.
diff --git a/Completion/Debian/Command/_debfoster b/Completion/Debian/Command/_debfoster
index 154d0e9..08a1078 100644
--- a/Completion/Debian/Command/_debfoster
+++ b/Completion/Debian/Command/_debfoster
@@ -26,10 +26,10 @@ _arguments -C \
&& ret=0
if [[ -n "$state" ]]; then
- if compset -P '*='; then
+ if compset -P 1 '*='; then
case "$IPREFIX" in
*(#i)(install|remove|info)cmd*)
- _wanted values expl 'command string' _command && ret=0
+ _wanted values expl 'command string' _cmdstring && ret=0
;;
*(#i)(keeperfile|dpkg(status|available))*)
_wanted values expl 'metadata file' _files && ret=0
diff --git a/Completion/Linux/Command/_modutils b/Completion/Linux/Command/_modutils
index 0732aa1..7de97f6 100644
--- a/Completion/Linux/Command/_modutils
+++ b/Completion/Linux/Command/_modutils
@@ -123,7 +123,7 @@ _modutils() {
;;
params)
- if compset -P '*='; then
+ if compset -P 1 '*='; then
_message -e value 'parameter value'
else
local params
diff --git a/Completion/Zsh/Command/_fc b/Completion/Zsh/Command/_fc
index 68456cc..b90436a 100644
--- a/Completion/Zsh/Command/_fc
+++ b/Completion/Zsh/Command/_fc
@@ -68,7 +68,7 @@ esac
if [[ -n $state ]]; then
zstyle -s ":completion:${curcontext}:" list-separator sep || sep=--
- if [[ -z ${line:#*=*} ]] && compset -P '*='; then
+ if [[ -z ${line:#*=*} ]] && compset -P 1 '*='; then
_message -e replacements 'replacement'
elif [[ -prefix [0-9] ]]; then
events=( ${(0)"$(printf "%-${#HISTNO}.${#HISTNO}s $sep %s\0" "${(kv)history[@]}")"} )
diff --git a/Completion/Zsh/Type/_arrays b/Completion/Zsh/Type/_arrays
index 24c8957..c28fb17 100644
--- a/Completion/Zsh/Type/_arrays
+++ b/Completion/Zsh/Type/_arrays
@@ -2,4 +2,4 @@
local expl
-_wanted arrays expl array _parameters "$@" - -g '*array*'
+_wanted arrays expl array _parameters "$@" -g '*array*'
diff --git a/Completion/Zsh/Type/_globflags b/Completion/Zsh/Type/_globflags
index 5833dc8..13ef14c 100644
--- a/Completion/Zsh/Type/_globflags
+++ b/Completion/Zsh/Type/_globflags
@@ -1,5 +1,8 @@
#autoload
+# Complete 'globbing flags', i.e., '(#x)'; everything up to the '#' will
+# have been "compset -P"'d by the caller.
+
local ret=1
local -a flags
diff --git a/Completion/Zsh/Type/_ps1234 b/Completion/Zsh/Type/_ps1234
index 8edf0d0..0671ceb 100644
--- a/Completion/Zsh/Type/_ps1234
+++ b/Completion/Zsh/Type/_ps1234
@@ -58,11 +58,14 @@ if compset -P '%[FK]'; then
fi
if compset -P '%[0-9-\\]#(\\|)\([0-9-]#[^0-9]'; then
+ # ternary conditional: first delimiter
compset -S '*'
_delimiters && ret=0
elif compset -P '%[0-9-\\]#[<>\]]'; then
+ # truncation
_message -e replacements 'replacement string'
elif compset -P '%[0-9-\\]#(\\|)\([0-9-]#'; then
+ # ternary conditional: condition character
compset -S '[.:+/-%]*' || suf=( -S . )
compset -S '*'
specs=(
diff --git a/Completion/Zsh/Type/_vars b/Completion/Zsh/Type/_vars
index 0f97d6c..ec59c03 100644
--- a/Completion/Zsh/Type/_vars
+++ b/Completion/Zsh/Type/_vars
@@ -1,7 +1,7 @@
#compdef getopts unset
# This will handle completion of keys of associative arrays, e.g. at
-# `vared foo[<TAB>'.
+# `vared foo[<TAB>' could complete to `vared foo[key]'.
local ret=1
Messages sorted by:
Reverse Date,
Date,
Thread,
Author