bug#71244: Limit matches of treesit-thing-settings in js-ts-mode

bug#71244: Limit matches of treesit-thing-settings in js-ts-mode

[Juri Linkov]

[-- 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)

bug#71244: Limit matches of treesit-thing-settings in js-ts-mode

[Juri Linkov]

close 71244 30.0.50
thanks

> 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):

With no objections, this is pushed now.

bug#71244: Limit matches of treesit-thing-settings in js-ts-mode

[Yuan Fu]

> On May 30, 2024, at 11:34 PM, Juri Linkov <juri@linkov.net> wrote:
> 
> close 71244 30.0.50
> thanks
> 
>> 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):
> 
> With no objections, this is pushed now.

Thanks Juri!

Yuan