mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vim.diff): correctly apply hunk offsets with linematch (#20931)

Browse Source
This commit is contained in:
Lewis Russell
2022-11-04 11:12:17 +00:00
committed by GitHub
parent f1c864cfe3
commit b854f2ce09
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/lua/xdiff.c
View File

@@ -41,6 +41,15 @@ typedef struct {
static void lua_pushhunk(lua_State *lstate, long start_a, long count_a, long start_b, long count_b) static void lua_pushhunk(lua_State *lstate, long start_a, long count_a, long start_b, long count_b)
{ {
// Mimic extra offsets done by xdiff, see:
// src/xdiff/xemit.c:284
// src/xdiff/xutils.c:(356,368)
if (count_a > 0) {
start_a += 1;
}
if (count_b > 0) {
start_b += 1;
}
lua_createtable(lstate, 0, 0); lua_createtable(lstate, 0, 0);
lua_pushinteger(lstate, start_a); lua_pushinteger(lstate, start_a);
lua_rawseti(lstate, -2, 1); lua_rawseti(lstate, -2, 1);
@@ -116,15 +125,6 @@ static int write_string(void *priv, mmbuffer_t *mb, int nbuf)
// hunk_func callback used when opts.hunk_lines = true // hunk_func callback used when opts.hunk_lines = true
static int hunk_locations_cb(long start_a, long count_a, long start_b, long count_b, void *cb_data) static int hunk_locations_cb(long start_a, long count_a, long start_b, long count_b, void *cb_data)
{ {
// Mimic extra offsets done by xdiff, see:
// src/xdiff/xemit.c:284
// src/xdiff/xutils.c:(356,368)
if (count_a > 0) {
start_a += 1;
}
if (count_b > 0) {
start_b += 1;
}
hunkpriv_t *priv = (hunkpriv_t *)cb_data; hunkpriv_t *priv = (hunkpriv_t *)cb_data;
lua_State *lstate = priv->lstate; lua_State *lstate = priv->lstate;
if (priv->linematch) { if (priv->linematch) {