IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2605: Vim9: string index and slice does not include composing chars

Browse Source 
Problem:    Vim9: string index and slice does not include composing chars.
Solution:   Include composing characters. (issue vim/vim#6563)

0289a093a4

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2024-03-23 08:07:13 +08:00
parent e4a23b6e0b
commit d443b438f6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval.c
View File

@ -7519,8 +7519,9 @@ int check_luafunc_name(const char *const str, const bool paren)
return (int)(p - str); return (int)(p - str);
} }
/// Return the character "str[index]" where "index" is the character index. If /// Return the character "str[index]" where "index" is the character index,
/// "index" is out of range NULL is returned. /// including composing characters.
/// If "index" is out of range NULL is returned.
char *char_from_string(const char *str, varnumber_T index) char *char_from_string(const char *str, varnumber_T index)
{ {
varnumber_T nchar = index; varnumber_T nchar = index;
@ -7535,7 +7536,7 @@ char *char_from_string(const char *str, varnumber_T index)
int clen = 0; int clen = 0;
for (size_t nbyte = 0; nbyte < slen; clen++) { for (size_t nbyte = 0; nbyte < slen; clen++) {
nbyte += (size_t)utf_ptr2len(str + nbyte); nbyte += (size_t)utfc_ptr2len(str + nbyte);
} }
nchar = clen + index; nchar = clen + index;
if (nchar < 0) { if (nchar < 0) {
@ -7546,16 +7547,16 @@ char *char_from_string(const char *str, varnumber_T index)
size_t nbyte = 0; size_t nbyte = 0;
for (; nchar > 0 && nbyte < slen; nchar--) { for (; nchar > 0 && nbyte < slen; nchar--) {
nbyte += (size_t)utf_ptr2len(str + nbyte); nbyte += (size_t)utfc_ptr2len(str + nbyte);
} }
if (nbyte >= slen) { if (nbyte >= slen) {
return NULL; return NULL;
} }
return xmemdupz(str + nbyte, (size_t)utf_ptr2len(str + nbyte)); return xmemdupz(str + nbyte, (size_t)utfc_ptr2len(str + nbyte));
} }
/// Get the byte index for character index "idx" in string "str" with length /// Get the byte index for character index "idx" in string "str" with length
/// "str_len". /// "str_len". Composing characters are included.
/// If going over the end return "str_len". /// If going over the end return "str_len".
/// If "idx" is negative count from the end, -1 is the last character. /// If "idx" is negative count from the end, -1 is the last character.
/// When going over the start return -1. /// When going over the start return -1.
@ -7566,7 +7567,7 @@ static ssize_t char_idx2byte(const char *str, size_t str_len, varnumber_T idx)
if (nchar >= 0) { if (nchar >= 0) {
while (nchar > 0 && nbyte < str_len) { while (nchar > 0 && nbyte < str_len) {
nbyte += (size_t)utf_ptr2len(str + nbyte); nbyte += (size_t)utfc_ptr2len(str + nbyte);
nchar--; nchar--;
} }
} else { } else {
@ -7583,7 +7584,8 @@ static ssize_t char_idx2byte(const char *str, size_t str_len, varnumber_T idx)
return (ssize_t)nbyte; return (ssize_t)nbyte;
} }
/// Return the slice "str[first:last]" using character indexes. /// Return the slice "str[first : last]" using character indexes. Composing
/// characters are included.
/// ///
/// @param exclusive true for slice(). /// @param exclusive true for slice().
/// ///
@ -7605,7 +7607,7 @@ char *string_slice(const char *str, varnumber_T first, varnumber_T last, bool ex
end_byte = char_idx2byte(str, slen, last); end_byte = char_idx2byte(str, slen, last);
if (!exclusive && end_byte >= 0 && end_byte < (ssize_t)slen) { if (!exclusive && end_byte >= 0 && end_byte < (ssize_t)slen) {
// end index is inclusive // end index is inclusive
end_byte += utf_ptr2len(str + end_byte); end_byte += utfc_ptr2len(str + end_byte);
} }
} }