From 19f038b5fae9b1bec64495eaf8f1a1926716d0a9 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Fri, 10 Oct 2014 17:03:59 +0200
Subject: 33420: complete -R/-m options and fix feature completion

---
 Completion/Zsh/Command/_zmodload | 42 +++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'Completion/Zsh')

diff --git a/Completion/Zsh/Command/_zmodload b/Completion/Zsh/Command/_zmodload
index ffcab28dd..e144b981e 100644
--- a/Completion/Zsh/Command/_zmodload
+++ b/Completion/Zsh/Command/_zmodload
@@ -4,35 +4,38 @@ local suf comp state line expl curcontext="$curcontext" ret=1 NORMARG
 typeset -A opt_args
 suf=()
 
-_arguments -n -C -A "-*" -s \
-  '(-i -u -d -a -b -c -I -p -f -e)-A[create module aliases]' \
-  '-u[unload module]' \
-  '(-e)-a[autoload module]' \
-  '(-c -I -p -f)-b[autoload module for builtins]' \
-  '(-b -I -p -f)-c[autoload module for condition codes]' \
-  '(-i)-d[list or specify module dependencies]' \
-  '(-i -u -d -a -b -c -p -f -L -A)-e[test if modules are loaded]' \
-  '(-b -c -I -p)-f[autoload module for math functions]' \
-  '(-u -b -c -p -f -A)-F[handle features]' \
+_arguments -n -C -S -s \
+  '(-R -P -i -u -d -a -b -c -I -p -f -e -F -m)-A[create module aliases]' \
+  '(-)-R[remove module aliases]' \
+  '(-A -R -F -L -m -P -l -e)-u[unload module]' \
+  '(-d -e -l)-a[autoload module]' \
+  '(-c -d -I -p -f -F -P -l -m -A -R)-b[autoload module for builtins]' \
+  '(-b -d -I -p -f -F -P -l -m -A -R)-c[autoload module for condition codes]' \
+  '(-A -R -F -I -P -a -b -c -e -f -i -l -m -p)-d[list or specify module dependencies]' \
+  '(-i -u -d -a -b -c -p -f -L -R)-e[test if modules are loaded]' \
+  '(-b -c -d -I -p -F -P -l -m -A -R)-f[autoload module for math functions]' \
+  '(-u -b -c -d -p -f -A -R -I)-F[handle features]' \
+  '(-u -b -c -d -p -f -A -R -I)-m[treat feature arguments as patterns]' \
   '(-d -e)-i[suppress error if command would do nothing]' \
-  '(-b -c -p -f)-I[define infix condition names]' \
-  '(-u -b -c -p -f -A)-l[list features]' \
+  '(-b -c -d -p -f -F -P -m)-I[define infix condition names]' \
+  '(-u -b -c -d -p -f -A -R)-l[list features]' \
   '(-e -u)-L[output in the form of calls to zmodload]' \
-  '(-b -c -I -f)-p[autoload module for parameters]' \
-  '(-u -b -c -p -f -A)-P[array param for features]:array name:_parameters' \
-  '*:params:->params' && ret=0
+  '(-b -c -d -I -f -F -P -l -m -A -R)-p[autoload module for parameters]' \
+  '(-u -b -c -d -p -f -A -R)-P[array param for features]:array name:_parameters' \
+  '(-)*:params:->params' && ret=0
 
 [[ $state = params ]] || return ret
 
-(( $+opt_args[-A] )) && compset -P '*=' || suf=( -S '=' )
-
+if (( $+opt_args[-A] )); then
+  compset -S '=*' || compset -P '*=' || suf=( -S '=' )
+fi
 
 if (( $+opt_args[-F] && CURRENT > NORMARG )); then
   local module=$words[NORMARG]
   local -a features
 
   if [[ $modules[$module] != loaded ]]; then
-    _message "features for unloaded module"
+    _message -e features "feature for unloaded module"
   else
     zmodload -lFP features $module
     if compset -P -; then
@@ -41,6 +44,9 @@ if (( $+opt_args[-F] && CURRENT > NORMARG )); then
     elif compset -P +; then
       # only disabled features needed
       features=(${${features:#+*}##?})
+    else
+      # complete opposite of current feature state, + is default
+      features=(${${features#-}/(#s)+/-})
     fi
     _wanted features expl feature compadd -a features
   fi
-- 
cgit 1.4.1