From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Noah Peart Newsgroups: gmane.emacs.bugs Subject: bug#68054: [PATCH] Add tree-sitter indent rule for lexical decls in js/typescript Date: Tue, 23 Apr 2024 19:36:45 -0700 Message-ID: References: <797AC075-B0C8-4269-B8E3-A1F2C69FA955@gmail.com> <14DD6D3A-B9F5-4E5F-B85B-0A8DF6961723@gmail.com> <5fd5b131-962a-489d-a674-0e199cdfff25@gutov.dev> <49231C5D-E89E-4AA3-AB02-51340994EA20@gmail.com> <661fc11d-6da8-4fe5-a900-80ed1b41823a@gutov.dev> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000005b0b060616ce8b96" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39235"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Yuan Fu , 68054@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Apr 24 04:38:12 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rzSWS-000A0P-Aq for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 24 Apr 2024 04:38:12 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzSWB-0001S8-NM; Tue, 23 Apr 2024 22:37:55 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzSWA-0001Rz-ER for bug-gnu-emacs@gnu.org; Tue, 23 Apr 2024 22:37:54 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzSWA-0001VR-6B for bug-gnu-emacs@gnu.org; Tue, 23 Apr 2024 22:37:54 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzSWQ-0004VC-If for bug-gnu-emacs@gnu.org; Tue, 23 Apr 2024 22:38:10 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noah Peart Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Apr 2024 02:38:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68054 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 68054-submit@debbugs.gnu.org id=B68054.171392626417025 (code B ref 68054); Wed, 24 Apr 2024 02:38:09 +0000 Original-Received: (at 68054) by debbugs.gnu.org; 24 Apr 2024 02:37:44 +0000 Original-Received: from localhost ([127.0.0.1]:55755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzSVn-0004Ob-ME for submit@debbugs.gnu.org; Tue, 23 Apr 2024 22:37:42 -0400 Original-Received: from mail-oa1-x29.google.com ([2001:4860:4864:20::29]:53631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzSVc-0004Li-Bm for 68054@debbugs.gnu.org; Tue, 23 Apr 2024 22:37:28 -0400 Original-Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-22ed075a629so2550900fac.3 for <68054@debbugs.gnu.org>; Tue, 23 Apr 2024 19:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713926217; x=1714531017; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ch0kXSUE9wxQkpF4dDHtmA/R8uJEt4uKmFdZOW7lBWg=; b=GCz08UoaHmC6DsHZ2GujVkmxAnfSvrDsNuaoonhDw+T0a+jS880XwXTzws5UeaGIxH pj2j4bDznFhW/+6O8dSn0e9fYehDzAzWY8kusY94eptdae4padIbSmuIbGZ0gBvWT3Xh CINxNGVulv3655nAmNZPzBFziOmUfUfkZU/zCic7Fz20f1XdSmTRne+16cMgdbfU5kee +XNs0SNySoQdsQTk+FMCsrvvLHPKVSqrI8x7Eh7sNe7Q0WqcAmHChUqvizRKYAFTFQmv Ljl8vMaX8ugQVxIvpH9l3PmmwgqcgGD5fOSLsg5E476PHLSyQaMB4kH7r2gBt+Qn5+3k c9xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713926218; x=1714531018; 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=ch0kXSUE9wxQkpF4dDHtmA/R8uJEt4uKmFdZOW7lBWg=; b=TodNC3xRRKG+o6/qc9SCvqjr6CdjRjRbaMj+3keebmv7PA+K28SQCytjbYh/yxhps3 zZCkPmoYaChBvpc3qozPDyMpHP2tZ1a6SW9+c038hJG/groFQcqgukl3O9XFGuRKTOKC X/ms9QdhpH0UvY7HHTxFhtNrOpXD2bU+R++NhQ37qYMw+naL0gE3mCo+LBOcL6D2/EG9 QvHVfIDGl22PvBluGbQnSqsN+/VtMiCYZ+wZjMKEb0npzWIEtIlrAsA2x80Km6Ekm+qa vdoxZMb0LmwK4iYVV5dwqtH7FLsrNTWixZJSA9PsuOIspN5aHGMVYrIpJickq3cyzmac ypDw== X-Forwarded-Encrypted: i=1; AJvYcCWKDBQThXlRU5yNm3bL6B0czDCqpSHtDnnvEzW0NmGO8Al1V4sf8JMn/abKGF6WaN2IbVDuKj/GQxmywahwMWRmmqcoW84= X-Gm-Message-State: AOJu0YzeasXUBah4p04Q4UkMng7Dwe4Lj7e/c/VNhcs2gt9T5+gY7wlj iw7WL0vYP7fVixO45K/Wl41QnNMnVj18qiaiMd1h/1CW82w85Ri8xZDHAM2TKqPsFGYWDykLHHb CczFsYHjLVCsHBOcI0FzUGR2UF0Y= X-Google-Smtp-Source: AGHT+IFdsBFYJibnNJpL5sztNG2+b/wJ8YA4F+f/BngFBYMnrxba/mbqYU8eGB67ghKKRcuyyXLqNVCQCeByRhkUHfE= X-Received: by 2002:a05:6870:3104:b0:22e:959b:cf74 with SMTP id v4-20020a056870310400b0022e959bcf74mr1166551oaa.40.1713926217328; Tue, 23 Apr 2024 19:36:57 -0700 (PDT) In-Reply-To: <661fc11d-6da8-4fe5-a900-80ed1b41823a@gutov.dev> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:283901 Archived-At: --0000000000005b0b060616ce8b96 Content-Type: multipart/alternative; boundary="0000000000005b0b040616ce8b94" --0000000000005b0b040616ce8b94 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable > What js-mode does (looks like 3) shouldn't be too bad, but I wouldn't mind an extra indentation level for such cases, too (example 2). The problem I found with option 2/3 was cases like the following (which also seem like the most common) where I expect the start of the function be indented according to `typescript-ts-mode-indent-offset`, not with the declaration keyword "const" as in `js-mode` (and option 3). const someFuncWithReallyLongName =3D async (x: number, y: number, z: number): Promise =3D> { // ... }; > This seems like a rare enough case, so it probably doesn't matter too much, so I'd suggest picking one style and implementing it, and then adjusting based on user feedback later. I've attached a patch implementing option 1 for now (with a test), but I'm happy to change the style whenever. Thanks! On Tue, Apr 23, 2024 at 5:15=E2=80=AFPM Dmitry Gutov wro= te: > On 23/04/2024 08:07, Yuan Fu wrote: > >> 1) indent the dangling values with respect to start of the declaration > >> > >> const a =3D > >> (x: string): string =3D> { > >> return x + x; > >> }, > >> bbb =3D > >> { > >> "x": 0 > >> }, > >> cccc =3D > >> 1, > >> ddddd =3D 0; > >> > >> 2) indent them with respect to the start of the variable_declarator > >> > >> const a =3D > >> (x: string): string =3D> { > >> return x + x; > >> }, > >> bbb =3D > >> { > >> "x": 0 > >> }, > >> cccc =3D > >> 1, > >> ddddd =3D 0; > >> > >> 3) align with the variable declarators (this is the same as js-mode) > >> > >> const a =3D > >> (x: string): string =3D> { > >> return x + x; > >> }, > >> bbb =3D > >> { > >> "x": 0 > >> }, > >> cccc =3D > >> 1, > >> ddddd =3D 0; > >> > >> I've attached a patch with with the rules for the 3 options here. > > I don=E2=80=99t really know what=E2=80=99s the convention, if there is = one. Maybe Dmitry > has better idea. Personally I like option 1. > > What js-mode does (looks like 3) shouldn't be too bad, but I wouldn't > mind an extra indentation level for such cases, too (example 2). > > This seems like a rare enough case, so it probably doesn't matter too > much, so I'd suggest picking one style and implementing it, and then > adjusting based on user feedback later. > --0000000000005b0b040616ce8b94 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
> What js-mode does (looks like 3) shouldn't be too= bad, but I wouldn't
mind an extra indentation level for such cases,= too (example 2).

