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

Handle offset in treesit--update-ranges-local (bug#77848)

Browse source 
* lisp/treesit.el:
(treesit--update-ranges-local): Add OFFSET parameter.
(treesit-update-ranges): Pass offset to
treesit--update-ranges-local.
This commit is contained in:
Yuan Fu 2025-04-18 16:22:45 -07:00
parent 4dcd66abd5
commit ef8bfe90b7
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/treesit.el
View file

@ -736,7 +736,7 @@ it."
(delete-overlay ov))))) (delete-overlay ov)))))
(defun treesit--update-ranges-local (defun treesit--update-ranges-local
(query embedded-lang modified-tick &optional beg end) (query embedded-lang modified-tick &optional beg end offset)
"Update range for local parsers between BEG and END. "Update range for local parsers between BEG and END.
Use QUERY to get the ranges, and make sure each range has a local Use QUERY to get the ranges, and make sure each range has a local
parser for EMBEDDED-LANG. parser for EMBEDDED-LANG.
@ -748,11 +748,16 @@ property.
When this function touches an overlay, it sets the When this function touches an overlay, it sets the
`treesit-parser-ov-timestamp' property of the overlay to `treesit-parser-ov-timestamp' property of the overlay to
MODIFIED-TICK. This will help Emacs garbage-collect overlays that MODIFIED-TICK. This will help Emacs garbage-collect overlays that
aren't in use anymore." aren't in use anymore.
OFFSET is a cons of start and end offsets that are applied to the range
for the local parser."
;; Update range. ;; Update range.
(let* ((host-lang (treesit-query-language query)) (let* ((host-lang (treesit-query-language query))
(host-parser (treesit-parser-create host-lang)) (host-parser (treesit-parser-create host-lang))
(ranges (treesit-query-range host-parser query beg end))) (ranges (treesit-query-range host-parser query beg end))
(offset-left (or (car offset) 0))
(offset-right (or (cdr offset) 0)))
(pcase-dolist (`(,beg . ,end) ranges) (pcase-dolist (`(,beg . ,end) ranges)
(let ((has-parser nil)) (let ((has-parser nil))
(setq (setq
@ -780,7 +785,8 @@ aren't in use anymore."
(overlay-put ov 'treesit-parser-ov-timestamp (overlay-put ov 'treesit-parser-ov-timestamp
modified-tick) modified-tick)
(treesit-parser-set-included-ranges (treesit-parser-set-included-ranges
embedded-parser `((,beg . ,end))))))))) embedded-parser `((,(+ beg offset-left)
. ,(+ end offset-right))))))))))
(defun treesit-update-ranges (&optional beg end) (defun treesit-update-ranges (&optional beg end)
"Update the ranges for each language in the current buffer. "Update the ranges for each language in the current buffer.
@ -803,7 +809,7 @@ region."
((functionp query) (funcall query beg end)) ((functionp query) (funcall query beg end))
(local (local
(treesit--update-ranges-local (treesit--update-ranges-local
query language modified-tick beg end)) query language modified-tick beg end offset))
(t (t
(let* ((host-lang (treesit-query-language query)) (let* ((host-lang (treesit-query-language query))
(parser (treesit-parser-create language)) (parser (treesit-parser-create language))