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

Make treesit-node-at more readable

Browse source 
* lisp/treesit.el (treesit-node-at): Make the logic for finding
the parser (and the root node) more explicit and
straightforward.  Don't use treesit-buffer-root-node; instead,
find the parser and use treesit-parser-root-node directly.
This commit is contained in:
Yuan Fu 2025-02-04 23:35:37 -08:00
parent 4aab2f45b3
commit 12a3145b3b
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lisp/treesit.el
View file

@ -226,17 +226,35 @@ is nil, try to guess the language at POS using `treesit-language-at'.
If there's a local parser at POS, the local parser takes priority
unless PARSER-OR-LANG is a parser, or PARSER-OR-LANG is a
language and doesn't match the language of the local parser."
(let* ((root (if (treesit-parser-p parser-or-lang)
(treesit-parser-root-node parser-or-lang)
(or (when-let* ((parser
(car (treesit-local-parsers-at
pos parser-or-lang))))
(treesit-parser-root-node parser))
(condition-case nil
(treesit-buffer-root-node
(or parser-or-lang
(treesit-language-at pos)))
(treesit-no-parser nil)))))
(let* ((root
;; 1. Given a parser, just use the parser's root node.
(cond ((treesit-parser-p parser-or-lang)
(treesit-parser-root-node parser-or-lang))
;; 2. Given a language, try local parser, then global
;; parser.
(parser-or-lang
(let* ((local-parser (car (treesit-local-parsers-at
pos parser-or-lang)))
(global-parser (car (treesit-parser-list
nil parser-or-lang)))
(parser (or local-parser global-parser)))
(when parser
(treesit-parser-root-node parser))))
;; 3. No given language, try to get a language at point.
;; If we got a language, only use parser of that
;; language, otherwise use any parser we can find. When
;; finding parser, try local parser first, then global
;; parser.
(t
;; LANG can be nil.
(let* ((lang (treesit-language-at pos))
(local-parser (car (treesit-local-parsers-at
pos lang)))
(global-parser (car (treesit-parser-list
nil lang)))
(parser (or local-parser global-parser)))
(when parser
(treesit-parser-root-node parser))))))
(node root)
(node-before root)
(pos-1 (max (1- pos) (point-min)))