aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -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

8
src/strings.c
View File

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