The problem I found with option 2/= 3 was cases like the following (which
also seem like the most com= mon) where I expect the start of
the function be indented accordi= ng to `typescript-ts-mode-indent-offset`,
not with the declaratio= n keyword "const" as in `js-mode` (and option 3).

<= /div>
=C2=A0 =C2=A0 const someFuncWithReallyLongName =3D
=C2=A0 =C2= =A0 =C2=A0 async (x: number, y: number, z: number): Promise<void> =3D= > {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 // ...
=C2=A0 =C2=A0 =C2=A0 };
=

> This seems like a rare enough case, so it pr= obably doesn't matter too
much, so I'd suggest picking one sty= le and implementing it, and then
adjusting based on user feedback later.=

I've attached a patch implementing option 1 for now (with a te= st), but=C2=A0
I'm happy to change the style whenever.
<= div>
Thanks!

On Tue, Apr 23, 2024 at 5:15=E2=80=AFPM= Dmitry Gutov <dmitry@gutov.dev&= gt; wrote:
On 23= /04/2024 08:07, Yuan Fu wrote:
>> 1) indent the dangling values with respect to start of the declara= tion
>>
>>=C2=A0 =C2=A0 =C2=A0 const a =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (x: string): string =3D> { >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return x + x;
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 },
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bbb =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 {
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "x": 0 >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 },
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cccc =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1,
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ddddd =3D 0;
>>=C2=A0 =C2=A0
>> 2) indent them with respect to the start of the variable_declarato= r
>>
>>=C2=A0 =C2=A0 =C2=A0 const a =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (x: string)= : string =3D> {
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 return x + x;
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 },
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bbb =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 {
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 "x": 0
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 },
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cccc =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1,
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ddddd =3D 0;
>>
>> 3) align with the variable declarators (this is the same as js-mod= e)
>>
>>=C2=A0 =C2=A0 =C2=A0 const a =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (x: string): string =3D&g= t; {
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return x + = x;
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 },
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bbb =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 {
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "x&quo= t;: 0
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 },
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cccc =3D
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1,
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ddddd =3D 0;
>>
>> I've attached a patch with with the rules for the 3 options he= re.
> I don=E2=80=99t really know what=E2=80=99s the convention, if there is= one. Maybe Dmitry has better idea. Personally I like option 1.

