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

fix(redraw): multibyte characters are wrapped at the end of a line (#23696)

Browse Source 
Problem:    Multibyte characters may be wrapped at the end of a line
            when 'statuscolumn' and 'spell' are set.
Solution:   Update line pointerdiff "v" before fetching the line pointer
            after evaluating 'statuscolumn'.
This commit is contained in:
luukvbaal 2023-05-21 13:00:37 +02:00 committed by GitHub
parent 387c8ceb28
commit 60f69014a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/drawline.c
View File

@ -2,7 +2,7 @@
// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
// drawline.c: Functions for drawing window lines on the screen. // drawline.c: Functions for drawing window lines on the screen.
// This is the middle level, drawscreen.c is the top and grid.c/screen.c the lower level. // This is the middle level, drawscreen.c is the top and grid.c the lower level.
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
@ -1594,6 +1594,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
// Draw the 'statuscolumn' if option is set. // Draw the 'statuscolumn' if option is set.
if (statuscol.draw) { if (statuscol.draw) {
if (statuscol.textp == NULL) { if (statuscol.textp == NULL) {
v = (ptr - line);
get_statuscol_str(wp, lnum, wlv.row - startrow - wlv.filler_lines, &statuscol); get_statuscol_str(wp, lnum, wlv.row - startrow - wlv.filler_lines, &statuscol);
if (!end_fill) { if (!end_fill) {
// Get the line again as evaluating 'statuscolumn' may free it. // Get the line again as evaluating 'statuscolumn' may free it.

12
test/functional/ui/statuscolumn_spec.lua
View File

@ -674,4 +674,16 @@ describe('statuscolumn', function()
]]) ]])
eq(2, eval('g:stcnr')) eq(2, eval('g:stcnr'))
end) end)
it('does not wrap multibyte characters at the end of a line', function()
screen:try_resize(33, 4)
command([[set spell stc=%l\ ]])
command('call setline(8, "This is a line that contains ᶏ multibyte character.")')
screen:expect([[
8 ^This is a line that contains ᶏ|
multibyte character. |
9 aaaaa |
|
]])
end)
end) end)