kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor(multibyte): neo-casefolding without allocation

Browse Source 
fixes #30400
This commit is contained in:
bfredl 2024-09-16 19:28:37 +02:00
parent 69553f7bf5
commit 2dfa6f6033
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/mbyte.c
View File

@ -1379,22 +1379,11 @@ int utf_fold(int a)
return a;
}
utf8proc_uint8_t input_str[16] = { 0 };
if (utf8proc_encode_char(a, input_str) <= 0) {
return a;
}
utf8proc_int32_t result[1];
utf8proc_uint8_t *fold_str_utf;
if (utf8proc_map((utf8proc_uint8_t *)input_str, 0, &fold_str_utf,
UTF8PROC_NULLTERM | UTF8PROC_CASEFOLD) < 0) {
return a;
}
utf8proc_ssize_t res = utf8proc_decompose_char(a, result, 1, UTF8PROC_CASEFOLD, NULL);
int fold_codepoint_utf = utf_ptr2char((char *)fold_str_utf);
xfree(fold_str_utf);
return fold_codepoint_utf;
return (res == 1) ? result[0] : a;
}
// Vim's own character class functions. These exist because many library

6
test/unit/mbyte_spec.lua
View File

@ -351,6 +351,12 @@ describe('mbyte', function()
describe('utf_fold', function()
itp('does not crash with surrogates #30527', function()
eq(0xDDFB, lib.utf_fold(0xDDFB))
eq(0xd800, lib.utf_fold(0xd800)) -- high surrogate, invalid as a character
end)
itp("doesn't crash on invalid codepoints", function()
eq(9000000, lib.utf_fold(9000000))
eq(0, lib.utf_fold(0))
end)
end)
end)