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#71244: Limit matches of treesit-thing-settings in js-ts-mode Date: Tue, 28 May 2024 19:24:56 +0300 Organization: LINKOV.NET Message-ID: <86a5k9c3zf.fsf@mail.linkov.net> 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="21398"; 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: Yuan Fu To: 71244@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue May 28 18:32:20 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 1sBzkK-0005OD-Ak for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 28 May 2024 18:32:20 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBzjx-0004T6-IV; Tue, 28 May 2024 12:31:57 -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 1sBzjv-0004SH-Ht for bug-gnu-emacs@gnu.org; Tue, 28 May 2024 12:31:55 -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 1sBzjt-0003iG-71 for bug-gnu-emacs@gnu.org; Tue, 28 May 2024 12:31:53 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sBzk2-0006I0-B6; Tue, 28 May 2024 12:32:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: casouri@gmail.com, bug-gnu-emacs@gnu.org Resent-Date: Tue, 28 May 2024 16:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71244 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Yuan Fu Original-Received: via spool by submit@debbugs.gnu.org id=B.171691392124170 (code B ref -1); Tue, 28 May 2024 16:32:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 28 May 2024 16:32:01 +0000 Original-Received: from localhost ([127.0.0.1]:46848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBzk1-0006Hj-Bh for submit@debbugs.gnu.org; Tue, 28 May 2024 12:32:01 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:45250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBzjz-0006Ha-1U for submit@debbugs.gnu.org; Tue, 28 May 2024 12:31: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 1sBzjp-0004Ql-AH for bug-gnu-emacs@gnu.org; Tue, 28 May 2024 12:31:49 -0400 Original-Received: from relay5-d.mail.gandi.net ([2001:4b98:dc4:8::225]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBzjn-0003fv-NW for bug-gnu-emacs@gnu.org; Tue, 28 May 2024 12:31:49 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id F3C221C0002 for ; Tue, 28 May 2024 16:31:41 +0000 (UTC) X-GND-Sasl: juri@linkov.net Received-SPF: pass client-ip=2001:4b98:dc4:8::225; envelope-from=juri@linkov.net; helo=relay5-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:286097 Archived-At: --=-=-= Content-Type: text/plain Navigation in js-ts-mode is still quite unusable when "expression" in 'js--treesit-sexp-nodes' matches "expression_statement". Whereas it should match only "expression" and "parenthesized_expression". So here is the patch that adds delimiters "\\_<" and "\\_>" around node names by 'js--regexp-opt-symbol' (and adds some useful nodes as well): --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=js--treesit-sexp-nodes.patch diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 6cb84592896..f5629ff8fbe 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3829,6 +3829,8 @@ js--treesit-sentence-nodes (defvar js--treesit-sexp-nodes '("expression" + "parenthesized_expression" + "formal_parameters" "pattern" "array" "function" @@ -3846,7 +3848,12 @@ 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-thing-settings' for more information.") @@ -3889,10 +3896,10 @@ js-ts-mode (setq-local treesit-thing-settings `((javascript - (sexp ,(regexp-opt js--treesit-sexp-nodes)) - (sentence ,(regexp-opt js--treesit-sentence-nodes)) - (text ,(regexp-opt '("comment" - "template_string")))))) + (sexp ,(js--regexp-opt-symbol js--treesit-sexp-nodes)) + (sentence ,(js--regexp-opt-symbol js--treesit-sentence-nodes)) + (text ,(js--regexp-opt-symbol '("comment" + "template_string")))))) ;; Fontification. (setq-local treesit-font-lock-settings js--treesit-font-lock-settings) --=-=-=--