From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14504 invoked by alias); 17 Aug 2017 17:18:04 -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: 41564 Received: (qmail 1323 invoked by uid 1010); 17 Aug 2017 17:18:04 -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 2.564193 secs); 17 Aug 2017 17:18:04 -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:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=iLdvNwJ3UP8Lw/VqZSzX/25QaxwmfuTSht5hrUfsg V0=; b=MYiDdfskjqSlJxTDmkoO6y1aGVRiq54jAd/2IAjz7x+GH3w1IkWp+M+Ud DGeaQUnnq4dMICR/sd4wLzBK2ZPP7gCBV+XWT+OxMPVbanK05CxT5UU0/DAir5Nh 4sO4UwAKq7u5IvWHm4VY+mBCL+0duuxyQjSVUm/kyyt1L4v/kPfZ/B1e/rGp/pWW koZ3NemL+0kJsUi9Mbx505xUNQXqR3XHFqkjoavTVCQ6OkjINRPNC502t8bI5q0U blRhWSD3IAyfkq6EznAdmym3eBirllORTy4CwdIhpmtffSLgplwCYw1mbL0emDga PLplVQ+9jgpPhO5xQ9ZYnLrG6Pbng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=iLdvNwJ3UP8Lw/VqZSzX/25QaxwmfuTSht5hrUfsg V0=; b=ZkTggt1rQRMNAt9EtKa7RYCGfLY273KkqvDiARmzy5L81h59KGRwUGXx9 cyVu8SSLDanhCLVKPnOXSdEWiqJCw41z5r8EQuTR+N3J+84v3tb1vrXqZC1fRZsr Yl7OhQQvGEUX85X1JaOa8EcryKs1Oqw2Z5wlxoeR/oSLpV498RvPK4lD00WhW8Mp KIx88PfrfifZw4eCgOj3D0D/xxPYMiH9STqx8XUcl5j83Vr6XxyN/X4imw/QAS0U BCXiEXuX270cWqBih34GU9fHJ0coZKNpM/0Dmdy0sIbxCjj3B3E6yMKlH/lQnb+s nfFf0ieOWYYOH7Xii6VMIpLlE43FQ== X-ME-Sender: X-Sasl-enc: Zhi7SrI1gw2D0UZxGCSrtT+RNi0KX4z3UHdR2AzddN7u 1502990276 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 17:17:53 +0000 Message-Id: <20170817171753.20486-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170817043927.14638-1-danielsh@tarpaulin.shahaf.local2> References: <20170817043927.14638-1-danielsh@tarpaulin.shahaf.local2> Also, teach show-environment not to offer --options after positional arguments. --- This patch replaces 41559. The reason it uses $(command tmux) rather than $(_call_program tmux) is for consistency with the rest of _tmux. Cheers, Daniel Completion/Unix/Command/_tmux | 99 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux index 0f142bb0e..7999be3eb 100644 --- a/Completion/Unix/Command/_tmux +++ b/Completion/Unix/Command/_tmux @@ -732,12 +732,33 @@ _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]' \ + '(-u)-r[remove variable before starting new processes]' \ + '(-r)-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]} )); then + action=unset + fi + if (( ${+opt_args[-r]} )); then + action=remove + 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 +825,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 +1029,63 @@ 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|remove) hint=" (or specify a new one)";; + (unset|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 + # TODO: this if/else is because '_describe ${hint:+"-x"}' prints the "No matches" error in addition to the message. + local msg="${dash_g[1]:+"global "}environment variables${hint}" + if _describe -t parameters $msg descriptions; then + : + elif [[ -n $hint ]]; then + _message $msg + fi + ;; + (value) + local var_and_val=${(@f)"$(command tmux 2>/dev/null show-env $dash_g -- ${(Q)words[-2]})"} + # TODO: this if/else is because '_description -x' prints the "No matches" error in addition to the message. + 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' }