From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id a2c78f7a for ; Fri, 14 Dec 2018 01:33:24 +0000 (UTC) Received: (qmail 7354 invoked by alias); 14 Dec 2018 01:33:03 -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: List-Unsubscribe: X-Seq: 43895 Received: (qmail 1209 invoked by uid 1010); 14 Dec 2018 01:33:03 -0000 X-Qmail-Scanner-Diagnostics: from mail-it1-f182.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.100.2/25112. spamassassin: 3.4.2. Clear:RC:0(209.85.166.182):SA:0(-1.9/5.0):. Processed in 3.429681 secs); 14 Dec 2018 01:33:03 -0000 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=nVFcmpv9bRccPkO4tpUu2Mt8t9ruforNS+QjdrBA6IM=; b=FNIIgzzUjhV+NbuwBhjtOJ6B1fANgG83oxTSV0648LqyaGKLnJ8pTWmMPs/I18H4Vc ezpF6d4TNZRk9e2lOOlcjIfe7tDgPOh45fTtEs14ThQVbTwbBbzk2/cFgYRzRoS7Ku+F vuxHQwJshIOgboFgxesugT4tTwrCMzdv3zlv6vwZ6g1l5+I04MH/voS2pF9Sz3e5wYhL JJdTDmuDWVsh0qHZzVqRd+kFg0+m44rGjf49cjn/0DL9WfbPgVzfExE0qRVQsyk561g5 v05bw5Chmspd432eWfGTF7qmTFrPhGZ1eT/KEPEC5g3y1ym4cHsCiXZbGX0QPbaLBROV hL6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=nVFcmpv9bRccPkO4tpUu2Mt8t9ruforNS+QjdrBA6IM=; b=h+M33G63IEu8QM1h/1R/i+9dY8+CY3o4I1r9ZwIuHoW+kQUEfMpV+hOkVHmoOU+5Dq bYi7aov7TQhjtZOM+kZ/wu0qK5IKbvFOLqpc53URN+yMuk5HgBvc8jl1IkxGcHLctwN7 sNpbHCw+2xJRlUcHFGdd7H+XD2dFJ7HwTAAbe2EYyXjz4ugVbU+H2+3j3McOOpkFMoE6 JRxiOKcYn+Nz2YDlxtVvXFL1TPp0ozJhklAKdPv2+jRR885YIGwEDzEPuPcHBvcUvI+C 3d/htpxoH+YLqfbEnQIDnjSBbCKafCZNh3apXH3qLZ1VsZrtt7qXms8T+nqxA0oVN8WL 4kwA== X-Gm-Message-State: AA+aEWb+uH5dy3J+0WxkJY3sGXwen/XZUUzU/PKMSRpvPV053VSuj1eb pa3eF4QxIl0DqcWx7VjxwICMDmdQ/RQ6bg== X-Google-Smtp-Source: AFSGD/VFdbtLllAih5sxQLbbtGatmkM0uMuc1xn6etVbOw7ipJ7+1S//K9oMedo6Ch9+1b6AXUFIsQ== X-Received: by 2002:a24:d081:: with SMTP id m123mr1574075itg.119.1544751176257; Thu, 13 Dec 2018 17:32:56 -0800 (PST) From: dana Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: [PATCH] Completion: Improve _watch Message-Id: Date: Thu, 13 Dec 2018 19:32:54 -0600 To: Zsh workers X-Mailer: Apple Mail (2.3445.9.1) Someone on IRC complained that the watch completion isn't very good As far as i can tell it's pretty typical for people to quote the first = operand of the command only when it represents a shell command string (as in `watch 'foo | grep bar'` =E2=80=94 so i made it so that we choose = between _cmdstring and _normal depending on that quoting. Hopefully not too magic dana diff --git a/Completion/Unix/Command/_watch = b/Completion/Unix/Command/_watch index a8d29403f..fff3d56f6 100644 --- a/Completion/Unix/Command/_watch +++ b/Completion/Unix/Command/_watch @@ -1,9 +1,42 @@ #compdef watch =20 -# watch(1) has completely different semantics on freebsd compared to = linux, hence: -case $OSTYPE in - (freebsd*|dragonfly*) _watch-snoop "$@";; - (*) _default;; +local variant ret=3D1 +local -a context line state state_descr +local -A opt_args + +_pick_variant -r variant procps=3Dprocps $OSTYPE --version + +case $variant in + (procps) + _arguments -s -S -A '-*' : \ + '(: * -)'{-h,--help}'[display help information]' \ + '(: * -)'{-v,--version}'[display version information]' \ + '(-b --beep)'{-b,--beep}'[beep on non-zero command exit]' \ + '(-c --color)'{-c,--color}'[interpret ANSI color/style = sequences]' \ + '(-d --differences)'{-d-,--differences=3D-}'[highlight changes = between updates]::how to highlight:(permanent)' \ + '(-e --errexit)'{-e,--errexit}'[freeze updates on non-zero = command exit]' \ + '(-g --chgexit)'{-g,--chgexit}'[exit on command output change]' \ + '(-n --interval)'{-n+,--interval=3D}'[specify update = interval]:update interval (seconds) [2]' \ + '(-p --precise)'{-p,--precise}'[run command at precise = intervals]' \ + '(-t --no-title)'{-t,--no-title}'[disable header]' \ + '(-x --exec)'{-x,--exec}'[pass command to exec(2) instead of `sh = -c`]' \ + '(-)*::: :->cmd' \ + && ret=3D0 + + [[ $state =3D=3D cmd ]] && + if + (( CURRENT =3D=3D 1 )) && + [[ $words[1] =3D=3D (\"|\'|\$\')* ]] && + [[ -z $opt_args[(i)(-x|--exec)] ]] + then + _cmdstring && ret=3D0 + else + _normal && ret=3D0 + fi + ;; + # watch(1) has completely different semantics on freebsd compared to = linux, hence: + (freebsd*|dragonfly*) _watch-snoop "$@" && ret=3D0 ;; + (*) _default && ret=3D0 ;; esac =20 -# NOTREACHED +return ret