From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?=E8=B5=B5_?= =?UTF-8?Q?=E7=BA=AA=E9=98=B3?= Newsgroups: gmane.emacs.bugs Subject: bug#61142: =?UTF-8?Q?=E5=9B=9E=E5=A4=8D:?= bug#61142: =?UTF-8?Q?=E5=9B=9E=E5=A4=8D:?= bug#61142: 29.0.60; java-ts-mode - Wrong indentation for the body of multiple lines conditions Date: Mon, 6 Feb 2023 02:34:12 +0000 Message-ID: References: <87wn4x7lpw.fsf_-_@thornhill.no> <87r0v47dky.fsf@thornhill.no> <87h6vz7weg.fsf@thornhill.no> <83ilgfrju2.fsf@gnu.org> <87edr37vrw.fsf@thornhill.no> <87bkm77ty0.fsf@thornhill.no> <878rhb7qss.fsf@thornhill.no> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="_000_OSZP286MB141766B19BE7950C65D99BBFA8DA9OSZP286MB1417JPNP_" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31395"; mail-complaints-to="usenet@ciao.gmane.io" Cc: "61142@debbugs.gnu.org" <61142@debbugs.gnu.org> To: Theodor Thornhill Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 06 06:52:20 2023 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 1pOuQO-00081D-I9 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 06 Feb 2023 06:52:20 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOuQB-0001WE-32; Mon, 06 Feb 2023 00:52:07 -0500 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 1pOuQ8-0001VD-J6 for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2023 00:52:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOuQ8-0004MN-9G for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2023 00:52:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOuQ8-0003fz-5i for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2023 00:52:04 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?=E8=B5=B5_?= =?UTF-8?Q?=E7=BA=AA=E9=98=B3?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 06 Feb 2023 05:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61142 X-GNU-PR-Package: emacs Original-Received: via spool by 61142-submit@debbugs.gnu.org id=B61142.167566270714054 (code B ref 61142); Mon, 06 Feb 2023 05:52:04 +0000 Original-Received: (at 61142) by debbugs.gnu.org; 6 Feb 2023 05:51:47 +0000 Original-Received: from localhost ([127.0.0.1]:47197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOuPq-0003eW-E5 for submit@debbugs.gnu.org; Mon, 06 Feb 2023 00:51:46 -0500 Original-Received: from mail-sgaapc01olkn2032.outbound.protection.outlook.com ([40.92.53.32]:20041 helo=APC01-SG2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOrKp-0004Wo-Jf for 61142@debbugs.gnu.org; Sun, 05 Feb 2023 21:34:25 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LBuJIgdlUNvFb/aQIQ/nfTl/7vkSbVMmEiBdonVM7nfRznq/l7yaGWVJQkN4MYACRGxz9oGiP4YqWlU838JnRTXEKMYJRD1daUZ0EpAuuoEp9g8jXN/FioCNA3r/Q2n1PS9bqIDF8fZD2kglP7bxHM8OAnYOEGoUEHvRoo1jpFPI3tJwf580cwb+go1UaSsZtsueT2P1dHwxBmObuwTjkXQJTrYrrV571UeQGMsZSIeNw65sEnad8gWLoOu9ZBClR+jD4gpVeHQwad10RYQa76+f7oGCmIKVAVHDDJUilCMFmuMpqnudPt+eo7n6WN3h95cI8CkiWOn0mL4+uHF7Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lYop6ciy/MR6vVemAs4Dxs5DiPuZHWOdyJqdgyCwl/s=; b=mdRKG6q6wT1RtN0q0HyVxNaH2dB6L5zxzuPMZAjZtkuhDDMHITnMOk4WNTG2pmhs0y9CqhLYLwmTUzf3PmdBAq1v2JQVMLc5cAC+idU5nyAhuWgQr8lyoXyd7XD6s5nPQDNudAO5tmC2AztFjCx+prTqxNiyIvpyMOV9T2iEsYznQaU1IuaxnjhxyHrmISS94CLUC7kaU7TtoXgP7nLkGFDQUd2SSU9LIBPEKGrLTSTnn7ayODPjU9MRcFjjJ2UGO/X7oxAJWbDYSN4vqHlfR5VQ0XG189iJBn2gDdv4d0XzqG+GRP9uHKmwdjfSiug9QYgTVV6kVF1gg7mn530OLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lYop6ciy/MR6vVemAs4Dxs5DiPuZHWOdyJqdgyCwl/s=; b=KPUUIhuNRg5t1YYtnBwgHbn0EJayAH7h2qz+P5tcn7cUeyyc7OnBr74fKec1Sha1mWNv1r4pyirCfuiNKNDD4cflbDvp3r/tDRlrLAPnhq8EfYhYDHCbaX/FbcwosgYtN+pMV7Axe4xXfksxQCU7naUN2aSX1vuEWucySx/20cz+unIZVjoLXvNCU210IefijHx6OqU2SvQjYmgywT/gkuxYEz2jt6EjKjeEXrH/Bnu65sc696ybfSIIXXOiGGiVdYPb9YzNn9aocr0jSLxWcPpfTFRMssC4GDlimVq5/K2mx4bngW8IfrVFXdPkFGRxjeYxT8ZDDZY5IOMRX13XKA== Original-Received: from OSZP286MB1417.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:13e::13) by TYWP286MB3675.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3f3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Mon, 6 Feb 2023 02:34:12 +0000 Original-Received: from OSZP286MB1417.JPNP286.PROD.OUTLOOK.COM ([fe80::c3e:9933:93cd:8cfa]) by OSZP286MB1417.JPNP286.PROD.OUTLOOK.COM ([fe80::c3e:9933:93cd:8cfa%5]) with mapi id 15.20.6064.034; Mon, 6 Feb 2023 02:34:12 +0000 Thread-Topic: bug#61142: =?UTF-8?Q?=E5=9B=9E=E5=A4=8D:?= bug#61142: 29.0.60; java-ts-mode - Wrong indentation for the body of multiple lines conditions Thread-Index: AQHZOIXR1teovax0pkiAxqIpffDvG66//N8TgABX6BWAAGeqgIAAAysCgAAAnYCAAAsMgIAAEvuAgABXncI= In-Reply-To: <878rhb7qss.fsf@thornhill.no> Accept-Language: zh-CN, en-US Content-Language: zh-CN x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [KBMEVwQQ+BFi1XrvW6Hkm4x+SdxPlw0b] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: OSZP286MB1417:EE_|TYWP286MB3675:EE_ x-ms-office365-filtering-correlation-id: 24c53a2c-6981-4818-3cc2-08db07eaa1de x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +vae0zmEEDPEilJlEPQcGRVSHNMvQ9bUnb7tjMK+qi6jgVziYey6wWe5z63/C37RzOq5shj8OG2w4LEHq+bh2iH5xW0r4UGGEZorGPX8UCpOW9bWojjd4BV41Xp8JhTXQkCIbbl252qCOx8u61k67a4cOC4sqIGsdro5crRcLZ325txWuxAtJ77ZuQUS0ULWMzr6MJmfqhBZC+FqcnJU9z/CdB3L5mHaj69EpmNXvNwYts6QOkEBUEhOixpyjrhmbAXzyq0sfHJM4ZGOEOLP/yoJEAWCJbfFafTqVVswOl4ByKGa8ZuAlcYWYZMsI2I3LqDnaS2X2HVtIS3KN+kNnJCpF6xHHH1AWQloHL2wOgG5LoDgtg4IG/nuiHzYkk7Ef18Ia0qSM8oQGE75gxpyJeK5AttyioMn+LNZ2QF4abTdlr4i+M0CK6XeP+TqUyqZYpp8R7ez3RJ81q5Xvo4EMJc07Ua/zl2jj7PB0X6SIOmYnk1766+FkJ9o6grXQjnuHpct2XW1w5UwGWNkTIt59pIDMn7K6fICPrnBAmCDZTwCyFAd+o2FnZiLwll1Pffb59p30qemGQFeyHgEOplPoSGwHxoSP+HoGRkPZT4lXYY= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: nnIlxHRXs7ohnsejhJwCxNbHyv72TgQgAMX9QQ80yj2Ut3F503lhJO8kwg3nLSkodZKvCvvSm4bD3VK8Y53BRGL6iEXCcbBEIi2HPtQCR5zBwAqGlBvGMAt27hns4pMFEqhadBsRjiyf6zUouRD6wvLNrtlbGynOPPIZcbo0dpwAlhIg9VFRcV7GQpI/fAbcuu3C09hxxNR9e46K4Ki6JPTD7ltQdX2EuJc1OvoUE/8zthI3fPgGEd3KemTAZUwJVuym0xg1D7ZImqNoxt8Oq6Frv5kWaPDXz1yR2l9ojfJUJsH3AzW7IKz1Ty+KarVJiscjfWx12EHfmtrp4eaqMRwF5N+hSL6X0GUyGnRvq4eVDcaUM2R+6y6FXEhZYPSsFILoNq72Qnjyi/sUATCCVrC88qz3abI/xfKN3uMIVPtoRXo+IKMVxnfiXozx7xPQY1eXcI1t2uIU8VwgifBNYhW6pP+ex5SatAeGXpbtu2/WP5NENeCrN9qPCfUvlV0fhMQ8LWfpaNHH3aM4Tf2ISHCZ17lrrmFXasFnSrOKQDttBnM3243BpffWXtF5CK+2/KENyi8z4Ta/TVlXGr9buejCJdBCHJnTP2uutvhyVoC5uDODkP6FVKwOpDrfvyE+dU4AoroebVhH1TRYzVgAHCi5qorPEtDge08WIN3whApIr9SojWiBcVuKRYg1Am/qUvl1Q7qhKC0ZLAbBrYnCHKc4bt5bxv/RFAYlFxlbfjfpYxGZuiXsuQB9jP 1G8MBY5+vGD5joS4HJMFKu2D+TI/+K8yUk4VO7JW0l1CuumXjD2ODjIIUENryTMMZvykN0aZRYHfC06oCVT86xtfrv+cFd+9GO X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: OSZP286MB1417.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 24c53a2c-6981-4818-3cc2-08db07eaa1de X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Feb 2023 02:34:12.2338 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWP286MB3675 X-Mailman-Approved-At: Mon, 06 Feb 2023 00:51:39 -0500 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:254934 Archived-At: --_000_OSZP286MB141766B19BE7950C65D99BBFA8DA9OSZP286MB1417JPNP_ Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: base64 SGkgVGhlbw0KDQpUaGlzIHBhdGNoIHdvcmtzIHdlbGwgZm9yIG1lLiBHcmVhdCEgVGhhbmtzIQ0K DQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXw0Kt6K8/sjLOiBUaGVvZG9yIFRob3Ju aGlsbCA8dGhlb0B0aG9ybmhpbGwubm8+DQq3osvNyrG85DogMjAyM8TqMtTCNsjVIDU6MjANCsrV vP7IyzogRWxpIFphcmV0c2tpaSA8ZWxpekBnbnUub3JnPg0Ks63LzTogemp5emhhb2ppeWFuZ0Bo b3RtYWlsLmNvbSA8emp5emhhb2ppeWFuZ0Bob3RtYWlsLmNvbT47IDYxMTQyQGRlYmJ1Z3MuZ251 Lm9yZyA8NjExNDJAZGViYnVncy5nbnUub3JnPg0K1vfM4jogUmU6IGJ1ZyM2MTE0Mjogu9i4tDog YnVnIzYxMTQyOiAyOS4wLjYwOyBqYXZhLXRzLW1vZGUgLSBXcm9uZyBpbmRlbnRhdGlvbiBmb3Ig dGhlIGJvZHkgb2YgbXVsdGlwbGUgbGluZXMgY29uZGl0aW9ucw0KDQpUaGVvZG9yIFRob3JuaGls bCA8dGhlb0B0aG9ybmhpbGwubm8+IHdyaXRlczoNCg0KPiBUaGVvZG9yIFRob3JuaGlsbCA8dGhl b0B0aG9ybmhpbGwubm8+IHdyaXRlczoNCj4NCj4+IEVsaSBaYXJldHNraWkgPGVsaXpAZ251Lm9y Zz4gd3JpdGVzOg0KPj4NCj4+Pj4gQ2M6ICI2MTE0MkBkZWJidWdzLmdudS5vcmciIDw2MTE0MkBk ZWJidWdzLmdudS5vcmc+DQo+Pj4+IERhdGU6IFN1biwgMDUgRmViIDIwMjMgMjA6MTk6MTkgKzAx MDANCj4+Pj4gRnJvbTogIFRoZW9kb3IgVGhvcm5oaWxsIHZpYSAiQnVnIHJlcG9ydHMgZm9yIEdO VSBFbWFjcywNCj4+Pj4gIHRoZSBTd2lzcyBhcm15IGtuaWZlIG9mIHRleHQgZWRpdG9ycyIgPGJ1 Zy1nbnUtZW1hY3NAZ251Lm9yZz4NCj4+Pj4NCj4+Pj4gKyhkZWZ2YXIgYy10cy1jb21tb24tbmVz dGFibGUtaWYtc3RhdGVtZW50LXAgdA0KPj4+PiArICAiRG9lcyB0aGUgY3VycmVudCBwYXJzZXIg bmVzdCBpZi1lbHNlIHN0YXRlbWVudHM/DQo+Pj4+ICsNCj4+Pj4gK1QgaWYgdGhlIGN1cnJlbnQg dHJlZS1zaXR0ZXIgZ3JhbW1hciBuZXN0cyB0aGUgZWxzZSBpZg0KPj4+PiArc3RhdGVtZW50cywg TklMIG90aGVyd2lzZS4iKQ0KPj4+DQo+Pj4gQSBuaXQ6IHdlIHVzZSB0IGFuZCBuaWwsIGxvd2Vy Y2FzZSwgdG8gcmVmZXIgdG8gdGhlc2UgdHdvIHN5bWJvbHMuDQo+Pj4NCj4+PiBUaGFua3MuDQo+ Pg0KPj4gVGhhbmtzIQ0KPj4NCj4+IFRoZW8NCj4NCj4gSSBhZGRlZCBzb21lIHNtYWxsIHR3ZWFr cywgYW5kIHdpbGwgYWRkIHRoZSBmb2xsb3dpbmcgYXMgYSB0ZXN0IGxhdGVyOg0KPg0KDQpJIG1h ZGUgZXZlbiBmdXJ0aGVyIHR3ZWFrcywgYW5kIHdoaWxlIHRlc3RpbmcgdGhlIGMgdmFyaWFudCBJ IG5vdGljZWQNCnRoYXQgdGhlIEMgdGVzdHMgd2VyZW4ndCBhY3R1YWxseSB3b3JraW5nLiBUaGVy ZSB3ZXJlIG1pc3NpbmcgcnVsZXMgZm9yDQptYW55IG9mIHRoZSBjYXNlcyBpbiB0aGUgdGVzdHMs IHNvIEkgYWRkZWQgc29tZSBtb3JlIHJ1bGVzIHRvIHRoZQ0KYy10cy1tb2RlIGluZGVudGF0aW9u IGFuZCBhZGRlZCBhIGJpZy1pc2ggdGVzdCB3aXRoIHNvbWUgd29ua3kgYnV0DQpzZWVtaW5nbHkg d29ya2luZyBpbmRlbnRhdGlvbi4NCg0KQmVjYXVzZSB0aGUgdGVzdHMgYXJlIG5vdyB3b3JraW5n IEkgdGhpbmsgdGhpcyBpcyBnb29kIHRvIGdvLCBzbyB1bmxlc3MNCnNvbWVib2R5IG9iamVjdHMg SSdsbCBpbnN0YWxsIHRoaXMgc29tZXRpbWUgdG9tb3Jyb3cgOi0pDQoNClRoZW8NCg0K --_000_OSZP286MB141766B19BE7950C65D99BBFA8DA9OSZP286MB1417JPNP_ Content-Type: text/html; charset="gb2312" Content-Transfer-Encoding: quoted-printable
Hi Theo=

