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(ui_compositor): only reset skipstart at first column (#24776)

Browse Source 
Problem:    A double-width char in a floating window causes an extra
            space to be drawn to the left of its boundary.
Solution:   Only reset skipstart at the first column.

Fix #24775
This commit is contained in:
zeertzjq 2023-08-18 12:08:18 +08:00 committed by GitHub
parent c54682f75a
commit 71ad771ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/ui_compositor.c
View File

@ -402,7 +402,7 @@ static void compose_line(Integer row, Integer startcol, Integer endcol, LineFlag
if (col == endcol - 1) { if (col == endcol - 1) {
skipend = 0; skipend = 0;
} }
} else if (n > 1 && linebuf[col - startcol + 1][0] == NUL) { } else if (col == startcol && n > 1 && linebuf[1][0] == NUL) {
skipstart = 0; skipstart = 0;
} }

13
test/functional/ui/float_spec.lua
View File

@ -8377,6 +8377,7 @@ describe('float window', function()
# TODO: 测试字典信息的准确性 # TODO: 测试字典信息的准确性
# FIXME: 测试字典信息的准确性]]) # FIXME: 测试字典信息的准确性]])
local buf = meths.create_buf(false,false) local buf = meths.create_buf(false,false)
meths.buf_set_lines(buf, 0, -1, true, {'口', '口'})
local win = meths.open_win(buf, false, {relative='editor', width=5, height=3, row=0, col=11, style='minimal'}) local win = meths.open_win(buf, false, {relative='editor', width=5, height=3, row=0, col=11, style='minimal'})
if multigrid then if multigrid then
screen:expect{grid=[[ screen:expect{grid=[[
@ -8397,15 +8398,15 @@ describe('float window', function()
{0:~ }| {0:~ }|
## grid 3 ## grid 3
| |
## grid 4 ## grid 5
{1:口 }|
{1:口 }|
{1: }| {1: }|
{1: }| ]], float_pos={ [5] = { { id = 1002 }, "NW", 1, 0, 11, true } }}
{1: }|
]], float_pos={ [4] = { { id = 1001 }, "NW", 1, 0, 11, true } }}
else else
screen:expect([[ screen:expect([[
# TODO: 测 {1: }信息的准确性 | # TODO: 测 {1:口 }信息的准确性 |
# FIXME: 测{1: } 信息的准确^性 | # FIXME: 测{1:口 } 信息的准确^性 |
{0:~ }{1: }{0: }| {0:~ }{1: }{0: }|
{0:~ }| {0:~ }|
{0:~ }| {0:~ }|