From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6575 invoked by alias); 17 Aug 2017 04:39:36 -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: 41559 Received: (qmail 13591 invoked by uid 1010); 17 Aug 2017 04:39:36 -0000 X-Qmail-Scanner-Diagnostics: from out1-smtp.messagingengine.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(66.111.4.25):SA:0(-2.6/5.0):. Processed in 0.97823 secs); 17 Aug 2017 04:39:36 -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=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=dzlsEp 5KK8SIlxiNaRkiBwVE5wOwf3rSAtJ/EDTswM8=; b=VOkxJi9tWWta+NkiKabveI BqXrtY5aRoYwtcSB8neyUAikhiu9lqunDB7MP/oDbOkglMPmu8ok1pAVMKgY+qiB Zmnvo6qPqvOFWq5AP9tiNvVogN6soZvqGPbiTUvdLzD0W+rH9M8XYzSZry1p6iLY BjXtt6AlWo71auzJaazsvPYx4PoJwqft2QY+1AikNLwxBzmsoe8zmoYRIZcT88cL k1eDSD4xgRP+0hRXNGpjE9uDNMnE9w/1RBFNsOmv5jg0N32kpXVlw8WnYFLOXI7+ QYsijZUQ/dHJT0DLAyYmR7mTiLPt8G67GxeYZgyOiu1t3SM6h05ZY9nh/Od+3DaQ == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=dzlsEp 5KK8SIlxiNaRkiBwVE5wOwf3rSAtJ/EDTswM8=; b=fV29P1CjWt5hcGR+X1piCo 09kUJJvVrqWUAe3B5L4edGyMuo6jbQZgxUZSMi2lgzN2SBIrySPgAN6TjERT+CM/ vH/IPwzYH04zItPshBOu5Ce3755na3XSdKGoWjFgyBKS3lQjA6r+bCbAslhr3YCZ gm5+nK9qUTdoflPZOfsBgKIKJXmvP1dejUfd70R/aBIIWt8+5DGWvFMdmseg7U0K dUU395Nc7dkOshX6T3ETHAq6DCf6umT26yhq/vHsVqGpGIxFJ+dEnuZXWnWpxRGF lGlg78wBk3AogFg72w6E0WUSDso9VF1b0s7I2SFjBnz9dobMoC0cyNBtdJ4mwHYw == X-ME-Sender: X-Sasl-enc: 5MDwa5TpXncTkfn4vMo8vrhs9AkgQD5tBkUPhPvAGZcc 1502944770 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH] _tmux: Complete environment variables and their values for set-environment and show-environment. Date: Thu, 17 Aug 2017 04:39:27 +0000 Message-Id: <20170817043927.14638-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 Also, teach show-environment not to offer --options after positional arguments. --- Completion/Unix/Command/_tmux | 86 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 3 deletions(-) diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux index 0f142bb0e..179e09484 100644 --- a/Completion/Unix/Command/_tmux +++ b/Completion/Unix/Command/_tmux @@ -732,12 +732,30 @@ _tmux-set-buffer() { _tmux-set-environment() { [[ -n ${tmux_describe} ]] && print "(un)set an environment variable" && return - _arguments -s -A "-*" -S \ + local mode=session action=add + local curcontext="$curcontext" state line ret=1 + typeset -A opt_args + _arguments -C -s -A "-*" -S : \ '(-t)-g[modify global environment]' \ '-r[remove variable before starting new processes]' \ '-u[unset a variable]' \ '(-g)-t[specify target session]:target session:__tmux-sessions' \ - ':name' ':value' + ': :->name' '(-u -r)2: :->value' && ret=0 + + if (( ${+opt_args[-g]} )); then + mode=global + fi + if (( ${+opt_args[-u]} || ${+opt_args[-r]} )); then + action=remove-unset + fi + + # TODO: the exclusion "(-g -r)2:" doesn't work, so simulate it here + if [[ $action == remove-unset ]] && [[ $state == value ]]; then + __tmux-nothing-else + else + __tmux-environment-variables $mode $state $action && ret=0 + fi + return ret } _tmux-set-option() { @@ -804,10 +822,21 @@ _tmux-show-buffer() { _tmux-show-environment() { [[ -n ${tmux_describe} ]] && print "display the environment" && return - _arguments -s \ + local mode=session + local curcontext="$curcontext" state line ret=1 + typeset -A opt_args + _arguments -C -A "-*" -s : \ '(-t)-g[show global environment]' \ '-s[format output as Bourne shell commands]' \ '(-g)-t+[specify target session]:target session:__tmux-sessions' \ + '1:: :->name' && ret=0 + + if (( ${+opt_args[-g]} )); then + mode=global + fi + + __tmux-environment-variables $mode $state show && ret=0 + return ret } _tmux-show-messages() { @@ -997,6 +1026,57 @@ function __tmux-clients() { _describe -t clients 'clients' clients } +function __tmux-environment-variables() { + local mode="$1" state="$2" action="$3" + + local -a dash_g + case $mode in + (global) dash_g=(-g);; + (session) dash_g=();; + (*) return 1;; # bug in the caller + esac + + local hint + case $action in + (add) hint=" (or specify a new one)";; + (remove-unset) hint="";; + (show) hint="";; + (*) return 1;; # bug in the caller + esac + + case ${state} in + (name) + local -a vars_and_vals=( ${(@f)"$(command tmux 2>/dev/null show-env $dash_g)"} ) + local -a descriptions + local k_v k v + for k_v in $vars_and_vals; do + k=${k_v%%=*} + if [[ $k == -* ]]; then + k=${k#-} + v='(remove)' + else + v=${k_v#*=} + fi + descriptions+=( "${k//:/\\:}:$v" ) + done + _describe -t parameters "${dash_g[1]:+"global "}environment variables${hint}" descriptions + ;; + (value) + local var_and_val=${(@f)"$(command tmux 2>/dev/null show-env $dash_g -- ${(Q)words[-2]})"} + if [[ -n $var_and_val ]]; then + local -a expl + _description -x parameter-values expl "Value for ${words[-2]}" + compadd "$expl[@]" - ${var_and_val#*=} + else + _message "Value for ${words[-2]}" + fi + ;; + (*) + return 1 + ;; + esac +} + function __tmux-format() { _message 'not implemented yet' }