This patch works well for me. Great! Thanks!&= nbsp; 

=B7=A2=BC=FE=C8=CB: Theodor= Thornhill <theo@thornhill.no>
=B7=A2=CB=CD=CA=B1=BC=E4: 2023=C4=EA2=D4=C26=C8=D5 5:20
=CA=D5=BC=FE=C8=CB: Eli Zaretskii <eliz@gnu.org>
=B3=AD=CB=CD: zjyzhaojiyang@hotmail.com <zjyzhaojiyang@hotmail.co= m>; 61142@debbugs.gnu.org <61142@debbugs.gnu.org>
=D6=F7=CC=E2: Re: bug#61142: =BB=D8=B8=B4: bug#61142: 29.0.60; java-= ts-mode - Wrong indentation for the body of multiple lines conditions
 
Theodor Thornhill <theo@thornhill.no> writes= :

> Theodor Thornhill <theo@thornhill.no> writes:
>
>> Eli Zaretskii <eliz@gnu.org> writes:
>>
>>>> Cc: "61142@debbugs.gnu.org" <61142@debbugs.gn= u.org>
>>>> Date: Sun, 05 Feb 2023 20:19:19 +0100
>>>> From:  Theodor Thornhill via "Bug reports for GN= U Emacs,
>>>>  the Swiss army knife of text editors" <bug-g= nu-emacs@gnu.org>
>>>>
>>>> +(defvar c-ts-common-nestable-if-statement-p t
>>>> +  "Does the current parser nest if-else stateme= nts?
>>>> +
>>>> +T if the current tree-sitter grammar nests the else if >>>> +statements, NIL otherwise.")
>>>
>>> A nit: we use t and nil, lowercase, to refer to these two symb= ols.
>>>
>>> Thanks.
>>
>> Thanks!
>>
>> Theo
>
> I added some small tweaks, and will add the following as a test later:=
>

I made even further tweaks, and while testing the c variant I noticed
that the C tests weren't actually working. There were missing rules for
many of the cases in the tests, so I added some more rules to the
c-ts-mode indentation and added a big-ish test with some wonky but
seemingly working indentation.

Because the tests are now working I think this is good to go, so unless
somebody objects I'll install this sometime tomorrow :-)

Theo

--_000_OSZP286MB141766B19BE7950C65D99BBFA8DA9OSZP286MB1417JPNP_--