From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#65470: 29.1.50; js-ts-mode: regex pattern can cause incorrect parenthesis matching Date: Tue, 12 Sep 2023 01:23:18 +0300 Message-ID: <5e57b91b-2967-d82d-eca5-65dc206887cf@gutov.dev> References: <127B5BEA-A24B-48A3-9827-85B7CDB67D10@secure.kjonigsen.net> <5f823f8f-d249-f4a1-71e6-083e47d0d123@gutov.dev> <83jztbeeh2.fsf@gnu.org> <03415a27-f082-b204-cece-19a9859e178d@gutov.dev> <8334zze5l4.fsf@gnu.org> <1363c54f-5109-f000-3333-78d291b2096d@gutov.dev> <2D516F0C-D7A8-49D2-8009-F911EFC55C78@secure.kjonigsen.net> <2f525ebe-74e5-dcbe-4403-5e9ae001795c@gutov.dev> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40317"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: Yuan Fu , 65470@debbugs.gnu.org, Theodor Thornhill , btuin@mailo.com, Eli Zaretskii , Jostein =?UTF-8?Q?Kj=C3=B8nigsen?= To: Jostein =?UTF-8?Q?Kj=C3=B8nigsen?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 12 00:24:17 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 1qfpKK-000A9s-9X for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 12 Sep 2023 00:24:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfpK3-0005ym-Bd; Mon, 11 Sep 2023 18:23:59 -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 1qfpK1-0005yS-UD for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2023 18:23:57 -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 1qfpK1-0002Ms-Nb for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2023 18:23:57 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfpK5-0001Rv-PH for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2023 18:24:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Sep 2023 22:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65470 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 65470-submit@debbugs.gnu.org id=B65470.16944710195539 (code B ref 65470); Mon, 11 Sep 2023 22:24:01 +0000 Original-Received: (at 65470) by debbugs.gnu.org; 11 Sep 2023 22:23:39 +0000 Original-Received: from localhost ([127.0.0.1]:55060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfpJj-0001RH-HU for submit@debbugs.gnu.org; Mon, 11 Sep 2023 18:23:39 -0400 Original-Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfpJe-0001Qz-6s for 65470@debbugs.gnu.org; Mon, 11 Sep 2023 18:23:37 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id B659F5C040F; Mon, 11 Sep 2023 18:23:24 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 11 Sep 2023 18:23:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1694471004; x=1694557404; bh=A8o2q3HtoV67CFmBSXvd09m/kIAh6t64Bf5 3UE0KRlc=; b=sRMX7i1CPNYOsTzzaup1UHfwpkG/8SN+x74EOcpjQYZyYXDIsKp WR6n1y5AupXkcBNA8skROj0Ma8ry3zr9O5bR9X0iIyXTPrgaF12oSOxic7V3Msoq CnEo3et3tSZ0Ofz/8/ALx17o8byh9PuXSOtzBnIpF0EvxUDCb8nOmWXGqtRDcFjW jSap6lLUGkICx4vZjayU35E0TVV2Ze1VmLSkl9CUcZsqFOs1PuJUC5pgsknZpKB/ H/n/TGixYI9Bvle3eGu+8l598BBtveFq00jMa6vtLaBkRyCGFlIC6WTWBraxGyB6 ksnmUenITnJliiNkgmAUH4DwwEU7DatxptA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1694471004; x=1694557404; bh=A8o2q3HtoV67CFmBSXvd09m/kIAh6t64Bf5 3UE0KRlc=; b=nEi+T8/9VEqn2xFSHR9tmPq3jC/2Pxh4ZRZGYjgMddxijNXBXQl Q5s7Dd3tzpOuPEJWfIkMB1b3cy6d++oEYH6SWNIZGzOR5Y2hJVxBNSNB+TPk0ALS ssQpeJob/gakoh0LFernoEatoZR+DXNDvEwfnYEjIvLvaD2wLJkX2bQNcznRDuS3 LlJEW/X1KeKwOJPDe0SF5cA5Ws0ZUoikDC1++kGQRj+tig37z3nWJ2gLnNIAmz6n GJATEKkxKvTVKLagZyXjM47zCn/MwFkpPVL+DerEMsIxUJQbrrL9bijVXHdvC39h 5OnSIsnv89J5bfnT6KOHmkoNln+8RmBZGCQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudeihedgtdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtkeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhephfffheeljeffgeffueeghfekkedtfffgheejvdegjeettdduheeufffggfef jeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 11 Sep 2023 18:23:21 -0400 (EDT) Content-Language: en-US In-Reply-To: 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:270094 Archived-At: Hi Jostein! The patch looks good overall (though I haven't tested it). On 11/09/2023 22:37, Jostein Kjønigsen wrote: > So to fix that, I’ve tried to anchor the query to top-level constructs which typically does not nest. Looking at the query for js.el, I can only assume that you were trying to too solve the same problem, Dmitry? That's right. > + ((arguments (jsx_element) @jsx)) > + ((parenthesized_expression (jsx_element) @jsx)))))) These two contexts actually seem missing in my patch for js-ts-mode. :-) OTOH, it seems like the ones that _are_ included there, are missing here. Don't they? ((variable_declarator value: (jsx_element) @jsx)) corresponds do let v =
...
((assignment_expression right: (jsx_element) @jsx)) corresponds do v =

...

(with variable declared previously), and ((return_statement (jsx_element) @jsx)) corresponds to function f() { return

...
; }