What js-mode does (looks like 3) shouldn't be too bad, but I wouldn'= ;t
mind an extra indentation level for such cases, too (example 2).

This seems like a rare enough case, so it probably doesn't matter too <= br> much, so I'd suggest picking one style and implementing it, and then adjusting based on user feedback later.
--0000000000005b0b040616ce8b94-- --0000000000005b0b060616ce8b96 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Add-typescript-ts-mode-indentation-for-multi-assignm.patch" Content-Disposition: attachment; filename="0001-Add-typescript-ts-mode-indentation-for-multi-assignm.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lvd7bbkb0 RnJvbSBmMjAyMzU1MDQ4YzhkOTE1YzY5NzhmNmU5MzAwZGQ2MzEwNGI4YTUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb2FoIFBlYXJ0IDxub2FoLnYucGVhcnRAZ21haWwuY29tPgpE YXRlOiBGcmksIDE5IEFwciAyMDI0IDAxOjQ2OjUwIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQWRk IHR5cGVzY3JpcHQtdHMtbW9kZSBpbmRlbnRhdGlvbiBmb3IgbXVsdGktYXNzaWdubWVudCBkZWNs cwoKKiBsaXNwL3Byb2dtb2Rlcy90eXBlc2NyaXB0LXRzLW1vZGUuZWwKKHR5cGVzY3JpcHQtdHMt bW9kZS0taW5kZW50LXJ1bGVzKTogQWRkIGluZGVudGF0aW9uIHJ1bGVzIGZvcgpsZXhpY2FsIGFu ZCB2YXJpYWJsZSBkZWNsYXJhdGlvbnMgd2l0aCBtdWx0aXBsZSBhc3NpZ25tZW50cy4KKiB0ZXN0 L2xpc3AvcHJvZ21vZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS1yZXNvdXJjZXMvaW5kZW50LmVydHM6 CkFkZCBpbmRlbnQgdGVzdCBmb3IgdmFyaWFibGUgZGVjbGFyYXRpb25zLgotLS0KIC5sYXN0LWJ1 aWxkLWhhc2ggICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAxICsKIGxpc3AvcHJvZ21v ZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS5lbCAgICAgICAgICB8IDE1ICsrKysrKysrKy0KIC4uLi90 eXBlc2NyaXB0LXRzLW1vZGUtcmVzb3VyY2VzL2luZGVudC5lcnRzICB8IDI4ICsrKysrKysrKysr KysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQogY3JlYXRlIG1vZGUgMTAwNjQ0IC5sYXN0LWJ1aWxkLWhhc2gKCmRpZmYgLS1naXQgYS8ubGFz dC1idWlsZC1oYXNoIGIvLmxhc3QtYnVpbGQtaGFzaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMC4uNzdmZTQ0NDZkZjUKLS0tIC9kZXYvbnVsbAorKysgYi8ubGFzdC1idWls ZC1oYXNoCkBAIC0wLDAgKzEgQEAKK2EyZTMyN2NiY2ExZTc1NjM3MzEwOWQ0Nzg4ZWE2MzUyNTBk MjMyMjQKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS5lbCBi L2xpc3AvcHJvZ21vZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS5lbAppbmRleCBhYjFkNzZhYjIwZS4u M2MxMGExOWU3MTIgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL3R5cGVzY3JpcHQtdHMtbW9k ZS5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy90eXBlc2NyaXB0LXRzLW1vZGUuZWwKQEAgLTkxLDYg KzkxLDE3IEBAIHRzeC10cy1tb2RlLS1pbmRlbnQtY29tcGF0aWJpbGl0eS1iODkzNDI2CiAgICAg IGAoKChtYXRjaCAiPCIgImpzeF90ZXh0IikgcGFyZW50IDApCiAgICAgICAgKChwYXJlbnQtaXMg ImpzeF90ZXh0IikgcGFyZW50IHR5cGVzY3JpcHQtdHMtbW9kZS1pbmRlbnQtb2Zmc2V0KSkpKSkK IAorKGRlZnVuIHR5cGVzY3JpcHQtdHMtbW9kZS0tYW5jaG9yLWRlY2wgKF9uIHBhcmVudCAmcmVz dCBfKQorICAiUmV0dXJuIHRoZSBwb3NpdGlvbiBhZnRlciB0aGUgZGVjbGFyYXRpb24ga2V5d29y ZCBiZWZvcmUgUEFSRU5ULgorCitUaGlzIGFuY2hvciBhbGxvd3MgYWxpZ25pbmcgdmFyaWFibGVf ZGVjbGFyYXRvcnMgaW4gdmFyaWFibGUgYW5kIGxleGljYWwKK2RlY2xhcmF0aW9ucywgYWNjb3Vu dGluZyBmb3IgdGhlIGxlbmd0aCBvZiBrZXl3b3JkICh2YXIsIGxldCwgb3IgY29uc3QpLiIKKyAg KGxldCogKChkZWNsYXJhdGlvbiAodHJlZXNpdC1wYXJlbnQtdW50aWwKKyAgICAgICAgICAgICAg ICAgICAgICAgcGFyZW50IChyeCAob3IgInZhcmlhYmxlIiAibGV4aWNhbCIpICJfZGVjbGFyYXRp b24iKSB0KSkKKyAgICAgICAgIChkZWNsICh0cmVlc2l0LW5vZGUtY2hpbGQgZGVjbGFyYXRpb24g MCkpKQorICAgICgrICh0cmVlc2l0LW5vZGUtc3RhcnQgZGVjbGFyYXRpb24pCisgICAgICAgKC0g KHRyZWVzaXQtbm9kZS1lbmQgZGVjbCkgKHRyZWVzaXQtbm9kZS1zdGFydCBkZWNsKSkpKSkKKwog KGRlZnVuIHR5cGVzY3JpcHQtdHMtbW9kZS0taW5kZW50LXJ1bGVzIChsYW5ndWFnZSkKICAgIlJ1 bGVzIHVzZWQgZm9yIGluZGVudGF0aW9uLgogQXJndW1lbnQgTEFOR1VBR0UgaXMgZWl0aGVyIGB0 eXBlc2NyaXB0JyBvciBgdHN4Jy4iCkBAIC0xMTMsNyArMTI0LDkgQEAgdHlwZXNjcmlwdC10cy1t b2RlLS1pbmRlbnQtcnVsZXMKICAgICAgKChwYXJlbnQtaXMgInN3aXRjaF9jYXNlIikgcGFyZW50 LWJvbCB0eXBlc2NyaXB0LXRzLW1vZGUtaW5kZW50LW9mZnNldCkKICAgICAgKChwYXJlbnQtaXMg InN3aXRjaF9kZWZhdWx0IikgcGFyZW50LWJvbCB0eXBlc2NyaXB0LXRzLW1vZGUtaW5kZW50LW9m ZnNldCkKICAgICAgKChwYXJlbnQtaXMgInR5cGVfYXJndW1lbnRzIikgcGFyZW50LWJvbCB0eXBl c2NyaXB0LXRzLW1vZGUtaW5kZW50LW9mZnNldCkKLSAgICAgKChwYXJlbnQtaXMgInZhcmlhYmxl X2RlY2xhcmF0b3IiKSBwYXJlbnQtYm9sIHR5cGVzY3JpcHQtdHMtbW9kZS1pbmRlbnQtb2Zmc2V0 KQorICAgICAoKHBhcmVudC1pcyAidmFyaWFibGVfZGVjbGFyYXRvciIpIGdyYW5kLXBhcmVudCB0 eXBlc2NyaXB0LXRzLW1vZGUtaW5kZW50LW9mZnNldCkKKyAgICAgKChwYXJlbnQtaXMgLChyeCAo b3IgInZhcmlhYmxlIiAibGV4aWNhbCIpICJfZGVjbGFyYXRpb24iKSkKKyAgICAgIHR5cGVzY3Jp cHQtdHMtbW9kZS0tYW5jaG9yLWRlY2wgMSkKICAgICAgKChwYXJlbnQtaXMgImFyZ3VtZW50cyIp IHBhcmVudC1ib2wgdHlwZXNjcmlwdC10cy1tb2RlLWluZGVudC1vZmZzZXQpCiAgICAgICgocGFy ZW50LWlzICJhcnJheSIpIHBhcmVudC1ib2wgdHlwZXNjcmlwdC10cy1tb2RlLWluZGVudC1vZmZz ZXQpCiAgICAgICgocGFyZW50LWlzICJmb3JtYWxfcGFyYW1ldGVycyIpIHBhcmVudC1ib2wgdHlw ZXNjcmlwdC10cy1tb2RlLWluZGVudC1vZmZzZXQpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvcHJv Z21vZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS1yZXNvdXJjZXMvaW5kZW50LmVydHMgYi90ZXN0L2xp c3AvcHJvZ21vZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS1yZXNvdXJjZXMvaW5kZW50LmVydHMKaW5k ZXggYmVjOTZhZDgyZTAuLjkwOGRkODEwM2I1IDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvcHJvZ21v ZGVzL3R5cGVzY3JpcHQtdHMtbW9kZS1yZXNvdXJjZXMvaW5kZW50LmVydHMKKysrIGIvdGVzdC9s aXNwL3Byb2dtb2Rlcy90eXBlc2NyaXB0LXRzLW1vZGUtcmVzb3VyY2VzL2luZGVudC5lcnRzCkBA IC02Miw2ICs2MiwzNCBAQCBjb25zdCBmb28gPSAoeDogc3RyaW5nKSA9PiB7CiB9OwogPS09LT0K IAorTmFtZTogTGV4aWNhbCBhbmQgdmFyaWFibGUgZGVjbGFyYXRpb25zCisKKz0tPQorY29uc3Qg Zm9vID0gKCkgPT4geworICBsZXQgeCA9IDEsCisgICAgICB5eXl5OiB7CisgICAgICAgIFtrOiBz dHJpbmcgfCBudW1iZXJdOiBzdHJpbmcsCisgICAgICB9ID0geworICAgICAgICAiZm9vIjogImZv byIsCisgICAgICAgICJiYXIiOiAiYmFyIiwKKyAgICAgIH07CisgIHZhciBvYmFyID0gMSwKKyAg ICAgIGZvOiB7IFt4OiBhbnldOiBhbnkgfSA9IHsKKyAgICAgICAgImEiOiAxLAorICAgICAgICAi YiI6IDIsCisgICAgICB9OworICBjb25zdCBzb21lRnVuY1dpdGhSZWFsbHlMb25nTmFtZSA9Cisg ICAgYXN5bmMgKHg6IG51bWJlciwgeTogbnVtYmVyLCB6OiBudW1iZXIpOiBQcm9taXNlPHZvaWQ+ ID0+IHsKKyAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgpOworICAgIH07CisgIGNvbnN0IGNjY2Mg PSAxLAorICAgICAgICBiYmIgPSB7CisgICAgICAgICAgIngiOiAwCisgICAgICAgIH0sCisgICAg ICAgIGRkZGRkID0gMDsKK307Cis9LT0tPQorCiBDb2RlOgogICAobGFtYmRhICgpCiAgICAgKHNl dHEgaW5kZW50LXRhYnMtbW9kZSBuaWwpCi0tIAoyLjM0LjEKCg== --0000000000005b0b060616ce8b96--