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

Merge pull request #17411 from zeertzjq/vim-8.2.3820

Browse Source 
vim-patch:8.2.{3820,3823}: "vrc" does not replace composing characters
This commit is contained in:
zeertzjq 2022-02-15 20:36:01 +08:00 committed by GitHub
commit 0072a97b2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/ops.c
View File

@ -1961,11 +1961,14 @@ static int op_replace(oparg_T *oap, int c)
while (ltoreq(curwin->w_cursor, oap->end)) {
n = gchar_cursor();
if (n != NUL) {
if (utf_char2len(c) > 1 || utf_char2len(n) > 1) {
int new_byte_len = utf_char2len(c);
int old_byte_len = utfc_ptr2len(get_cursor_pos_ptr());
if (new_byte_len > 1 || old_byte_len > 1) {
// This is slow, but it handles replacing a single-byte
// with a multi-byte and the other way around.
if (curwin->w_cursor.lnum == oap->end.lnum) {
oap->end.col += utf_char2len(c) - utf_char2len(n);
oap->end.col += new_byte_len - old_byte_len;
}
replace_character(c);
} else {

5
src/nvim/testdir/test_visual.vim
View File

@ -636,6 +636,11 @@ func Test_characterwise_visual_mode()
normal v$rx
call assert_equal(['x'], getline(1, '$'))
" replace a character with composing characters
call setline(1, "xã̳x")
normal gg0lvrb
call assert_equal("xbx", getline(1))
bwipe!
endfunc