GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0446: getregionpos() inconsistent for partly-selected multibyte char

Browse Source 
Problem:  getregionpos() behaves inconsistently for a partly-selected
          multibyte char.
Solution: Always use column of the first byte for a partly-selected
          multibyte char (zeertzjq).

closes: #14851

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-05-26 18:42:18 +02:00
committed by Christian Brabandt
parent 86071925ed
commit ef73374dc3
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/evalfunc.c
View File

@ -5788,6 +5788,7 @@ f_getregionpos(typval_T *argvars, typval_T *rettv)
for (lnum = p1.lnum; lnum <= p2.lnum; lnum++)
{
pos_T ret_p1, ret_p2;
char_u *line = ml_get(lnum);
colnr_T line_len = ml_get_len(lnum);
if (region_type == MLINE)
@ -5810,7 +5811,7 @@ f_getregionpos(typval_T *argvars, typval_T *rettv)
{
if (region_type == MBLOCK)
{
ret_p1.col = bd.textcol;
ret_p1.col = mb_prevptr(line, bd.textstart) - line + 1;
ret_p1.coladd = bd.start_char_vcols
- (bd.start_vcol - oa.start_vcol);
}
@ -5829,7 +5830,7 @@ f_getregionpos(typval_T *argvars, typval_T *rettv)
}
else if (bd.startspaces > 0)
{
ret_p1.col = bd.textcol;
ret_p1.col = mb_prevptr(line, bd.textstart) - line + 1;
ret_p1.coladd = bd.start_char_vcols - bd.startspaces;
}
else

26
src/testdir/test_visual.vim
View File

@ -2073,10 +2073,12 @@ func Test_visual_getregion()
\ getregion(getpos('v'), getpos('.'), {'type': "\<C-v>" }))
call assert_equal([
\ [[bufnr('%'), 1, 5, 0], [bufnr('%'), 1, 5, 0]],
\ [[bufnr('%'), 2, 10, 1], [bufnr('%'), 2, 10, 2]],
\ [[bufnr('%'), 2, 7, 1], [bufnr('%'), 2, 7, 2]],
\ [[bufnr('%'), 3, 5, 0], [bufnr('%'), 3, 5, 0]],
\ ],
\ getregionpos(getpos('v'), getpos('.'), {'type': "\<C-v>" }))
call assert_equal(['efghijk«', '🇦«🇧«🇨«🇩', '12345'],
\ getregion(getpos('v'), getpos('.'), {'type': 'v' }))
call assert_equal([
\ [[bufnr('%'), 1, 5, 0], [bufnr('%'), 1, 13, 0]],
\ [[bufnr('%'), 2, 1, 0], [bufnr('%'), 2, 22, 0]],
@ -2084,6 +2086,28 @@ func Test_visual_getregion()
\ ],
\ getregionpos(getpos('v'), getpos('.'), {'type': 'v' }))
call cursor(1, 5)
call feedkeys("\<Esc>\<C-v>5l2j", 'xt')
call assert_equal(['efghij', ' «🇨« ', '567890'],
\ getregion(getpos('v'), getpos('.'), {'type': "\<C-v>" }))
call assert_equal([
\ [[bufnr('%'), 1, 5, 0], [bufnr('%'), 1, 10, 0]],
\ [[bufnr('%'), 2, 7, 1], [bufnr('%'), 2, 19, 1]],
\ [[bufnr('%'), 3, 5, 0], [bufnr('%'), 3, 10, 0]],
\ ],
\ getregionpos(getpos('v'), getpos('.'), {'type': "\<C-v>" }))
call cursor(1, 4)
call feedkeys("\<Esc>\<C-v>02j", 'xt')
call assert_equal(['abcd', '🇦« ', '1234'],
\ getregion(getpos('v'), getpos('.'), {'type': "\<C-v>" }))
call assert_equal([
\ [[bufnr('%'), 1, 1, 0], [bufnr('%'), 1, 4, 0]],
\ [[bufnr('%'), 2, 1, 0], [bufnr('%'), 2, 7, 1]],
\ [[bufnr('%'), 3, 1, 0], [bufnr('%'), 3, 4, 0]],
\ ],
\ getregionpos(getpos('v'), getpos('.'), {'type': "\<C-v>" }))
#" characterwise selection with multibyte chars
call cursor(1, 1)
call feedkeys("\<Esc>vj", 'xt')

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
446,
/**/
445,
/**/