From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 18120 invoked from network); 6 Apr 2021 11:38:56 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 6 Apr 2021 11:38:56 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1617709136; b=ubMQvT+3rTiVMwBxwDMo5brEMBZ7mRscSQYFnCibnl3HaIiwIGeS3PSmKWNvpoZl4bUVESqV+V xHxbdT79wNIcqRE0+iUKoR7Oeb2+MCboHXn9QQNL2nbC1KeT6OYg7t2S9tuz4Hlyoxw9nIyj4u e/x8+AOrpC7Yn/h+LTZsy5RiTRIDVoHPHGjB8eOMXFD9eXAR+lknhxaAcGxMI7rZ0ZhIwVI2iN QzQp7J3ftdEnYdcwiOxKQhvGPqmCi0RpPDtdvlu89YUmCA30VrO1kW+7K23vDT5fhen6xUifCV oVKy3skPKYRwX49VGYHO19vdQPjvt3/r6WH/wlhestXmEg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lf1-f41.google.com) smtp.remote-ip=209.85.167.41; dkim=pass header.d=gmail.com header.s=20161025 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20200801; t=1617709136; bh=6H/DLWxKZJO6ixs7nmhyT0QR2RMF/2a6uWkW6rjM6XU=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:References:To:Cc:In-Reply-To:Date:Subject:MIME-Version: Content-Type:Message-ID:From:DKIM-Signature:DKIM-Signature; b=dvjKnT+RgJVAOFPUhgLfZ+Vcqldx/iSVFNfsW9DolcZaIj3zsVcf0fFod6G1o/uyCZBYkTsKT/ 0rcPEcalt//2l5lsyZsIBddzarPBDUF6l96DV9LRGo/Xy10pniOmrToaSM5o85clpmLb2sFeJT V8tWn4OrhfoSM1dxLX76UmzayJm8I+RoJ04oP71iNCtGmGMxk9hugI8Hza43QZ/uAXQXLbL6oq LnDf2S3bcQm/cmuQIRjUOTUIJNo42Sf+RbbM8xnW9tYDih7RaG/1YMsikatV+HCuRevynDqoYg Zvm21ouk1JqTRjJJFKDaG75OCMY4/1Zhujt3IlqhV+TBOw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:References:To:Cc:In-Reply-To:Date: Subject:Mime-Version:Content-Type:Message-Id:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=8ooYAcjMEEGWdrY9kX39XlJQorEMb/7cV21aZSHduRc=; b=y6YYx3f1IHsCIyvn07gyKUS1y1 56x7PGWDEnBQqC2aSEffjnuy1oLGgkFZmWMwIQQBJQN8Gl914jt0Cl0n457DWt9oyZpZZKBiAzPbP GxZ1teCsZbylDT/UlGGP6ULv+zvAdgMj40H8GMYjDIOiB/xk/kWJ3wSV5UdRL0FjBD8KKzZyB1UcS /AzV7Ur4w2rae5q1D50UBIgx3XCcmgf5x1OYjpFAOH7Icxi3JqS7/pRE7O994jEJFpELhJEprTcY8 A3MyMN1hHtpq9f3p0TbRIvbybzOjvFfA2yc0fLwOvMwnOwJuvqmF5BBKjJzClh8yqnkNGlXQAUIWm ENpfSyYw==; Received: from authenticated user by zero.zsh.org with local id 1lTk2p-000JK7-6Y; Tue, 06 Apr 2021 11:38:55 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lf1-f41.google.com) smtp.remote-ip=209.85.167.41; dkim=pass header.d=gmail.com header.s=20161025 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-lf1-f41.google.com ([209.85.167.41]:41760) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1lTk2Y-000J5E-Re; Tue, 06 Apr 2021 11:38:39 +0000 Received: by mail-lf1-f41.google.com with SMTP id b14so22149778lfv.8; Tue, 06 Apr 2021 04:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=8ooYAcjMEEGWdrY9kX39XlJQorEMb/7cV21aZSHduRc=; b=rrRlfJM9tu2SbvBVDMV40Keg1Cqya/N594u3uSBArNgeBkGRTgPzLUexVacMB/AG0q ncj7iliTJZpM3u3z5TsJ1SiKQ3o0tsNvgAlVfkG9l023j5IN5wnkm9fjYrHD5OqGqmsy 9y0bKpTfU4KLuHJXxruZiwMaHLkZGPgUPWyBq0cbfPNStLcAkuQdEodnN6zDHp8uETAr Q2f4r0UhZD6bKFR81jLJQmEN9hJ+vo6UJUyNbiH+jhbIcn1PkWZggqs9icg8uZRNYMXL +Wo91wR2khxTDYiF6zvpKK0iqcvAyGyRnrqmJHy+2pvtwsX87Fon+IxtSltBBesMqjll TwAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=8ooYAcjMEEGWdrY9kX39XlJQorEMb/7cV21aZSHduRc=; b=gfNiHnRyJbMSO7Jyyxj4Blp9aqId6X3E8Frr9IINPBHfEtCI0AKgLZknXaZeob0tRg Tc9LhX08PeMb5vZwo4cbq5e/NBeuaCbMZlPE+wRMCbSyN5vAcNOz/dU1VXTZvIglH9LU xwTZ6r+pXQM9hJV2bbqu/nO8nFGl2FVRepbuObvpaBmCpl1bp9dLZFbGSOVTlteyWgbG pdXAXvWCgUHDoUGd6NouL8/AVVlNaWPhno5HEu2GnjcIlXE7Mz5SJ+UUCAFFjdajf0o7 kl+DINg7AhDeLd9YXkt1TPNLpy1Cgx1jtKBUpDHThgKDEiHInQu7WriSBFRKtsT+4sWC ySBg== X-Gm-Message-State: AOAM533/VJLuWgkYVT7blo8qw6rbSx5dCivNu5/ssxr/xueChJ3v4wuh eoVGVIq2QfYLZ6Q7efRGx4k= X-Google-Smtp-Source: ABdhPJxJU584xXvxwPpOp7RV2b4JUhS7i/bNU1IMG8YpgAmBY27q5cTRDAJavqbpgHCtqLgLsnFLXg== X-Received: by 2002:a19:b4d:: with SMTP id 74mr2450158lfl.136.1617709118045; Tue, 06 Apr 2021 04:38:38 -0700 (PDT) Received: from [192.168.1.15] (hag-tkubng22-50df3e-132.dhcp.inet.fi. [80.223.62.132]) by smtp.gmail.com with ESMTPSA id x29sm2190454lfn.60.2021.04.06.04.38.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Apr 2021 04:38:37 -0700 (PDT) From: Marlon Message-Id: Content-Type: multipart/mixed; boundary="Apple-Mail=_8557BDCC-CA15-45AA-9B98-7B9C7ABE02C9" Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: Y01 Test Failure on Arch Date: Tue, 6 Apr 2021 14:38:36 +0300 In-Reply-To: <89AC4C5F-AF90-4A01-B0AD-F2326D28F132@kba.biglobe.ne.jp> Cc: zsh-workers@zsh.org To: Jun T , Oliver Kiddle References: <89AC4C5F-AF90-4A01-B0AD-F2326D28F132@kba.biglobe.ne.jp> X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Seq: 48413 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: --Apple-Mail=_8557BDCC-CA15-45AA-9B98-7B9C7ABE02C9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 6. Apr 2021, at 7.23, Jun T wrote: >=20 > Aha! > It was a mystery for me how you could run Y01 successfully. > Sorry for not going back to your original post. > I believe Oliver was just too busy when committing the patch. >=20 > But the test still fails as follows: >=20 > --- /tmp/zsh.ztst.34237/ztst.out 2021-04-06 13:06:20.000000000 = +0900 > +++ /tmp/zsh.ztst.34237/ztst.tout 2021-04-06 13:06:20.000000000 = +0900 > @@ -8,9 +8,9 @@ > NO:{dir1 dir2 file1 file2} > DESCRIPTION:{original} > NO:{*} > -line: {: dir1/}{} > line: {: dir2/}{} > line: {: file1 }{} > line: {: file2 }{} > line: {: dir1 dir2 file1 file2 }{} > line: {: *}{} > +line: {: dir1/}{} > Test ./Y01completion.ztst failed: output differs from expected as = shown above for: > comptest $': *\t\t\t\t\t\t\t' > Was testing: _expand shows file types > ./Y01completion.ztst: test failed. >=20 > Can you reproduce this? > Is it OK to replace "comptest $': *\t\t\t\t\t\t\t'" by "comptest $': = *\t'" > as in my patch in workers/48363=E2=81=A9? Yes, I can reproduce it. However, I don=E2=80=99t think we should = discard all of the additional `\t`s, since it also tests the suffixes = that _expand adds, which are different from _complete. I would like to = suggest a slightly different fix. See attached patch. --Apple-Mail=_8557BDCC-CA15-45AA-9B98-7B9C7ABE02C9 Content-Disposition: attachment; filename=0001-Fix-_expand-completion-test.txt Content-Type: text/plain; x-unix-mode=0644; name="0001-Fix-_expand-completion-test.txt" Content-Transfer-Encoding: quoted-printable =46rom 032b6bd0b7c90e3bed9fbd7771ea1b6969b4c24f Mon Sep 17 00:00:00 2001 From: Marlon Richert Date: Tue, 6 Apr 2021 14:29:26 +0300 Subject: [PATCH] Fix _expand completion test --- Test/Y01completion.ztst | 3 +-- Test/comptest | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst index eff6910c2..858fa7220 100644 --- a/Test/Y01completion.ztst +++ b/Test/Y01completion.ztst @@ -44,7 +44,7 @@ >line: {: dir1/}{} >line: {: dir2/}{} =20 - comptest $': *\t\t\t\t\t\t\t' + comptest $': *\t\t\t\t\t\t' 0:_expand shows file types >line: {: dir1/}{} >DESCRIPTION:{expansions} @@ -56,7 +56,6 @@ >NO:{dir1 dir2 file1 file2} >DESCRIPTION:{original} >NO:{*} ->line: {: dir1/}{} >line: {: dir2/}{} >line: {: file1 }{} >line: {: file2 }{} diff --git a/Test/comptest b/Test/comptest index a36e301e0..79c69979a 100644 --- a/Test/comptest +++ b/Test/comptest @@ -40,6 +40,7 @@ KEYTIMEOUT=3D1 setopt zle autoload -U compinit compinit -u +zstyle ":completion:*" completer _expand _complete _ignored zstyle ":completion:*:default" list-colors "no=3D" "fi=3D" = "di=3D" "ln=3D" "pi=3D" "so=3D" "bd=3D" "cd=3D" = "ex=3D" "mi=3D" "tc=3D" "sp=3D" "lc=3D" "ec=3D\n" = "rc=3D" zstyle ":completion:*" group-name "" zstyle ":completion:*:messages" format "%d @@ -50,9 +51,9 @@ zstyle ":completion:*:options" verbose yes zstyle ":completion:*:values" verbose yes setopt noalwayslastprompt listrowsfirst completeinword zmodload zsh/complist -expand-or-complete-with-report () { - print -lr "" - zle expand-or-complete +complete-word-with-report () { + print -lr "" + zle complete-word print -lr - "$LBUFFER" = "$RBUFFER" zle clear-screen zle -R @@ -80,11 +81,11 @@ zle-finish () { (( $+mark )) && print -lr "MARK: $mark" zle accept-line } -zle -N expand-or-complete-with-report +zle -N complete-word-with-report zle -N list-choices-with-report zle -N comp-finish zle -N zle-finish -bindkey "^I" expand-or-complete-with-report +bindkey "^I" complete-word-with-report bindkey "^D" list-choices-with-report bindkey "^Z" comp-finish bindkey "^X" zle-finish --=20 2.31.0 --Apple-Mail=_8557BDCC-CA15-45AA-9B98-7B9C7ABE02C9 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii --Apple-Mail=_8557BDCC-CA15-45AA-9B98-7B9C7ABE02C9--