From: Juri Linkov <juri@linkov.net>
Date: Sun, 1 Sep 2024 17:02:12 +0000 (+0300)
Subject: * lisp/progmodes/js.el: Improve sexp navigation in js-ts-mode (bug#72573)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f7baf609f052dd8dc314da40a4ca4834f87a215b;p=emacs.git

* lisp/progmodes/js.el: Improve sexp navigation in js-ts-mode (bug#72573)

(js--treesit-sexp-nodes): Add "template_string", "template_substitution",
"property_identifier".
(js-ts-mode): Replace "template_string" with "string_fragment"
in 'text' part of 'treesit-thing-settings'.

(cherry picked from commit 0155f2ae2c84c649452b0eaac3fd247a37e4eaff)
---

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a338c19763f..d75256c2e7c 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3860,11 +3860,14 @@ See `treesit-thing-settings' for more information.")
     "array"
     "function"
     "string"
+    "template_string"
+    "template_substitution"
     "escape"
     "template"
     "regex"
     "number"
     "identifier"
+    "property_identifier"
     "this"
     "super"
     "true"
@@ -3928,7 +3931,7 @@ See `treesit-thing-settings' for more information.")
                    (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"))))))
+                                                   "string_fragment"))))))
 
     ;; Fontification.
     (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)