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

fix(diff): trigger on_bytes only once after diffget/diffput

Browse Source 
Problem: The fix from b50ee4a8dc may
adjust extmark twice, triggering on_bytes callback twice.

Solution: Don't let mark_adjust adjust extmark.
This commit is contained in:
Jaehwang Jung 2023-03-11 16:52:46 +09:00
parent 236c20795e
commit 2748202e0e
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/diff.c
View File

@ -3136,7 +3136,7 @@ static void diffgetput(const int addr_count, const int idx_cur, const int idx_fr
if (added != 0) { if (added != 0) {
// Adjust marks. This will change the following entries! // Adjust marks. This will change the following entries!
mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, added, kExtmarkUndo); mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, added, kExtmarkNOOP);
if (curwin->w_cursor.lnum >= lnum) { if (curwin->w_cursor.lnum >= lnum) {
// Adjust the cursor position if it's in/after the changed // Adjust the cursor position if it's in/after the changed
// lines. // lines.

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

@ -1171,6 +1171,25 @@ describe('lua: nvim_buf_attach on_bytes', function()
} }
end) end)
it('works with :diffput and :diffget', function()
local check_events = setup_eventcheck(verify, {"AAA"})
command('diffthis')
command('new')
command('diffthis')
meths.buf_set_lines(0, 0, -1, true, {"AAA", "BBB"})
feed('G')
command('diffput')
check_events {
{ "test1", "bytes", 1, 3, 1, 0, 4, 0, 0, 0, 1, 0, 4 };
}
meths.buf_set_lines(0, 0, -1, true, {"AAA", "CCC"})
feed('<C-w>pG')
command('diffget')
check_events {
{ "test1", "bytes", 1, 4, 1, 0, 4, 1, 0, 4, 1, 0, 4 };
}
end)
local function test_lockmarks(mode) local function test_lockmarks(mode)
local description = (mode ~= "") and mode or "(baseline)" local description = (mode ~= "") and mode or "(baseline)"
it("test_lockmarks " .. description .. " %delete _", function() it("test_lockmarks " .. description .. " %delete _", function()