From: Juri Linkov <juri@linkov.net>
To: 71244@debbugs.gnu.org
Cc: Yuan Fu <casouri@gmail.com>
Subject: bug#71244: Limit matches of treesit-thing-settings in js-ts-mode
Date: Tue, 28 May 2024 19:24:56 +0300 [thread overview]
Message-ID: <86a5k9c3zf.fsf@mail.linkov.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
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):
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: js--treesit-sexp-nodes.patch --]
[-- Type: text/x-diff, Size: 1424 bytes --]
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)
next reply other threads:[~2024-05-28 16:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-28 16:24 Juri Linkov [this message]
2024-05-31 6:34 ` bug#71244: Limit matches of treesit-thing-settings in js-ts-mode Juri Linkov
2024-06-06 5:20 ` Yuan Fu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86a5k9c3zf.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=71244@debbugs.gnu.org \
--cc=casouri@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).