From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10444 invoked by alias); 18 Aug 2017 04:23:56 -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: 41567 Received: (qmail 25418 invoked by uid 1010); 18 Aug 2017 04:23:56 -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.87941 secs); 18 Aug 2017 04:23:56 -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=n5iosOjIhB0nTkn4sTpLaXL4vT3Rx9x0ChVdQ0TbU AY=; b=OS0/OcKRSBI2mLwKY3FBmmYTzIKZ7J57jtaWL0A1m0JEOrINMCes6DqWj 5dbsM/NhhgJHklRMl/w34diFIsRAXj/9EEA2EG2oJCwz+DJREwEDpFAQSIlXGwYz McfZX1RCNtd1/rs4oD9xEtTWeUWSHYnIGLzsnJDj5Dj8deCzq2FWGjvEzFcS23gB FRbgGHaOq00vyG0fWyczOLohfAYef0cl3PKIN2+t4yq0mGYArupNpEA0UO5r+4Xu VJb3WkJx7WCZwCYeo2/LPNiAbOqX/wb1tkHum5+30CrzUvjqg7RoffBZ0styQmMU F//VwGdWYklvF5hspCMP2KxFrZJFQ== 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=n5iosOjIhB0nTkn4sTpLaXL4vT3Rx9x0ChVdQ0TbU AY=; b=Rtaxntvmhv3Xfxy+qyySNCwh+WEHPhaMCcdUIhqD1MDQyLH8b9DJ4mxxW 9DWsoos1w73fbSbdYds576KLDM8NWgeN1Wm++8W6d2sytj4/voi/vychRkIUtmdd x2+M7Ftqf7gFoa77BxoPhfDhX2p9vpjLBM2iRmL8RUSzU41t6xZ0UoPVnAl/jAiO kztOBy7zhrXE4dxIn80ijAP7OUgMfYXZnKy3daV/Ak5C74wH5dWcdVS7/v9NAd3h OGcHb9lpSAuK+07IKVCBpSr2RwM/2t/itm4OlfGJ1EaXmbsw1fmQ1nD1xWkIRyRQ Ujrt+wlOPeNmMOxu1TW495mhzGuGA== X-ME-Sender: X-Sasl-enc: WIpB7i02bNH1vFlo2Gsys3tC0hDZdsuWVKLSG6nlMQFk 1503030232 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 2/2] _tmux: Complete detached sessions first for attach-session. Date: Fri, 18 Aug 2017 04:23:45 +0000 Message-Id: <20170818042345.30778-2-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170818042345.30778-1-danielsh@tarpaulin.shahaf.local2> References: <20170818042345.30778-1-danielsh@tarpaulin.shahaf.local2> --- Completion/Unix/Command/_tmux | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux index 48fe29aee..f71f7c33e 100644 --- a/Completion/Unix/Command/_tmux +++ b/Completion/Unix/Command/_tmux @@ -168,7 +168,7 @@ _tmux-attach-session() { '-c+[specify working directory for the session]:directory:_directories' \ '-d[detach other clients attached to target session]' \ '-r[put the client into read-only mode]' \ - '-t+[specify target session]:target session:__tmux-sessions' \ + '-t+[specify target session]:target session: __tmux-sessions-separately' \ "-E[don't apply update-environment option]" } @@ -1373,6 +1373,25 @@ function __tmux-sessions-attached() { _describe -t sessions 'attached sessions' sessions "$@" } +# Complete attached-sessions and detached-sessions as separate tags. +function __tmux-sessions-separately() { + local ret=1 + local -a sessions detached_sessions attached_sessions + sessions=( ${${(f)"$(command tmux 2> /dev/null list-sessions)"}/:[ $'\t']##/:} ) + detached_sessions=( ${sessions:#*"(attached)"} ) + attached_sessions=( ${(M)sessions:#*"(attached)"} ) + + # ### This seems to work without a _tags loop but not with it. I suspect + # ### that has something to do with _describe doing its own _tags loop. + _tags detached-sessions attached-sessions + # Placing detached before attached means the default behaviour of this + # function better suits its only current caller, _tmux-attach-session(). + _requested detached-sessions && _describe -t detached-sessions 'detached sessions' detached_sessions "$@" && ret=0 + _requested attached-sessions && _describe -t attached-sessions 'attached sessions' attached_sessions "$@" && ret=0 + + return ret +} + function __tmux-socket-name() { local expl sdir local curcontext="${curcontext}"