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 20143beb for ; Sat, 8 Dec 2018 00:55:49 +0000 (UTC) Received: (qmail 22141 invoked by alias); 8 Dec 2018 00:55:34 -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: 43871 Received: (qmail 4018 invoked by uid 1010); 8 Dec 2018 00:55:34 -0000 X-Qmail-Scanner-Diagnostics: from mail-io1-f68.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.68):SA:0(-1.9/5.0):. Processed in 3.033089 secs); 08 Dec 2018 00:55:34 -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=97WpPHTkQ9TnSi8AI70PG56qKyhypejE5tygjeVgvuw=; b=W9Wtfsx71XcG3Z8Jbo6dk/Nw/x8DZ7T3CAR12sByHMuBGauTyHd4Cax0Ow4WtgxdcB E1wnbUuzt/UdXIZ+lsp2mmnwUaNUYLtXZIbvQyOaMHYz8Faa1+kGHUbgDmp1ZMP5KEVa QmuiduVqGtqYxmurPJHdvoyt20jQ31p6o72Hmdu5isEIvifTULlfPtv4OiEcRhbZwnfS jaIOYEgga+3ZGdtT7MB1HZ2C6cQKEIXSuZqTiA2fMwuqzaJ6xbT5lY/ygqX8fFp2vxhY Z+Un36g5WOGIwWFZOnUwoc2aFyOqhNNildkDzruta0YNk+ZSf99KrF9uIvnn5uKU5N4a eBWQ== 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=97WpPHTkQ9TnSi8AI70PG56qKyhypejE5tygjeVgvuw=; b=TannPTTuWRLbpxSt5OO/juxwFaTiE2T/cy4KMo8t23dhfiSwbGEX3KBrt75VhMEn8h fyHkJWTmDyWUYhFnpeye87o43ijrGSybADoelbUYzTlz852W7HB2wk/04Ah4qrPla73Z HUFne6/zFOlUF9VgBY75Y36IK8mFem1uAj6Hq8H1+CANYwTb/sNFY8zgmjIsKPAU5YCf 2csaxJZ2PJyrzPR11avJO/KSwBPgAQbFSk5tFgs9lI4n58wSmjzXslC03Bz1KzBqril+ gEx5Jc5YgxVoLIGEKhSuXgGc/SaEhLdhpzpilM6xzGJNBtYglT9LbZl9VACrzQ694tK/ 2Okw== X-Gm-Message-State: AA+aEWZfTfcsWNshacentHJAfmSELKrAQm+3lzn5/r67TVStQdETmS0g W48xmnSOxF5uIu+ldZbkgMU4c8xg0MXOdQ== X-Google-Smtp-Source: AFSGD/V2gz9hZQNoRLVr8SGY5436p05dd3HIjuM6eKu6eJjzCcIu7/14n+LttvWqhAZxt4eukH01vw== X-Received: by 2002:a5d:84ce:: with SMTP id z14mr3821227ior.164.1544230528413; Fri, 07 Dec 2018 16:55:28 -0800 (PST) From: dana Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: [PATCH] Completion: Fix `_files -F '(pat ...)'` Message-Id: <6027705B-D6FE-47AB-B831-4C7345B1713E@dana.is> Date: Fri, 7 Dec 2018 18:55:26 -0600 To: Zsh workers X-Mailer: Apple Mail (2.3445.9.1) _files doesn't support the `-F '(pat ...)'` syntax that _path_files itself does. Just carrying the same check over from _path_files fixes it. I noticed that this method can't support patterns containing white space, though. For example, `-F '(a\ *b)'` yields an array with the patterns `a`, `\ `, and `*b`. Would it be better to use something like ${(Q)${(Z)ignvars[2,-2]}} here, or do we just say that if you need white space you have to use an intermediate array? dana diff --git a/Completion/Unix/Type/_files b/Completion/Unix/Type/_files index e3212c952..467ed747c 100644 --- a/Completion/Unix/Type/_files +++ b/Completion/Unix/Type/_files @@ -46,6 +46,8 @@ if (( tmp )); then ignvars=($=opts[tmp+1]) if [[ $ignvars = _comp_ignore ]]; then ign=( $_comp_ignore ) + elif [[ $ignvars = \(* ]]; then + ign=( ${=ignvars[2,-2]} ) else ign=() for ignvar in $ignvars; do