patch 9.0.1629: having utf16idx() rounding up is inconvenient
Problem: Having utf16idx() rounding up is inconvenient.
Solution: Make utf16idx() round down. (Yegappan Lakshmanan, closes #12523)
diff --git a/src/strings.c b/src/strings.c
index 9e2c331..e3be335 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1743,8 +1743,10 @@
/*
- *
* "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 @@
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 @@
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 @@
idx--;
}
- rettv->vval.v_number = len > 0 ? len - 1 : 0;
+ rettv->vval.v_number = utf16idx;
}
/*