mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-28 02:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14938 from janlazo/vim-8.2.3072

Browse Source 
vim-patch:8.2.{3072,3075}
This commit is contained in:
Jan Edmund Lazo
2021-06-30 18:46:22 -04:00
committed by GitHub
parent fe10a4e555 b2cc43b454
commit d83bc835b6
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/ops.c
View File

@@ -2719,10 +2719,13 @@ static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
// Copy a block range into a register.
// If "exclude_trailing_space" is set, do not copy trailing whitespaces.
static void yank_copy_line(yankreg_T *reg, const struct block_def *bd,
static void yank_copy_line(yankreg_T *reg, struct block_def *bd,
size_t y_idx, bool exclude_trailing_space)
FUNC_ATTR_NONNULL_ALL
{
if (exclude_trailing_space) {
bd->endspaces = 0;
}
int size = bd->startspaces + bd->endspaces + bd->textlen;
assert(size >= 0);
char_u *pnew = xmallocz((size_t)size);

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

@@ -1,5 +1,8 @@
" Tests for various Visual modes.
source shared.vim
source check.vim
func Test_block_shift_multibyte()
" Uses double-wide character.
split
@@ -1060,5 +1063,24 @@ func Test_visual_put_in_block_using_zy_and_zp()
bwipe!
endfunc
func Test_visual_put_blockedit_zy_and_zp()
new
call setline(1, ['aa', 'bbbbb', 'ccc', '', 'XX', 'GGHHJ', 'RTZU'])
exe "normal! gg0\<c-v>2j$zy"
norm! 5gg0zP
call assert_equal(['aa', 'bbbbb', 'ccc', '', 'aaXX', 'bbbbbGGHHJ', 'cccRTZU'], getline(1, 7))
"
" now with blockmode editing
sil %d
:set ve=block
call setline(1, ['aa', 'bbbbb', 'ccc', '', 'XX', 'GGHHJ', 'RTZU'])
exe "normal! gg0\<c-v>2j$zy"
norm! 5gg0zP
call assert_equal(['aa', 'bbbbb', 'ccc', '', 'aaXX', 'bbbbbGGHHJ', 'cccRTZU'], getline(1, 7))
set ve&vim
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab