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

Call tree-sitter parser notifier on the first parse

Browse source 
* src/treesit.c (treesit_call_after_change_functions): Handle NULL
old_tree.
(treesit_ensure_parsed): Remove check for NULL tree.
This commit is contained in:
Yuan Fu 2022-12-28 15:30:10 -08:00
parent ec6feeaa19
commit f509246ba1
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/treesit.c
View file

@ -933,11 +933,24 @@ static void
treesit_call_after_change_functions (TSTree *old_tree, TSTree *new_tree, treesit_call_after_change_functions (TSTree *old_tree, TSTree *new_tree,
Lisp_Object parser) Lisp_Object parser)
{ {
uint32_t len; /* If the old_tree is NULL, meaning this is the first parse, the
TSRange *ranges = ts_tree_get_changed_ranges (old_tree, new_tree, &len); changed range is the whole buffer. */
Lisp_Object lisp_ranges;
struct buffer *buf = XBUFFER (XTS_PARSER (parser)->buffer); struct buffer *buf = XBUFFER (XTS_PARSER (parser)->buffer);
Lisp_Object lisp_ranges = treesit_make_ranges (ranges, len, buf); if (old_tree)
xfree (ranges); {
uint32_t len;
TSRange *ranges = ts_tree_get_changed_ranges (old_tree, new_tree, &len);
lisp_ranges = treesit_make_ranges (ranges, len, buf);
xfree (ranges);
}
else
{
struct buffer *oldbuf = current_buffer;
set_buffer_internal (buf);
lisp_ranges = Fcons (Fcons (Fpoint_min (), Fpoint_max ()), Qnil);
set_buffer_internal (oldbuf);
}
specpdl_ref count = SPECPDL_INDEX (); specpdl_ref count = SPECPDL_INDEX ();
@ -996,11 +1009,8 @@ treesit_ensure_parsed (Lisp_Object parser)
treesit_ensure_parsed again, it returns early and do not treesit_ensure_parsed again, it returns early and do not
recursively call the after change functions again. recursively call the after change functions again.
(ref:notifier-inside-ensure-parsed) */ (ref:notifier-inside-ensure-parsed) */
if (tree != NULL) treesit_call_after_change_functions (tree, new_tree, parser);
{ ts_tree_delete (tree);
treesit_call_after_change_functions (tree, new_tree, parser);
ts_tree_delete (tree);
}
} }
/* This is the read function provided to tree-sitter to read from a /* This is the read function provided to tree-sitter to read from a