Add 'treesit-sexp-thing' to use instead of 'treesit-sexp-type-regexp'.

* lisp/treesit.el (treesit-sexp-thing): New variable to use
instead of 'treesit-sexp-type-regexp'.
(treesit-sexp-thing-down-list): Rename from 'treesit-sexp-type-down-list'.
(treesit-sexp-thing-up-list): Rename from 'treesit-sexp-type-up-list'.
(treesit-forward-sexp, treesit--forward-list-with-default)
(treesit-down-list, treesit-up-list): Update references to the
above variables.
(treesit-cycle-sexp-thing): Rename from 'treesit-cycle-sexp-type'.

* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode): Update same variables.

* lisp/progmodes/heex-ts-mode.el (heex-ts-mode): Set these variables
instead of calling the function that sets them.

* lisp/progmodes/python.el (python-ts-mode): Check if variables
'treesit-sentence-type-regexp' and 'treesit-sexp-type-regexp' are bound.

https://lists.gnu.org/archive/html/emacs-devel/2025-06/msg00182.html

1 files changed, 14 insertions, 12 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 96aa473e9e3..f1c18b0bd56 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -7332,18 +7332,20 @@ implementations: `python-mode' and `python-ts-mode'."
     (setq-local treesit-defun-name-function
                 #'python--treesit-defun-name)
 
-    (setq-local treesit-sentence-type-regexp
-                (regexp-opt '("statement"
-                              "clause")))
-
-    (setq-local treesit-sexp-type-regexp
-                (regexp-opt '("expression"
-                              "string"
-                              "call"
-                              "operator"
-                              "identifier"
-                              "integer"
-                              "float")))
+    (when (boundp 'treesit-sentence-type-regexp)
+      (setq-local treesit-sentence-type-regexp
+                  (regexp-opt '("statement"
+                                "clause"))))
+
+    (when (boundp 'treesit-sexp-type-regexp)
+      (setq-local treesit-sexp-type-regexp
+                  (regexp-opt '("expression"
+                                "string"
+                                "call"
+                                "operator"
+                                "identifier"
+                                "integer"
+                                "float"))))
 
     (treesit-major-mode-setup)