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,HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 21272 invoked from network); 11 Jan 2023 17:49:01 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 11 Jan 2023 17:49:01 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1673459341; b=YWErrVTwa1Ox2nTM6csI3Rcb645o96c6JfqIPhDxW83bPxa4mHJfQDEKQPv3EetApvKynOkrc5 ABSAEuA5uj3WkMbts1+iIfvodu9Y9wOjJEV8/0j5s7bv+y8j2PFjDEVw5HeZuc4Rt/QHNcU4x0 Sg2SR+ZhVhZu87cJYK4s/Fcsqczxsgums6CMTIYIEOj9CFRtXj2HXi/0kLQ2pX/cTqYFkzuLOA Q3QYhlY4UkeKDjyL6jGimjo3AI3gRb5V7idjM+YUewPsmiKQKr0wbj7lnBrF/djiAPa1FpMB+4 gubgcx7tIeKE4pNrAmWHjlLbWA4Dg9kJnyU0gUOMc2CcAg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ed1-f42.google.com) smtp.remote-ip=209.85.208.42; dkim=pass header.d=alumni.princeton.edu header.s=google header.a=rsa-sha256; dmarc=none header.from=alumni.princeton.edu; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1673459341; bh=UL0qDpyAB6kCoc08M0KnR6KO4WuSuMvR7wSqKoAg9XY=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=FtP/Gx+vkNlbSDuR3xzz4q8utl3qT7cdTGSkTwKemdUWNOFHRlAAEOev54oz5xhnn26634iJz4 9Tbt6jcL87GOoKCaCRQyYauNOxMISrlWb9TjozLBRR4hxVoCrhBQxRx8VMciP2hOHKc9u8Wi9g QjcNjxtZxRJiIUUfF/RoTjFQlqkv4kD6mZ9pX04qzZ7fmfeqrfzH07x1Wsxizm5BnZjtUhl0NY pgFpNyxxxc0MEZgUdt+RGXVOCBFE3DNpQEUhUkEfBmtFLOifjrYlatZVhyZsCc+REZbkaVrGl8 y7VSD/8zoFLMfpzFWWnZBW2ufWU9boM01E0WX9oqxtDX8A==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID :Date:From:In-Reply-To:References:MIME-Version:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=kVzAtepIYdOxAYyJNV/ljATFyLc4NX9xiAjq52t3t/A=; b=hk2d4RmAQJwWVStw97p6qvX2os HAzjizFXp8NZUVYFl2rJ3N+y53OLNzc2YMyVlTJHwfSQqowpgBm16t5eq8jzeHmf9aYdw893/UaSd K8XEm0BVFEC6pd/wZk48KnLvqJmUu7TuLNBv529VZm/bu5P7a69roNLT2VOSKp74OVRfLudhdrpSV Y0Z0k+NYQSDxgD2hc5GrdILOIwQHawL+wl3S+nfYb56Tn50bmnWdwxgY2oct955q1lczRwxsn5XGm /7lcNvE6r0a/1mELPf6kUzTDHUrTMXaTHDuztcWYbxID11RXNbX5s3BTjzwN2X0aG5lStd+Z5qbml MvH+ZWgQ==; Received: by zero.zsh.org with local id 1pFfDh-000N0r-3j; Wed, 11 Jan 2023 17:49:01 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ed1-f42.google.com) smtp.remote-ip=209.85.208.42; dkim=pass header.d=alumni.princeton.edu header.s=google header.a=rsa-sha256; dmarc=none header.from=alumni.princeton.edu; arc=none Received: from mail-ed1-f42.google.com ([209.85.208.42]:43730) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1pFfDT-000MhS-B4; Wed, 11 Jan 2023 17:48:47 +0000 Received: by mail-ed1-f42.google.com with SMTP id x10so20549881edd.10; Wed, 11 Jan 2023 09:48:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alumni.princeton.edu; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=kVzAtepIYdOxAYyJNV/ljATFyLc4NX9xiAjq52t3t/A=; b=SgV6/IOImRRlf4vGOxpM0ZKChpOcJaTBS1fHOsISuxQDPpf5w0iAyjS3+1CkphG+Ke eE+aWFKXnQk8I5YgS6C4osjz1Ak0FYYHPL35Qf94TqCEiaJ3inRdLYUzfB3G24xXulwE Sss2Qtp3A1n9+Q7akLJh2tsVHuCGYMEi31YpRU3MZMtYBxCtcuYED1hkCzdVDAx21peR RCjuwk/i1rM98ZrarUt0ocnAZgyQxRr+5U6f1A7nXiMLESF2vERvXYtRUNPTbmM3SrL6 t2RK6VNJ96eD/2nWq8eMxIyrgtNIM4HUYBGwNJ6hj3ceNYdjvNJFYoQ2OcnE3FgLm/6W DlhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kVzAtepIYdOxAYyJNV/ljATFyLc4NX9xiAjq52t3t/A=; b=6YD4JAnXZOR7MgX5SkK35IDv4yep3QOKa4xZyXSfCXzQ17cY2ocpLAKTPVBVLsXJnh 4kLELGun8GStHsaWlirMn1eYmK1FZPwrf7c2mVRj/P+fC4hcBJ9sL2DGSiJCVOBKSQcS Rip6KCD9oQsZy7lwllnGlKNFkBOtpICSOfocBMpKoGRpYj2sI1zjyhGiy3Dwh0yjsjwW l/xjdW28N8RzRV0GpooM3MZCMYzH6qPDwgymYsEmtT7/W5BNctC4/4JmYal+KVZ9Evh1 b7QBOwbBLkLVpoOO0ptAuVynXaZVFzU4RgPfBC12fNPHlPrdn/nDa78u1zQRALOGSBSy WlyA== X-Gm-Message-State: AFqh2kpsLYiaxWwNaD/0drN4YE2WC9aWboPHdXUcuLg+MNS7JGa+JtpE tGL/EbY2TisZOsrQR9JYxd5IZsZsC7Vb1p4R358QRpmw X-Google-Smtp-Source: AMrXdXtcSvlIXY+YZZGXL+VUNMK0ZWxVx+EF7SzHYqGe9qQMXoS0SCRKG+9qkaLs/mX8tTgvTRhoZ4RRu694r9/bfqQ= X-Received: by 2002:aa7:c6c5:0:b0:498:cfe:20c9 with SMTP id b5-20020aa7c6c5000000b004980cfe20c9mr2040869eds.220.1673459326284; Wed, 11 Jan 2023 09:48:46 -0800 (PST) MIME-Version: 1.0 References: <50065-1673458705.084910@HXP5.Ziln.rZq4> In-Reply-To: <50065-1673458705.084910@HXP5.Ziln.rZq4> From: Vin Shelton Date: Wed, 11 Jan 2023 12:48:09 -0500 Message-ID: Subject: Re: X04 Test Failure To: Oliver Kiddle Cc: "Zsh Hackers' List" Content-Type: multipart/alternative; boundary="000000000000b0779c05f2009c0c" X-Seq: 51298 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: --000000000000b0779c05f2009c0c Content-Type: text/plain; charset="UTF-8" I can confirm that the latest sources build and test 100%. Thanks - I'm sorry I didn't learn the test sufficiently to develop my own patch. - Vin On Wed, Jan 11, 2023 at 12:38 PM Oliver Kiddle wrote: > Vin Shelton wrote: > > Oliver - do you have a test update to reflect your region-highlighting > changes? > > Sorry yes, forgot to recheck the tests following the smaller later > patches. For some tests, the final 0m was not needed because ZLE is now > tracking the state in one place only so this is optimised away. Most > of them are due to 51289 where I removed the superfluous disabling of > underline and standout after it turns all attributes off. > > Thanks for checking. > > Oliver > > diff --git a/Test/X04zlehighlight.ztst b/Test/X04zlehighlight.ztst > index 6d9ca4a48..296635bf5 100644 > --- a/Test/X04zlehighlight.ztst > +++ b/Test/X04zlehighlight.ztst > @@ -79,7 +79,7 @@ > zpty_line 1 p # the line of interest, preserving escapes ("p") > zpty_stop > 0:region highlight - standout overlapping on other region_highlight entry > ->0m27m24mtr7mu0me word2 word3 > +>0mtr7mu0me word2 word3 > > zpty_start > zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4 > fg=green" ); }' > @@ -90,7 +90,7 @@ > zpty_line 1 p # the line of interest, preserving escapes ("p") > zpty_stop > 0:basic region_highlight with 8 colors > ->0m27m24mCDE|32|true0m > +>0mCDE|32|true > > zpty_start > zpty_input 'rh_widget() { region_highlight+=( "0 4 fg=green > memo=someplugin" ); typeset -p region_highlight }' > @@ -145,7 +145,7 @@ > zpty_line 1 p # the line of interest, preserving escapes ("p") > zpty_stop > 0:basic region_highlight with true-color (hex-triplets) > ->0m27m24m38;2;4;8;16mtrue0m > +>0m38;2;4;8;16mtrue > > zpty_start > zpty_input 'zmodload zsh/nearcolor' > @@ -157,7 +157,7 @@ > zpty_line 1 p # the line of interest, preserving escapes ("p") > zpty_stop > 0:basic region_highlight with near-color (hex-triplets at input) > ->0m27m24mCDE|3232|true0m > +>0mCDE|3232|true > > zpty_start > zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4 > fg=green" ); rh2; }' > @@ -169,7 +169,7 @@ > zpty_line 1 p # the line of interest, preserving escapes ("p") > zpty_stop > 0:overlapping region_highlight with 8 colors > ->0m27m24mCDE|32|tCDE|31|rCDE|32|ue0m > +>0mCDE|32|tCDE|31|rCDE|32|ue > > zpty_start > zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4 > fg=#00cc00" ); rh2; }' > @@ -181,7 +181,7 @@ > zpty_line 1 p # the line of interest, preserving escapes ("p") > zpty_stop > 0:overlapping region_highlight with true-color > ->0m27m24m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue0m > +>0m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue > > zpty_start > zpty_input 'zmodload zsh/nearcolor' > @@ -194,7 +194,7 @@ > zpty_line 1 p # the line of interest, preserving escapes ("p") > zpty_stop > 0:overlapping region_highlight with near-color (hex-triplets at input) > ->0m27m24mCDE|340|tCDE|3160|rCDE|340|ue0m > +>0mCDE|340|tCDE|3160|rCDE|340|ue > > zpty_start > zpty_input 'f () { zle clear-screen; zle g -f nolast; BUFFER=": > ${(q)LASTWIDGET}" }; zle -N f' > @@ -205,7 +205,7 @@ > zpty_line 1 p > zpty_stop > 0:zle $widgetname -f nolast > ->0m27m24m0m27m24m: clear-screen > +>0m0m: clear-screen > > %clean > > --000000000000b0779c05f2009c0c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I can confirm that the latest sourc= es build and test 100%.=C2=A0 Thanks - I'm sorry I didn't learn the= test sufficiently to develop my own patch.
=C2=A0 - Vin

