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:8.0.1779: deleting in a block selection causes problems (#9099)

Browse Source 
Problem:    Deleting in a block selection causes problems.
Solution:   Check the length of the line before adding bd.textcol and
            bd.textlen. (Christian Brabandt, closes vim/vim#2825)
35e802e713
This commit is contained in:
Jan Edmund Lazo 2018-10-09 03:04:51 -04:00 committed by Justin M. Keyes
parent 85e8fd96f4
commit 2c680a5854
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/ops.c
View File

@ -2159,9 +2159,17 @@ void op_insert(oparg_T *oap, long count1)
* Subsequent calls to ml_get() flush the firstline data - take a
* copy of the required string.
*/
firstline = ml_get(oap->start.lnum) + bd.textcol;
if (oap->op_type == OP_APPEND)
firstline += bd.textlen;
firstline = ml_get(oap->start.lnum);
const size_t len = STRLEN(firstline);
colnr_T add = bd.textcol;
if (oap->op_type == OP_APPEND) {
add += bd.textlen;
}
if ((size_t)add > len) {
firstline += len; // short line, point to the NUL
} else {
firstline += add;
}
ins_len = (long)STRLEN(firstline) - pre_textlen;
if (pre_textlen >= 0 && ins_len > 0) {
ins_text = vim_strnsave(firstline, (size_t)ins_len);

13
src/nvim/testdir/test_blockedit.vim
View File

@ -16,5 +16,18 @@ func Test_blockinsert_indent()
bwipe!
endfunc
func Test_blockinsert_delete()
new
let _bs = &bs
set bs=2
call setline(1, ['case Arg is ', ' when Name_Async,', ' when Name_Num_Gangs,', 'end if;'])
exe "norm! ggjVj\<c-v>$o$A\<bs>\<esc>"
"call feedkeys("Vj\<c-v>$o$A\<bs>\<esc>", 'ti')
call assert_equal(["case Arg is ", " when Name_Async", " when Name_Num_Gangs,", "end if;"],
\ getline(1,'$'))
" reset to sane state
let &bs = _bs
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab