wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: invoke changed_bytes when rewriting <Tab> char #25125

Browse Source 
When tabstop and shiftwidth are not equal, tabs are inserted as individual
spaces and then rewritten as tab characters in a second pass. That second pass
did not call changed_bytes which resulted in events being omitted.

Fixes #25092
This commit is contained in:
Ilia Choly 2023-09-15 06:45:51 -04:00 committed by GitHub
parent 28233bcb49
commit f5a09f1b03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/edit.c
View File

@ -4429,9 +4429,8 @@ static bool ins_tab(void)
}
}
if (!(State & VREPLACE_FLAG)) {
extmark_splice_cols(curbuf, (int)fpos.lnum - 1, change_col,
cursor->col - change_col, fpos.col - change_col,
kExtmarkUndo);
inserted_bytes(fpos.lnum, change_col,
cursor->col - change_col, fpos.col - change_col);
}
}
cursor->col -= i;

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

@ -826,53 +826,53 @@ describe('lua: nvim_buf_attach on_bytes', function()
feed("<esc>u")
check_events {
{ "test1", "bytes", 1, 8, 0, 0, 0, 0, 1, 1, 0, 4, 4 },
{ "test1", "bytes", 1, 8, 0, 0, 0, 0, 4, 4, 0, 0, 0 }
{ "test1", "bytes", 1, 9, 0, 0, 0, 0, 1, 1, 0, 4, 4 },
{ "test1", "bytes", 1, 9, 0, 0, 0, 0, 4, 4, 0, 0, 0 }
}
-- in REPLACE mode
feed("R<tab><tab>")
check_events {
{ "test1", "bytes", 1, 9, 0, 0, 0, 0, 1, 1, 0, 1, 1 },
{ "test1", "bytes", 1, 10, 0, 1, 1, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 11, 0, 2, 2, 0, 1, 1, 0, 1, 1 },
{ "test1", "bytes", 1, 12, 0, 3, 3, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 13, 0, 0, 0, 0, 4, 4, 0, 1, 1 },
{ "test1", "bytes", 1, 10, 0, 0, 0, 0, 1, 1, 0, 1, 1 },
{ "test1", "bytes", 1, 11, 0, 1, 1, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 12, 0, 2, 2, 0, 1, 1, 0, 1, 1 },
{ "test1", "bytes", 1, 13, 0, 3, 3, 0, 0, 0, 0, 1, 1 },
{ "test1", "bytes", 1, 14, 0, 0, 0, 0, 4, 4, 0, 1, 1 },
}
feed("<esc>u")
check_events {
{ "test1", "bytes", 1, 14, 0, 0, 0, 0, 1, 1, 0, 4, 4 },
{ "test1", "bytes", 1, 14, 0, 2, 2, 0, 2, 2, 0, 1, 1 },
{ "test1", "bytes", 1, 14, 0, 0, 0, 0, 2, 2, 0, 1, 1 }
{ "test1", "bytes", 1, 16, 0, 0, 0, 0, 1, 1, 0, 4, 4 },
{ "test1", "bytes", 1, 16, 0, 2, 2, 0, 2, 2, 0, 1, 1 },
{ "test1", "bytes", 1, 16, 0, 0, 0, 0, 2, 2, 0, 1, 1 }
}
-- in VISUALREPLACE mode
feed("gR<tab><tab>")
check_events {
{ "test1", "bytes", 1, 15, 0, 0, 0, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 16, 0, 1, 1, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 17, 0, 2, 2, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 18, 0, 3, 3, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 19, 0, 3, 3, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 20, 0, 3, 3, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 22, 0, 2, 2, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 23, 0, 2, 2, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 25, 0, 1, 1, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 26, 0, 1, 1, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 28, 0, 0, 0, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 29, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 31, 0, 0, 0, 0, 4, 4, 0, 1, 1 };
{ "test1", "bytes", 1, 17, 0, 0, 0, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 18, 0, 1, 1, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 19, 0, 2, 2, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 20, 0, 3, 3, 0, 1, 1, 0, 1, 1 };
{ "test1", "bytes", 1, 21, 0, 3, 3, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 22, 0, 3, 3, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 24, 0, 2, 2, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 25, 0, 2, 2, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 27, 0, 1, 1, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 28, 0, 1, 1, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 30, 0, 0, 0, 0, 1, 1, 0, 0, 0 };
{ "test1", "bytes", 1, 31, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 33, 0, 0, 0, 0, 4, 4, 0, 1, 1 };
}
-- inserting tab after other tabs
command("set sw=4")
feed("<esc>0a<tab>")
check_events {
{ "test1", "bytes", 1, 32, 0, 1, 1, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 33, 0, 2, 2, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 34, 0, 3, 3, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 35, 0, 4, 4, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 36, 0, 1, 1, 0, 4, 4, 0, 1, 1 };
{ "test1", "bytes", 1, 34, 0, 1, 1, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 35, 0, 2, 2, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 36, 0, 3, 3, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 37, 0, 4, 4, 0, 0, 0, 0, 1, 1 };
{ "test1", "bytes", 1, 38, 0, 1, 1, 0, 4, 4, 0, 1, 1 };
}
end)