On Wed, Jan 11, 2023 at= 12:38 PM Oliver Kiddle <opk@zsh.org&= gt; wrote:
Vin S= helton wrote:
> Oliver - do you have a test update to reflect your region-highlighting= changes?

Sorry yes, forgot to recheck the tests following the smaller later
patches. For some tests, the final 0m was not needed because ZLE is now
tracking the state in one place only so this is optimised away. Most
of them are due to 51289 where I removed the superfluous disabling of
underline and standout after it turns all attributes off.

Thanks for checking.

Oliver

diff --git a/Test/X04zlehighlight.ztst b/Test/X04zlehighlight.ztst
index 6d9ca4a48..296635bf5 100644
--- a/Test/X04zlehighlight.ztst
+++ b/Test/X04zlehighlight.ztst
@@ -79,7 +79,7 @@
=C2=A0 =C2=A0zpty_line 1 p=C2=A0 =C2=A0 =C2=A0 =C2=A0# the line of interest= , preserving escapes ("p")
=C2=A0 =C2=A0zpty_stop
=C2=A00:region highlight - standout overlapping on other region_highlight e= ntry
->0m27m24mtr7mu0me word2 word3
+>0mtr7mu0me word2 word3

=C2=A0 =C2=A0zpty_start
=C2=A0 =C2=A0zpty_input 'rh_widget() { BUFFER=3D"true"; regio= n_highlight+=3D( "0 4 fg=3Dgreen" ); }'
@@ -90,7 +90,7 @@
=C2=A0 =C2=A0zpty_line 1 p=C2=A0 =C2=A0 =C2=A0 =C2=A0# the line of interest= , preserving escapes ("p")
=C2=A0 =C2=A0zpty_stop
=C2=A00:basic region_highlight with 8 colors
->0m27m24mCDE|32|true0m
+>0mCDE|32|true

