Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't process function range settings in treesit--update-range-1

Browse source 
This fixes a bug where we call treesit-query-language on a
function, which happens before the QUERY in a range setting can
be either a function or a query, but we call it with
treesit-query-language before knowing whether it's a query or
function.

* lisp/treesit.el:
(treesit--update-range-1): Skip function range settings.
(treesit-update-ranges): Handle function range settings here.
This commit is contained in:
Yuan Fu 2025-03-02 20:26:28 -08:00
parent 76342efe9d
commit a211a940a1
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/treesit.el
View file

@ -1059,7 +1059,9 @@ embedded language parsers.
EMBED-LEVEL is the embed level for the embedded parser being created or
updated. When looking for existing embedded parsers, only look for
parsers of this level; when creating new parsers, set their level to
this level."
this level.
Function range settings in SETTINGS are ignored."
(let ((touched-parsers nil)
(modified-tick (buffer-chars-modified-tick)))
(dolist (setting settings)
@ -1071,7 +1073,9 @@ this level."
(range-fn (nth 4 setting)))
(when (eq query-lang (treesit-parser-language host-parser))
(cond
((functionp query) (funcall query beg end))
;; Function range settings don't participate in the recursive
;; update, they're handled by `treesit--update-range'.
((functionp query) nil)
(local
(setq touched-parsers
(append touched-parsers
@ -1100,6 +1104,11 @@ region."
(end (or end (point-max)))
(host-parsers (list treesit-primary-parser))
(embed-level 0))
;; Handle function range settings here once. They don't participate
;; in the recursive update below.
(dolist (setting treesit-range-settings)
(when (functionp (car setting))
(funcall (car setting) beg end)))
(while (and host-parsers (< embed-level 4))
(cl-incf embed-level)
(let ((next-round-of-host-parsers nil))