kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(buffer_updates): correct buffer updates when splitting empty line

Browse Source 
fixes #11591
This commit is contained in:
bfredl 2023-12-25 13:06:00 +01:00
parent 3bcf8e5622
commit e5d9b15044
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/ops.c
View File

@ -18,6 +18,7 @@
#include "nvim/autocmd_defs.h"
#include "nvim/buffer.h"
#include "nvim/buffer_defs.h"
#include "nvim/buffer_updates.h"
#include "nvim/change.h"
#include "nvim/charset.h"
#include "nvim/cursor.h"
@ -3068,6 +3069,7 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags)
return;
}
colnr_T split_pos = 0;
if (y_type == kMTLineWise) {
if (flags & PUT_LINE_SPLIT) {
// "p" or "P" in Visual mode: split the lines to put the text in
@ -3075,23 +3077,24 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags)
if (u_save_cursor() == FAIL) {
goto end;
}
char *p = get_cursor_pos_ptr();
char *curline = get_cursor_line_ptr();
char *p = curline + curwin->w_cursor.col;
if (dir == FORWARD && *p != NUL) {
MB_PTR_ADV(p);
}
// we need this later for the correct extmark_splice() event
split_pos = (colnr_T)(p - curline);
char *ptr = xstrdup(p);
ml_append(curwin->w_cursor.lnum, ptr, 0, false);
xfree(ptr);
char *oldp = get_cursor_line_ptr();
p = oldp + curwin->w_cursor.col;
if (dir == FORWARD && *p != NUL) {
MB_PTR_ADV(p);
}
ptr = xmemdupz(oldp, (size_t)(p - oldp));
ptr = xmemdupz(get_cursor_line_ptr(), (size_t)split_pos);
ml_replace(curwin->w_cursor.lnum, ptr, false);
nr_lines++;
dir = FORWARD;
buf_updates_send_changes(curbuf, curwin->w_cursor.lnum, 1, 1);
}
if (flags & PUT_LINE_FORWARD) {
// Must be "p" for a Visual block, put lines below the block.
@ -3550,7 +3553,7 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags)
bcount_t totsize = 0;
int lastsize = 0;
if (y_type == kMTCharWise
|| (y_type == kMTLineWise && flags & PUT_LINE_SPLIT)) {
|| (y_type == kMTLineWise && (flags & PUT_LINE_SPLIT))) {
for (i = 0; i < y_size - 1; i++) {
totsize += (bcount_t)strlen(y_array[i]) + 1;
}
@ -3561,9 +3564,9 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags)
extmark_splice(curbuf, (int)new_cursor.lnum - 1, col, 0, 0, 0,
(int)y_size - 1, lastsize, totsize,
kExtmarkUndo);
} else if (y_type == kMTLineWise && flags & PUT_LINE_SPLIT) {
} else if (y_type == kMTLineWise && (flags & PUT_LINE_SPLIT)) {
// Account for last pasted NL + last NL
extmark_splice(curbuf, (int)new_cursor.lnum - 1, col + 1, 0, 0, 0,
extmark_splice(curbuf, (int)new_cursor.lnum - 1, split_pos, 0, 0, 0,
(int)y_size + 1, 0, totsize + 2, kExtmarkUndo);
}

10
test/functional/api/buffer_updates_spec.lua
View File

@ -349,6 +349,16 @@ describe('API: buffer events:', function()
expectn('nvim_buf_lines_event', { b, tick, 3, 4, {}, false })
end)
it('visual paste split empty line', function()
local b, tick = editoriginal(true, { 'abc', '{', 'def', '}' })
command('normal! ggyyjjvi{p')
expectn('nvim_buf_lines_event', { b, tick + 1, 2, 3, { '' }, false })
expectn('nvim_buf_lines_event', { b, tick + 2, 2, 3, { '}' }, false })
expectn('nvim_buf_lines_event', { b, tick + 3, 3, 4, {}, false })
expectn('nvim_buf_lines_event', { b, tick + 3, 2, 3, { '' }, false })
expectn('nvim_buf_lines_event', { b, tick + 4, 3, 3, { 'abc', '}' }, false })
end)
it('when lines are filtered', function()
-- Test filtering lines with !cat
local b, tick = editoriginal(true, { 'A', 'C', 'E', 'B', 'D', 'F' })

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

@ -1073,6 +1073,15 @@ describe('lua: nvim_buf_attach on_bytes', function()
}
end)
it('visual paste 2: splitting an empty line', function()
local check_events = setup_eventcheck(verify, { 'abc', '{', 'def', '}' })
feed('ggyyjjvi{p')
check_events {
{ 'test1', 'bytes', 1, 6, 2, 0, 6, 1, 0, 4, 0, 0, 0 },
{ 'test1', 'bytes', 1, 6, 2, 0, 6, 0, 0, 0, 2, 0, 5 },
}
end)
it('nvim_buf_set_lines', function()
local check_events = setup_eventcheck(verify, { 'AAA', 'BBB' })