=C2=A0 =C2=A0zpty_start
=C2=A0 =C2=A0zpty_input 'rh_widget() { region_highlight+=3D( "0 4 = fg=3Dgreen memo=3Dsomeplugin" ); typeset -p region_highlight }' @@ -145,7 +145,7 @@
=C2=A0 =C2=A0zpty_line 1 p=C2=A0 =C2=A0 =C2=A0 =C2=A0# the line of interest= , preserving escapes ("p")
=C2=A0 =C2=A0zpty_stop
=C2=A00:basic region_highlight with true-color (hex-triplets)
->0m27m24m38;2;4;8;16mtrue0m
+>0m38;2;4;8;16mtrue

=C2=A0 =C2=A0zpty_start
=C2=A0 =C2=A0zpty_input 'zmodload zsh/nearcolor'
@@ -157,7 +157,7 @@
=C2=A0 =C2=A0zpty_line 1 p=C2=A0 =C2=A0 =C2=A0 =C2=A0# the line of interest= , preserving escapes ("p")
=C2=A0 =C2=A0zpty_stop
=C2=A00:basic region_highlight with near-color (hex-triplets at input)
->0m27m24mCDE|3232|true0m
+>0mCDE|3232|true

=C2=A0 =C2=A0zpty_start
=C2=A0 =C2=A0zpty_input 'rh_widget() { BUFFER=3D"true"; regio= n_highlight+=3D( "0 4 fg=3Dgreen" ); rh2; }'
@@ -169,7 +169,7 @@
=C2=A0 =C2=A0zpty_line 1 p=C2=A0 =C2=A0 =C2=A0 =C2=A0# the line of interest= , preserving escapes ("p")
=C2=A0 =C2=A0zpty_stop
=C2=A00:overlapping region_highlight with 8 colors
->0m27m24mCDE|32|tCDE|31|rCDE|32|ue0m
+>0mCDE|32|tCDE|31|rCDE|32|ue

