From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#62086: 29.0.60; ruby-ts-mode regressions Date: Tue, 11 Apr 2023 19:53:53 +0300 Organization: LINKOV.NET Message-ID: <86y1myxsrq.fsf@mail.linkov.net> References: <86y1o5op2v.fsf@mail.linkov.net> <5abcf765-f8ce-9563-63aa-20c558409898@yandex.ru> <86cz4l7zjk.fsf@mail.linkov.net> <86ttxww12o.fsf@mail.linkov.net> <865yaakfs7.fsf@mail.linkov.net> <0bd5f2b8-6f0b-09d6-6240-38c742eca19f@yandex.ru> <861qkyfg8l.fsf@mail.linkov.net> <9ceb589f-9325-1607-d1b5-5fd56cb8c3ec@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21831"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 62086@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Apr 11 18:59: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 1pmHKu-0005WP-Jp for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 11 Apr 2023 18:59:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmHKh-0000um-K0; Tue, 11 Apr 2023 12:59:03 -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 1pmHKg-0000ue-HS for bug-gnu-emacs@gnu.org; Tue, 11 Apr 2023 12:59:02 -0400 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 1pmHKg-0003Yv-71 for bug-gnu-emacs@gnu.org; Tue, 11 Apr 2023 12:59:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmHKg-00035D-3a for bug-gnu-emacs@gnu.org; Tue, 11 Apr 2023 12:59:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 11 Apr 2023 16:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62086 X-GNU-PR-Package: emacs Original-Received: via spool by 62086-submit@debbugs.gnu.org id=B62086.168123229711791 (code B ref 62086); Tue, 11 Apr 2023 16:59:02 +0000 Original-Received: (at 62086) by debbugs.gnu.org; 11 Apr 2023 16:58:17 +0000 Original-Received: from localhost ([127.0.0.1]:38082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmHJx-000346-0M for submit@debbugs.gnu.org; Tue, 11 Apr 2023 12:58:17 -0400 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:43121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmHJv-00033r-1Z for 62086@debbugs.gnu.org; Tue, 11 Apr 2023 12:58:16 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 14E61C0002; Tue, 11 Apr 2023 16:58:07 +0000 (UTC) In-Reply-To: <9ceb589f-9325-1607-d1b5-5fd56cb8c3ec@yandex.ru> (Dmitry Gutov's message of "Wed, 5 Apr 2023 19:36:37 +0300") 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:259656 Archived-At: --=-=-= Content-Type: text/plain I don't know if opening a new bug report is needed. Actually I'm doing the same thing for more ts-modes - trying to find a set of node names that match parens/brackets. So maybe this patch makes sense too: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=treesit-sexp-type-regexp.patch diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index d773b4a41f4..e55d26177af 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -927,7 +927,9 @@ c-ts-base-mode "qualifier" "type" "parameter" - "expression" + ;; "expression" + "argument_list" + "identifier" "literal" "string"))) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index f68ecb6fa6c..3876a5b54f1 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3827,7 +3827,9 @@ js--treesit-sentence-nodes "See `treesit-sentence-type-regexp' for more information.") (defvar js--treesit-sexp-nodes - '("expression" + '("expression" ;; SHOULD NOT MATCH "expression_statement", BUT SHOULD MATCH "parenthesized_expression" + "parenthesized_expression" + "formal_parameters" "pattern" "array" "function" @@ -3845,7 +3847,13 @@ js--treesit-sexp-nodes "undefined" "arguments" "pair" - "jsx") + "jsx" + "statement_block" + "object" + "object_pattern" + "named_imports" + "class_body" + ) "Nodes that designate sexps in JavaScript. See `treesit-sexp-type-regexp' for more information.") @@ -3893,7 +3901,7 @@ js-ts-mode (regexp-opt js--treesit-sentence-nodes)) (setq-local treesit-sexp-type-regexp - (regexp-opt js--treesit-sexp-nodes)) + (rx-to-string `(seq bol (or ,@js--treesit-sexp-nodes) eol))) ;; Fontification. (setq-local treesit-font-lock-settings js--treesit-font-lock-settings) --=-=-=--