mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Code Issues Releases Activity

Fix treesit-node-at wrt local parsers

Browse Source 
* lisp/treesit.el (treesit-node-at): Don't compute language at point
first.  Because treesit-language-at uses treesit-node-at with a
language argument. Only call treesit-language-at when PARSER-OR-LANG
is nil.
This commit is contained in:
Yuan Fu 2023-09-09 12:35:13 -07:00
parent 01ba4d6c5f
commit 93a458f25f
No known key found for this signature in database
GPG Key ID: 56E19BC57664A442
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/treesit.el
View File

@ -189,16 +189,18 @@ is a language, find the first parser for that language in the
current buffer, or create one if none exists; If PARSER-OR-LANG
is nil, try to guess the language at POS using `treesit-language-at'.
If there's a local parser at POS, try to use that parser first."
(let* ((lang-at-point (treesit-language-at pos))
(root (if (treesit-parser-p parser-or-lang)
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 (or parser-or-lang
lang-at-point)))))
(or (when-let ((parser
(car (treesit-local-parsers-at
pos parser-or-lang))))
(treesit-parser-root-node parser))
(treesit-buffer-root-node
(or parser-or-lang lang-at-point)))))
(or parser-or-lang
(treesit-language-at pos))))))
(node root)
(node-before root)
(pos-1 (max (1- pos) (point-min)))