kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17402 from seandewar/vim-8.2.4120

Browse Source 
vim-patch:8.2.{3073,4120,4151,4152}
This commit is contained in:
Sean Dewar 2022-02-15 00:30:05 +00:00 committed by GitHub
commit edc5554fc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 241 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/nvim/ops.c
View File

@ -568,21 +568,18 @@ static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def
}
if (spaces > 0) {
int off;
// Avoid starting halfway through a multi-byte character.
if (b_insert) {
off = utf_head_off(oldp, oldp + offset + spaces);
} else {
off = mb_off_next(oldp, oldp + offset);
offset += off;
}
spaces -= off;
count -= off;
// avoid copying part of a multi-byte character
offset -= utf_head_off(oldp, oldp + offset);
}
if (spaces < 0) { // can happen when the cursor was moved
spaces = 0;
}
assert(count >= 0);
newp = (char_u *)xmalloc(STRLEN(oldp) + s_len + (size_t)count + 1);
// Make sure the allocated size matches what is actually copied below.
newp = xmalloc(STRLEN(oldp) + (size_t)spaces + s_len
+ (spaces > 0 && !bdp->is_short ? (size_t)p_ts - (size_t)spaces : 0)
+ (size_t)count + 1);
// copy up to shifted part
memmove(newp, oldp, (size_t)offset);
@ -597,14 +594,19 @@ static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def
offset += (int)s_len;
int skipped = 0;
if (spaces && !bdp->is_short) {
// insert post-padding
memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces));
// We're splitting a TAB, don't copy it.
oldp++;
// We allowed for that TAB, remember this now
count++;
skipped = 1;
if (spaces > 0 && !bdp->is_short) {
if (*oldp == TAB) {
// insert post-padding
memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces));
// We're splitting a TAB, don't copy it.
oldp++;
// We allowed for that TAB, remember this now
count++;
skipped = 1;
} else {
// Not a TAB, no extra spaces
count = spaces;
}
}
if (spaces > 0) {
@ -2278,6 +2280,7 @@ void op_insert(oparg_T *oap, long count1)
}
t1 = oap->start;
const pos_T start_insert = curwin->w_cursor;
(void)edit(NUL, false, (linenr_T)count1);
// When a tab was inserted, and the characters in front of the tab
@ -2315,26 +2318,30 @@ void op_insert(oparg_T *oap, long count1)
if (oap->start.lnum == curbuf->b_op_start_orig.lnum
&& !bd.is_MAX
&& !did_indent) {
if (oap->op_type == OP_INSERT
&& oap->start.col + oap->start.coladd
!= curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
int t = getviscol2(curbuf->b_op_start_orig.col,
curbuf->b_op_start_orig.coladd);
oap->start.col = curbuf->b_op_start_orig.col;
pre_textlen -= t - oap->start_vcol;
oap->start_vcol = t;
} else if (oap->op_type == OP_APPEND
&& oap->end.col + oap->end.coladd
>= curbuf->b_op_start_orig.col
+ curbuf->b_op_start_orig.coladd) {
int t = getviscol2(curbuf->b_op_start_orig.col,
curbuf->b_op_start_orig.coladd);
oap->start.col = curbuf->b_op_start_orig.col;
const int t = getviscol2(curbuf->b_op_start_orig.col, curbuf->b_op_start_orig.coladd);
if (!bd.is_MAX) {
if (oap->op_type == OP_INSERT
&& oap->start.col + oap->start.coladd
!= curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
oap->start.col = curbuf->b_op_start_orig.col;
pre_textlen -= t - oap->start_vcol;
oap->start_vcol = t;
} else if (oap->op_type == OP_APPEND
&& oap->start.col + oap->start.coladd
>= curbuf->b_op_start_orig.col
+ curbuf->b_op_start_orig.coladd) {
oap->start.col = curbuf->b_op_start_orig.col;
// reset pre_textlen to the value of OP_INSERT
pre_textlen += bd.textlen;
pre_textlen -= t - oap->start_vcol;
oap->start_vcol = t;
oap->op_type = OP_INSERT;
}
} else if (bd.is_MAX && oap->op_type == OP_APPEND) {
// reset pre_textlen to the value of OP_INSERT
pre_textlen += bd.textlen;
pre_textlen -= t - oap->start_vcol;
oap->start_vcol = t;
oap->op_type = OP_INSERT;
}
}
@ -2376,15 +2383,27 @@ void op_insert(oparg_T *oap, long count1)
firstline = ml_get(oap->start.lnum);
const size_t len = STRLEN(firstline);
colnr_T add = bd.textcol;
colnr_T offset = 0; // offset when cursor was moved in insert mode
if (oap->op_type == OP_APPEND) {
add += bd.textlen;
// account for pressing cursor in insert mode when '$' was used
if (bd.is_MAX && start_insert.lnum == Insstart.lnum && start_insert.col > Insstart.col) {
offset = start_insert.col - Insstart.col;
add -= offset;
if (oap->end_vcol > offset) {
oap->end_vcol -= offset + 1;
} else {
// moved outside of the visual block, what to do?
return;
}
}
}
if ((size_t)add > len) {
firstline += len; // short line, point to the NUL
} else {
firstline += add;
}
ins_len = (long)STRLEN(firstline) - pre_textlen;
ins_len = (long)STRLEN(firstline) - pre_textlen - offset;
if (pre_textlen >= 0 && ins_len > 0) {
ins_text = vim_strnsave(firstline, (size_t)ins_len);
// block handled here

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

@ -81,4 +81,52 @@ func Test_blockinsert_delete()
bwipe!
endfunc
func Test_blockappend_eol_cursor()
new
" Test 1 Move 1 char left
call setline(1, ['aaa', 'bbb', 'ccc'])
exe "norm! gg$\<c-v>2jA\<left>x\<esc>"
call assert_equal(['aaxa', 'bbxb', 'ccxc'], getline(1, '$'))
" Test 2 Move 2 chars left
sil %d
call setline(1, ['aaa', 'bbb', 'ccc'])
exe "norm! gg$\<c-v>2jA\<left>\<left>x\<esc>"
call assert_equal(['axaa', 'bxbb', 'cxcc'], getline(1, '$'))
" Test 3 Move 3 chars left (outside of the visual selection)
sil %d
call setline(1, ['aaa', 'bbb', 'ccc'])
exe "norm! ggl$\<c-v>2jA\<left>\<left>\<left>x\<esc>"
call assert_equal(['xaaa', 'bbb', 'ccc'], getline(1, '$'))
bw!
endfunc
func Test_blockappend_eol_cursor2()
new
" Test 1 Move 1 char left
call setline(1, ['aaaaa', 'bbb', 'ccccc'])
exe "norm! gg\<c-v>$2jA\<left>x\<esc>"
call assert_equal(['aaaaxa', 'bbbx', 'ccccxc'], getline(1, '$'))
" Test 2 Move 2 chars left
sil %d
call setline(1, ['aaaaa', 'bbb', 'ccccc'])
exe "norm! gg\<c-v>$2jA\<left>\<left>x\<esc>"
call assert_equal(['aaaxaa', 'bbbx', 'cccxcc'], getline(1, '$'))
" Test 3 Move 3 chars left (to the beginning of the visual selection)
sil %d
call setline(1, ['aaaaa', 'bbb', 'ccccc'])
exe "norm! gg\<c-v>$2jA\<left>\<left>\<left>x\<esc>"
call assert_equal(['aaxaaa', 'bbxb', 'ccxccc'], getline(1, '$'))
" Test 4 Move 3 chars left (outside of the visual selection)
sil %d
call setline(1, ['aaaaa', 'bbb', 'ccccc'])
exe "norm! ggl\<c-v>$2jA\<left>\<left>\<left>x\<esc>"
call assert_equal(['aaxaaa', 'bbxb', 'ccxccc'], getline(1, '$'))
" Test 5 Move 4 chars left (outside of the visual selection)
sil %d
call setline(1, ['aaaaa', 'bbb', 'ccccc'])
exe "norm! ggl\<c-v>$2jA\<left>\<left>\<left>\<left>x\<esc>"
call assert_equal(['axaaaa', 'bxbb', 'cxcccc'], getline(1, '$'))
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/nvim/testdir/test_utf8.vim
View File

@ -8,7 +8,7 @@ func Test_visual_block_insert()
new
call setline(1, ["aaa", "あああ", "bbb"])
exe ":norm! gg0l\<C-V>jjIx\<Esc>"
call assert_equal(['axaa', 'xあああ', 'bxbb'], getline(1, '$'))
call assert_equal(['axaa', ' xあああ', 'bxbb'], getline(1, '$'))
bwipeout!
endfunc

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

@ -59,7 +59,7 @@ endfunc
" Test for visual block shift and tab characters.
func Test_block_shift_tab()
enew!
new
call append(0, repeat(['one two three'], 5))
call cursor(1,1)
exe "normal i\<C-G>u"
@ -68,7 +68,7 @@ func Test_block_shift_tab()
call assert_equal('on1 two three', getline(2))
call assert_equal('on1 two three', getline(5))
enew!
%d _
call append(0, repeat(['abcdefghijklmnopqrstuvwxyz'], 5))
call cursor(1,1)
exe "normal \<C-V>4jI \<Esc>j<<11|D"
@ -93,12 +93,26 @@ func Test_block_shift_tab()
call assert_equal(" abc\<Tab>\<Tab>defghijklmnopqrstuvwxyz", getline(4))
call assert_equal(" abc\<Tab> defghijklmnopqrstuvwxyz", getline(5))
enew!
" Test for block shift with space characters at the beginning and with
" 'noexpandtab' and 'expandtab'
%d _
call setline(1, [" 1", " 2", " 3"])
setlocal shiftwidth=2 noexpandtab
exe "normal gg\<C-V>3j>"
call assert_equal(["\t1", "\t2", "\t3"], getline(1, '$'))
%d _
call setline(1, [" 1", " 2", " 3"])
setlocal shiftwidth=2 expandtab
exe "normal gg\<C-V>3j>"
call assert_equal([" 1", " 2", " 3"], getline(1, '$'))
setlocal shiftwidth&
bw!
endfunc
" Tests Blockwise Visual when there are TABs before the text.
func Test_blockwise_visual()
enew!
new
call append(0, ['123456',
\ '234567',
\ '345678',
@ -120,26 +134,31 @@ func Test_blockwise_visual()
\ "\t\tsomext",
\ "\t\ttesext"], getline(1, 7))
enew!
bw!
endfunc
" Test swapping corners in blockwise visual mode with o and O
func Test_blockwise_visual_o_O()
enew!
new
exe "norm! 10i.\<Esc>Y4P3lj\<C-V>4l2jr "
exe "norm! gvO\<Esc>ra"
exe "norm! gvO\<Esc>rb"
exe "norm! gvo\<C-c>rc"
exe "norm! gvO\<C-c>rd"
set selection=exclusive
exe "norm! gvOo\<C-c>re"
call assert_equal('...a be.', getline(4))
exe "norm! gvOO\<C-c>rf"
set selection&
call assert_equal(['..........',
\ '...c d..',
\ '... ..',
\ '...a b..',
\ '...a bf.',
\ '..........'], getline(1, '$'))
enew!
bw!
endfun
" Test Virtual replace mode.
@ -268,7 +287,6 @@ func Test_visual_mode_reset()
" thus preventing the problem:
exe "normal! GV:call TriggerTheProblem()\<CR>"
call assert_equal("Everything's fine.", g:msg)
endfunc
func Test_Visual_word_textobject()
@ -435,15 +453,13 @@ endfunc
" Test for 'p'ut in visual block mode
func Test_visual_block_put()
enew
new
call append(0, ['One', 'Two', 'Three'])
normal gg
yank
call feedkeys("jl\<C-V>ljp", 'xt')
call assert_equal(['One', 'T', 'Tee', 'One', ''], getline(1, '$'))
enew!
bw!
endfunc
func Test_visual_put_in_block()
@ -623,6 +639,12 @@ func Test_characterwise_visual_mode()
normal Gkvj$d
call assert_equal(['', 'a', ''], getline(1, '$'))
" characterwise visual mode: replace a single character line and the eol
%d _
call setline(1, "a")
normal v$rx
call assert_equal(['x'], getline(1, '$'))
bwipe!
endfunc
@ -658,6 +680,16 @@ func Test_characterwise_select_mode()
exe "normal Gkgh\<Down>\<End>\<Del>"
call assert_equal(['', 'a', ''], getline(1, '$'))
" CTRL-H in select mode behaves like 'x'
call setline(1, 'abcdef')
exe "normal! gggh\<Right>\<Right>\<Right>\<C-H>"
call assert_equal('ef', getline(1))
" CTRL-O in select mode switches to visual mode for one command
call setline(1, 'abcdef')
exe "normal! gggh\<C-O>3lm"
call assert_equal('mef', getline(1))
sunmap <lt>End>
sunmap <lt>Down>
sunmap <lt>Del>
@ -757,8 +789,7 @@ endfunc
func Test_visual_block_mode()
new
call append(0, '')
call setline(1, ['abcdefghijklm', 'abcdefghijklm', 'abcdefghijklm',
\ 'abcdefghijklm', 'abcdefghijklm'])
call setline(1, repeat(['abcdefghijklm'], 5))
call cursor(1, 1)
" Test shift-right of a block
@ -777,6 +808,76 @@ func Test_visual_block_mode()
\ 'axyzqqqqefgmnoklm',
\ 'abcdqqqqijklm'], getline(1, 5))
" Test 'C' to change till the end of the line
call cursor(3, 4)
exe "normal! \<C-V>j3lCooo"
call assert_equal(['axyooo', 'axyooo'], getline(3, 4))
" Test 'D' to delete till the end of the line
call cursor(3, 3)
exe "normal! \<C-V>j2lD"
call assert_equal(['ax', 'ax'], getline(3, 4))
" Test block insert with a short line that ends before the block
%d _
call setline(1, [" one", "a", " two"])
exe "normal gg\<C-V>2jIx"
call assert_equal([" xone", "a", " xtwo"], getline(1, '$'))
" Test block append at EOL with '$' and without '$'
%d _
call setline(1, ["one", "a", "two"])
exe "normal gg$\<C-V>2jAx"
call assert_equal(["onex", "ax", "twox"], getline(1, '$'))
%d _
call setline(1, ["one", "a", "two"])
exe "normal gg3l\<C-V>2jAx"
call assert_equal(["onex", "a x", "twox"], getline(1, '$'))
" Test block replace with an empty line in the middle and use $ to jump to
" the end of the line.
%d _
call setline(1, ['one', '', 'two'])
exe "normal gg$\<C-V>2jrx"
call assert_equal(["onx", "", "twx"], getline(1, '$'))
" Test block replace with an empty line in the middle and move cursor to the
" end of the line
%d _
call setline(1, ['one', '', 'two'])
exe "normal gg2l\<C-V>2jrx"
call assert_equal(["onx", "", "twx"], getline(1, '$'))
" Replace odd number of characters with a multibyte character
%d _
call setline(1, ['abcd', 'efgh'])
exe "normal ggl\<C-V>2ljr\u1100"
call assert_equal(["a\u1100 ", "e\u1100 "], getline(1, '$'))
" During visual block append, if the cursor moved outside of the selected
" range, then the edit should not be applied to the block.
%d _
call setline(1, ['aaa', 'bbb', 'ccc'])
exe "normal 2G\<C-V>jAx\<Up>"
call assert_equal(['aaa', 'bxbb', 'ccc'], getline(1, '$'))
" During visual block append, if the cursor is moved before the start of the
" block, then the new text should be appended there.
%d _
call setline(1, ['aaa', 'bbb', 'ccc'])
exe "normal $\<C-V>2jA\<Left>x"
call assert_equal(['aaxa', 'bbxb', 'ccxc'], getline(1, '$'))
" Repeat the previous test but use 'l' to move the cursor instead of '$'
call setline(1, ['aaa', 'bbb', 'ccc'])
exe "normal! gg2l\<C-V>2jA\<Left>x"
call assert_equal(['aaxa', 'bbxb', 'ccxc'], getline(1, '$'))
" Change a characterwise motion to a blockwise motion using CTRL-V
%d _
call setline(1, ['123', '456', '789'])
exe "normal ld\<C-V>j"
call assert_equal(['13', '46', '789'], getline(1, '$'))
" Test from ':help v_b_I_example'
%d _
setlocal tabstop=8 shiftwidth=4
@ -1141,6 +1242,15 @@ func Test_visual_block_ctrl_w_f()
au! BufNew
endfunc
func Test_visual_block_append_invalid_char()
" this was going over the end of the line
new
call setline(1, [' let xxx', 'xxxxxˆ', 'xxxxxxxxxxx'])
exe "normal 0\<C-V>jjA-\<Esc>"
call assert_equal([' - let xxx', 'xxxxx -ˆ', 'xxxxxxxx-xxx'], getline(1, 3))
bwipe!
endfunc
func Test_visual_reselect_with_count()
" this was causing an illegal memory access
let lines =<< trim END
@ -1161,6 +1271,15 @@ func Test_visual_reselect_with_count()
call delete('XvisualReselect')
endfunc
func Test_visual_block_insert_round_off()
new
" The number of characters are tuned to fill a 4096 byte allocated block,
" so that valgrind reports going over the end.
call setline(1, ['xxxxx', repeat('0', 1350), "\t", repeat('x', 60)])
exe "normal gg0\<C-V>GI" .. repeat('0', 1320) .. "\<Esc>"
bwipe!
endfunc
" this was leaving the end of the Visual area beyond the end of a line
func Test_visual_ex_copy_line()
new

2
test/functional/legacy/utf8_spec.lua
View File

@ -28,7 +28,7 @@ describe('utf8', function()
expect([[
start:
axaa
xあああ
xあああ
bxbb]])
end)