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): adjust extmarks after diffput/diffget (#22440)

Browse Source 
Problem: on_bytes is not triggered by diffput/diffget if the line count
does not change.
This commit is contained in:
Jaehwang Jung 2023-02-28 07:09:12 +09:00 committed by GitHub
parent 521034edef
commit b50ee4a8dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/diff.c
View File

@ -31,6 +31,7 @@
#include "nvim/ex_cmds.h"
#include "nvim/ex_cmds_defs.h"
#include "nvim/ex_docmd.h"
#include "nvim/extmark.h"
#include "nvim/extmark_defs.h"
#include "nvim/fileio.h"
#include "nvim/fold.h"
@ -3102,6 +3103,9 @@ static void diffgetput(const int addr_count, const int idx_cur, const int idx_fr
if (buf_empty && (curbuf->b_ml.ml_line_count == 2)) {
// Added the first line into an empty buffer, need to
// delete the dummy empty line.
// This has a side effect of incrementing curbuf->deleted_bytes,
// which results in inaccurate reporting of the byte count of
// previous contents in buffer-update events.
buf_empty = false;
ml_delete((linenr_T)2, false);
}
@ -3143,6 +3147,7 @@ static void diffgetput(const int addr_count, const int idx_cur, const int idx_fr
}
}
}
extmark_adjust(curbuf, lnum, lnum + count - 1, (long)MAXLNUM, added, kExtmarkUndo);
changed_lines(lnum, 0, lnum + count, added, true);
if (did_free) {