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

[Christian Brabandt]

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

Commit: https://github.com/vim/vim/commit/ef73374dc3e4bf8104ba31d5b22517f8028b467a
Author: zeertzjq <zeer...@outlook.com>
Date: Sun May 26 18:42:18 2024 +0200

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

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 <zeer...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/evalfunc.c b/src/evalfunc.c
index b389085ed..d53dda457 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -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
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index e1c7cf5f7..95ac9a6a8 100644
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -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')
diff --git a/src/version.c b/src/version.c
index ae37647ac..ac0bda070 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 446,
/**/
445,
/**/