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

Fix call to treesit_record_change in insdel.c

Browse source 
The start position of the change shouldn't be PT_BYTE, IIUC PT_BYTE is
actually the end position.

* src/insdel.c (insert_from_buffer): Move to here.
(insert_from_buffer_1): Remove call to treesit_record_change.
This commit is contained in:
Yuan Fu 2023-01-25 23:12:41 -08:00
parent 00675aa724
commit 4bd06ce2a9
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/insdel.c
View file

@ -1175,9 +1175,19 @@ insert_from_buffer (struct buffer *buf,
{
ptrdiff_t opoint = PT;
#ifdef HAVE_TREE_SITTER
ptrdiff_t obyte = PT_BYTE;
#endif
insert_from_buffer_1 (buf, charpos, nchars, inherit);
signal_after_change (opoint, 0, PT - opoint);
update_compositions (opoint, PT, CHECK_BORDER);
#ifdef HAVE_TREE_SITTER
eassert (PT_BYTE >= 0);
eassert (PT_BYTE >= obyte);
treesit_record_change (obyte, obyte, PT_BYTE);
#endif
}
static void
@ -1305,12 +1315,6 @@ insert_from_buffer_1 (struct buffer *buf,
/* Insert those intervals. */
graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit);
#ifdef HAVE_TREE_SITTER
eassert (outgoing_nbytes >= 0);
eassert (PT_BYTE >= 0);
treesit_record_change (PT_BYTE, PT_BYTE, PT_BYTE + outgoing_nbytes);
#endif
adjust_point (nchars, outgoing_nbytes);
}