diff options
| author | Daniel Zhang <wodesuck@gmail.com> | 2022-10-14 17:12:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 02:12:46 -0700 |
| commit | 81986a7349da7b88abde459194078e9893e8ae8b (patch) | |
| tree | ff0e1bf0d73426fbfa4d2474c3a00242715f4cee /runtime/lua/vim/_editor.lua | |
| parent | 9931db2e3fa43ed02e1b0bc6f167ed5398fa6369 (diff) | |
| download | rneovim-81986a7349da7b88abde459194078e9893e8ae8b.tar.gz rneovim-81986a7349da7b88abde459194078e9893e8ae8b.tar.bz2 rneovim-81986a7349da7b88abde459194078e9893e8ae8b.zip | |
fix(lua): on_yank error with blockwise multibyte region #20162
Prevent out of range error when calling `str_byteindex`.
Use `vim.str_byteindex(bufline, #bufline)` to cacluate utf length of `bufline`.
fix #20161
Diffstat (limited to 'runtime/lua/vim/_editor.lua')
| -rw-r--r-- | runtime/lua/vim/_editor.lua | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua index 28e5897aa9..0f312f19f5 100644 --- a/runtime/lua/vim/_editor.lua +++ b/runtime/lua/vim/_editor.lua @@ -416,11 +416,16 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive) c2 = c1 + regtype:sub(2) -- and adjust for non-ASCII characters bufline = vim.api.nvim_buf_get_lines(bufnr, l, l + 1, true)[1] - if c1 < #bufline then + local utflen = vim.str_utfindex(bufline, #bufline) + if c1 <= utflen then c1 = vim.str_byteindex(bufline, c1) + else + c1 = #bufline + 1 end - if c2 < #bufline then + if c2 <= utflen then c2 = vim.str_byteindex(bufline, c2) + else + c2 = #bufline + 1 end else c1 = (l == pos1[1]) and pos1[2] or 0 |