diff options
author | zeertzjq <zeertzjq@outlook.com> | 2024-03-23 08:01:43 +0800 |
---|---|---|
committer | zeertzjq <zeertzjq@outlook.com> | 2024-03-23 08:07:05 +0800 |
commit | e4a23b6e0b4f68c284b9cc479df842f934b5ac05 (patch) | |
tree | 2b1fcff2f319e14392bf40b0b29c270cfc99d5f2 /src/nvim/eval.c | |
parent | a44ac26c752028d50eaff5d39fadb8115c2ddaa9 (diff) | |
download | rneovim-e4a23b6e0b4f68c284b9cc479df842f934b5ac05.tar.gz rneovim-e4a23b6e0b4f68c284b9cc479df842f934b5ac05.tar.bz2 rneovim-e4a23b6e0b4f68c284b9cc479df842f934b5ac05.zip |
vim-patch:8.2.2318: Vim9: string and list index work differently
Problem: Vim9: string and list index work differently.
Solution: Make string index work like list index. (closes vim/vim#7643)
https://github.com/vim/vim/commit/e7525c552060dd04aacdbca6bb5fe6460cf4da60
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r-- | src/nvim/eval.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f5f9c4f77b..206ff93dfe 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -7523,16 +7523,30 @@ int check_luafunc_name(const char *const str, const bool paren) /// "index" is out of range NULL is returned. char *char_from_string(const char *str, varnumber_T index) { - size_t nbyte = 0; varnumber_T nchar = index; - if (str == NULL || index < 0) { + if (str == NULL) { return NULL; } size_t slen = strlen(str); - while (nchar > 0 && nbyte < slen) { + + // do the same as for a list: a negative index counts from the end + if (index < 0) { + int clen = 0; + + for (size_t nbyte = 0; nbyte < slen; clen++) { + nbyte += (size_t)utf_ptr2len(str + nbyte); + } + nchar = clen + index; + if (nchar < 0) { + // unlike list: index out of range results in empty string + return NULL; + } + } + + size_t nbyte = 0; + for (; nchar > 0 && nbyte < slen; nchar--) { nbyte += (size_t)utf_ptr2len(str + nbyte); - nchar--; } if (nbyte >= slen) { return NULL; |