=C2=A0 =C2=A0zpty_start
=C2=A0 =C2=A0zpty_input 'rh_widget() { BUFFER=3D"true"; regio= n_highlight+=3D( "0 4 fg=3D#00cc00" ); rh2; }'
@@ -181,7 +181,7 @@
=C2=A0 =C2=A0zpty_line 1 p=C2=A0 =C2=A0 =C2=A0 =C2=A0# the line of interest= , preserving escapes ("p")
=C2=A0 =C2=A0zpty_stop
=C2=A00:overlapping region_highlight with true-color
->0m27m24m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue0m
+>0m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue

=C2=A0 =C2=A0zpty_start
=C2=A0 =C2=A0zpty_input 'zmodload zsh/nearcolor'
@@ -194,7 +194,7 @@
=C2=A0 =C2=A0zpty_line 1 p=C2=A0 =C2=A0 =C2=A0 =C2=A0# the line of interest= , preserving escapes ("p")
=C2=A0 =C2=A0zpty_stop
=C2=A00:overlapping region_highlight with near-color (hex-triplets at input= )
->0m27m24mCDE|340|tCDE|3160|rCDE|340|ue0m
+>0mCDE|340|tCDE|3160|rCDE|340|ue

=C2=A0 =C2=A0zpty_start
=C2=A0 =C2=A0zpty_input 'f () { zle clear-screen; zle g -f nolast; BUFF= ER=3D": ${(q)LASTWIDGET}" }; zle -N f'
@@ -205,7 +205,7 @@
=C2=A0 =C2=A0zpty_line 1 p
=C2=A0 =C2=A0zpty_stop
=C2=A00:zle $widgetname -f nolast
->0m27m24m0m27m24m: clear-screen
+>0m0m: clear-screen

=C2=A0%clean

--000000000000b0779c05f2009c0c--