IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14385 from chentau/extmark_delete

Browse Source 
Extmarks: remove `curbuf->deleted_bytes2` from `op_delete`
This commit is contained in:
Björn Linse 2021-04-17 09:25:44 +02:00 committed by GitHub
commit 63b64ebab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/ops.c
View File

@ -1676,12 +1676,18 @@ int op_delete(oparg_T *oap)
curbuf_splice_pending++;
pos_T startpos = curwin->w_cursor; // start position for delete
bcount_t deleted_bytes = (bcount_t)STRLEN(
ml_get(startpos.lnum)) + 1 - startpos.col;
truncate_line(true); // delete from cursor to end of line
curpos = curwin->w_cursor; // remember curwin->w_cursor
curwin->w_cursor.lnum++;
for (linenr_T i = 1; i <= oap->line_count - 2; i++) {
deleted_bytes += (bcount_t)STRLEN(
ml_get(startpos.lnum + i)) + 1;
}
del_lines(oap->line_count - 2, false);
bcount_t deleted_bytes = (bcount_t)curbuf->deleted_bytes2 - startpos.col;
// delete from start of line until op_end
n = (oap->end.col + 1 - !oap->inclusive);

30
test/functional/lua/buffer_updates_spec.lua
View File

@ -461,6 +461,36 @@ describe('lua: nvim_buf_attach on_bytes', function()
}
end)
it("deleting lines", function()
local check_events = setup_eventcheck(verify, origlines)
feed("dd")
check_events {
{ "test1", "bytes", 1, 3, 0, 0, 0, 1, 0, 16, 0, 0, 0 };
}
feed("d2j")
check_events {
{ "test1", "bytes", 1, 4, 0, 0, 0, 3, 0, 48, 0, 0, 0 };
}
feed("ld<c-v>2j")
check_events {
{ "test1", "bytes", 1, 5, 0, 1, 1, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 5, 1, 1, 16, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 5, 2, 1, 31, 0, 1, 1, 0, 0, 0 };
}
feed("vjwd")
check_events {
{ "test1", "bytes", 1, 10, 0, 1, 1, 1, 9, 23, 0, 0, 0 };
}
end)
it("changing lines", function()
local check_events = setup_eventcheck(verify, origlines)