procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/treesit.el: Fix treesit-show-paren-data (bug#75198)

Browse source 
(treesit-show-paren-data--categorize): Use 'treesit-thing-defined-p'
to check if the thing exists for the language at POS before calling
'treesit-parent-until' that raises an error for an undefined thing.
(treesit-thing-defined-p): Add the alias signature to the docstring.
This commit is contained in:
Juri Linkov 2025-01-05 09:43:22 +02:00
parent cc5cd4de93
commit 47ff8ab307
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/treesit.el
View file

@ -2732,7 +2732,9 @@ If LANGUAGE is nil, return the first definition for THING in
treesit-thing-settings)))))
(defalias 'treesit-thing-defined-p #'treesit-thing-definition
"Return non-nil if THING is defined.")
"Return non-nil if THING is defined for LANGUAGE.
\(fn THING LANGUAGE)")
(defun treesit-beginning-of-thing (thing &optional arg tactic)
"Like `beginning-of-defun', but generalized into things.
@ -3416,9 +3418,10 @@ For BOUND, MOVE, BACKWARD, LOOKING-AT, see the descriptions in
(defun treesit-show-paren-data--categorize (pos &optional end-p)
(let* ((pred 'sexp-list)
(parent (treesit-node-at (if end-p (1- pos) pos)))
(_ (while (and parent (not (treesit-node-match-p parent pred t)))
(setq parent (treesit-node-parent parent))))
(parent (when (treesit-thing-defined-p
'sexp-list (treesit-language-at pos))
(treesit-parent-until
(treesit-node-at (if end-p (1- pos) pos)) pred)))
(first (when parent (treesit-node-child parent 0)))
(first-start (when first (treesit-node-start first)))
(first-end (when first (treesit-node-end first)))