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

vim-patch:9.1.0021: i_CTRL-R- doesn't work for multibyte chars in Replace mode

Browse Source 
Problem:  i_CTRL-R- doesn't work for multibyte chars in Replace mode,
          Coverity complains missing return value for u_save_cursor()
Solution: Use mb_charlen() and del_chars() instead, handle failure mode
          for u_save_cursor() correctly (@zeertzjq)

closes: vim/vim#13846

424ec1f235
This commit is contained in:
zeertzjq 2024-01-13 08:29:54 +08:00
parent 2783b6b0a4
commit 64a50d08c4
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/ops.c
View File

@ -1286,7 +1286,10 @@ int insert_reg(int regname, bool literally_arg)
if ((State & REPLACE_FLAG) != 0) { if ((State & REPLACE_FLAG) != 0) {
pos_T curpos; pos_T curpos;
u_save_cursor(); u_save_cursor();
del_bytes((colnr_T)strlen(reg->y_array[0]), true, false); if (u_save_cursor() == FAIL) {
return FAIL;
}
del_chars(mb_charlen(reg->y_array[0]), true);
curpos = curwin->w_cursor; curpos = curwin->w_cursor;
if (oneright() == FAIL) { if (oneright() == FAIL) {
// hit end of line, need to put forward (after the current position) // hit end of line, need to put forward (after the current position)

16
test/old/testdir/test_registers.vim
View File

@ -893,7 +893,7 @@ endfunc
func Test_insert_small_delete_replace_mode() func Test_insert_small_delete_replace_mode()
new new
call setline(1, ['foo', 'bar', 'foobar', 'bar']) call setline(1, ['foo', 'bar', 'foobar', 'bar'])
let @-='foo' let @- = 'foo'
call cursor(2, 1) call cursor(2, 1)
exe ":norm! R\<C-R>-\<C-R>-" exe ":norm! R\<C-R>-\<C-R>-"
call assert_equal('foofoo', getline(2)) call assert_equal('foofoo', getline(2))
@ -904,9 +904,21 @@ func Test_insert_small_delete_replace_mode()
exe ":norm! R\<C-R>-ZZZZ" exe ":norm! R\<C-R>-ZZZZ"
call assert_equal(['foo', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4)) call assert_equal(['foo', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4))
call cursor(1, 1) call cursor(1, 1)
let @-='' let @- = ''
exe ":norm! R\<C-R>-ZZZ" exe ":norm! R\<C-R>-ZZZ"
call assert_equal(['ZZZ', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4)) call assert_equal(['ZZZ', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4))
let @- = 'βbβ'
call cursor(4, 1)
exe ":norm! R\<C-R>-"
call assert_equal(['ZZZ', 'foofoo', '', 'βbβobarZZZZ'], getline(1, 4))
let @- = 'bβb'
call cursor(4, 1)
exe ":norm! R\<C-R>-"
call assert_equal(['ZZZ', 'foofoo', '', 'bβbobarZZZZ'], getline(1, 4))
let @- = 'βbβ'
call cursor(4, 1)
exe ":norm! R\<C-R>-"
call assert_equal(['ZZZ', 'foofoo', '', 'βbβobarZZZZ'], getline(1, 4))
bwipe! bwipe!
endfunc endfunc