aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 9.0.1629: having utf16idx() rounding up is inconvenient

Browse Source 
Problem:    Having utf16idx() rounding up is inconvenient.
Solution:   Make utf16idx() round down. (Yegappan Lakshmanan, closes #12523)
This commit is contained in:
Yegappan Lakshmanan
2023-06-14 13:10:15 +01:00
committed by Bram Moolenaar
parent d5b952a871
commit 95707037af
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/builtin.txt
View File

@@ -10127,8 +10127,8 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
When {charidx} is present and TRUE, {idx} is used as the When {charidx} is present and TRUE, {idx} is used as the
character index in the String {string} instead of as the byte character index in the String {string} instead of as the byte
index. index.
An {idx} in the middle of a UTF-8 sequence is rounded upwards An {idx} in the middle of a UTF-8 sequence is rounded
to the end of that sequence. downwards to the beginning of that sequence.
Returns -1 if the arguments are invalid or if there are less Returns -1 if the arguments are invalid or if there are less
than {idx} bytes in {string}. If there are exactly {idx} bytes than {idx} bytes in {string}. If there are exactly {idx} bytes

8
src/strings.c
View File

@@ -1743,8 +1743,10 @@ f_strtrans(typval_T *argvars, typval_T *rettv)
/* /*
*
* "utf16idx()" function * "utf16idx()" function
*
* Converts a byte or character offset in a string to the corresponding UTF-16
* code unit offset.
*/ */
void void
f_utf16idx(typval_T *argvars, typval_T *rettv) f_utf16idx(typval_T *argvars, typval_T *rettv)
@@ -1780,6 +1782,7 @@ f_utf16idx(typval_T *argvars, typval_T *rettv)
char_u *p; char_u *p;
int len; int len;
int utf16idx = 0;
for (p = str, len = 0; charidx ? idx >= 0 : p <= str + idx; len++) for (p = str, len = 0; charidx ? idx >= 0 : p <= str + idx; len++)
{ {
if (*p == NUL) if (*p == NUL)
@@ -1791,6 +1794,7 @@ f_utf16idx(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = len; rettv->vval.v_number = len;
return; return;
} }
utf16idx = len;
int clen = ptr2len(p); int clen = ptr2len(p);
int c = (clen > 1) ? utf_ptr2char(p) : *p; int c = (clen > 1) ? utf_ptr2char(p) : *p;
if (c > 0xFFFF) if (c > 0xFFFF)
@@ -1800,7 +1804,7 @@ f_utf16idx(typval_T *argvars, typval_T *rettv)
idx--; idx--;
} }
rettv->vval.v_number = len > 0 ? len - 1 : 0; rettv->vval.v_number = utf16idx;
} }
/* /*

20
src/testdir/test_functions.vim
View File

@@ -1518,14 +1518,14 @@ func Test_utf16idx_from_byteidx()
" UTF-16 index of a string with four byte characters " UTF-16 index of a string with four byte characters
let str = 'a😊😊b' let str = 'a😊😊b'
call assert_equal(0, utf16idx(str, 0)) call assert_equal(0, utf16idx(str, 0))
call assert_equal(2, utf16idx(str, 1)) call assert_equal(1, utf16idx(str, 1))
call assert_equal(2, utf16idx(str, 2)) call assert_equal(1, utf16idx(str, 2))
call assert_equal(2, utf16idx(str, 3)) call assert_equal(1, utf16idx(str, 3))
call assert_equal(2, utf16idx(str, 4)) call assert_equal(1, utf16idx(str, 4))
call assert_equal(4, utf16idx(str, 5)) call assert_equal(3, utf16idx(str, 5))
call assert_equal(4, utf16idx(str, 6)) call assert_equal(3, utf16idx(str, 6))
call assert_equal(4, utf16idx(str, 7)) call assert_equal(3, utf16idx(str, 7))
call assert_equal(4, utf16idx(str, 8)) call assert_equal(3, utf16idx(str, 8))
call assert_equal(5, utf16idx(str, 9)) call assert_equal(5, utf16idx(str, 9))
call assert_equal(6, utf16idx(str, 10)) call assert_equal(6, utf16idx(str, 10))
call assert_equal(-1, utf16idx(str, 11)) call assert_equal(-1, utf16idx(str, 11))
@@ -1621,8 +1621,8 @@ func Test_utf16idx_from_charidx()
" UTF-16 index of a string with four byte characters " UTF-16 index of a string with four byte characters
let str = "a😊😊b" let str = "a😊😊b"
call assert_equal(0, utf16idx(str, 0, v:false, v:true)) call assert_equal(0, utf16idx(str, 0, v:false, v:true))
call assert_equal(2, utf16idx(str, 1, v:false, v:true)) call assert_equal(1, utf16idx(str, 1, v:false, v:true))
call assert_equal(4, utf16idx(str, 2, v:false, v:true)) call assert_equal(3, utf16idx(str, 2, v:false, v:true))
call assert_equal(5, utf16idx(str, 3, v:false, v:true)) call assert_equal(5, utf16idx(str, 3, v:false, v:true))
call assert_equal(6, utf16idx(str, 4, v:false, v:true)) call assert_equal(6, utf16idx(str, 4, v:false, v:true))
call assert_equal(-1, utf16idx(str, 5, v:false, v:true)) call assert_equal(-1, utf16idx(str, 5, v:false, v:true))

2
src/version.c
View File

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