From: Juri Linkov <juri@linkov.net>
Date: Tue, 24 Dec 2024 17:24:11 +0000 (+0200)
Subject: Add treesit thing 'sexp-list' to tsx-ts-mode (bug#73404, bug#73978)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb5e8811e6f277c301420ebf31923e2e3d7a254b;p=emacs.git

Add treesit thing 'sexp-list' to tsx-ts-mode (bug#73404, bug#73978)

* lisp/progmodes/typescript-ts-mode.el (tsx-ts-mode):
Add 'sexp-list' to 'treesit-thing-settings' with "jsx" things.
(typescript-ts-mode--sexp-list-nodes): Remove "jsx" things.

(cherry picked from commit b061c01607aa43b8ffa1b5c4a90c3602497cf823)
---

diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 9a85533181a..64205e55eec 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -470,8 +470,6 @@ See `treesit-thing-settings' for more information.")
     "object_pattern"
     "array"
     "array_pattern"
-    "jsx_expression"
-    "_jsx_string"
     "string"
     "regex"
     "arguments"
@@ -597,8 +595,15 @@ at least 3 (which is the default value)."
                 `((tsx
                    (sexp ,(regexp-opt
                            (append typescript-ts-mode--sexp-nodes
-                                   '("jsx"))
-                           'symbols))
+                                   '("jsx"))))
+                   (sexp-list ,(concat "^"
+                                       (regexp-opt
+                                        (append typescript-ts-mode--sexp-list-nodes
+                                                '(
+                                                  "jsx_element"
+                                                  "jsx_self_closing_element"
+                                                  "jsx_expression")))
+                                       "$"))
                    (sentence ,(regexp-opt
                                (append typescript-ts-mode--sentence-nodes
                                        '("jsx_element"