IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): avoid ambiguity about chunk that clears part of line (#24982)

Browse Source 
Co-authored-by: bfredl <bjorn.linse@gmail.com>
This commit is contained in:
zeertzjq 2023-09-02 18:50:12 +08:00 committed by GitHub
parent bb1df1221d
commit 0c86828ac5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/api/ui.c
View File

@ -830,6 +830,7 @@ void remote_ui_raw_line(UI *ui, Integer grid, Integer row, Integer startcol, Int
size_t ncells = (size_t)(endcol - startcol); size_t ncells = (size_t)(endcol - startcol);
int last_hl = -1; int last_hl = -1;
uint32_t nelem = 0; uint32_t nelem = 0;
bool was_space = false;
for (size_t i = 0; i < ncells; i++) { for (size_t i = 0; i < ncells; i++) {
repeat++; repeat++;
if (i == ncells - 1 || attrs[i] != attrs[i + 1] if (i == ncells - 1 || attrs[i] != attrs[i + 1]
@ -868,9 +869,12 @@ void remote_ui_raw_line(UI *ui, Integer grid, Integer row, Integer startcol, Int
data->ncells_pending += MIN(repeat, 2); data->ncells_pending += MIN(repeat, 2);
last_hl = attrs[i]; last_hl = attrs[i];
repeat = 0; repeat = 0;
was_space = strequal(chunk[i], " ");
} }
} }
if (endcol < clearcol) { // If the last chunk was all spaces, add a clearing chunk even if there are
// no more cells to clear, so there is no ambiguity about what to clear.
if (endcol < clearcol || was_space) {
nelem++; nelem++;
data->ncells_pending += 1; data->ncells_pending += 1;
mpack_array(buf, 3); mpack_array(buf, 3);

34
test/functional/terminal/tui_spec.lua
View File

@ -27,8 +27,6 @@ local is_os = helpers.is_os
local new_pipename = helpers.new_pipename local new_pipename = helpers.new_pipename
local spawn_argv = helpers.spawn_argv local spawn_argv = helpers.spawn_argv
local set_session = helpers.set_session local set_session = helpers.set_session
local feed = helpers.feed
local eval = helpers.eval
local write_file = helpers.write_file local write_file = helpers.write_file
if helpers.skip(helpers.is_os('win')) then return end if helpers.skip(helpers.is_os('win')) then return end
@ -898,7 +896,7 @@ describe('TUI', function()
feed_data('\022\027[107;33u') -- Meta + k feed_data('\022\027[107;33u') -- Meta + k
feed_data('\022\027[13;41u') -- Super + Meta + Enter feed_data('\022\027[13;41u') -- Super + Meta + Enter
feed_data('\022\027[127;48u') -- Shift + Alt + Ctrl + Super + Meta + Backspace feed_data('\022\027[127;48u') -- Shift + Alt + Ctrl + Super + Meta + Backspace
feed('\n') feed_data('\n')
feed_data('\022\027[57376;9u') -- Super + F13 feed_data('\022\027[57376;9u') -- Super + F13
feed_data('\022\027[57377;33u') -- Meta + F14 feed_data('\022\027[57377;33u') -- Meta + F14
feed_data('\022\027[57378;41u') -- Super + Meta + F15 feed_data('\022\027[57378;41u') -- Super + Meta + F15
@ -1752,7 +1750,7 @@ describe('TUI', function()
| |
{5:-- TERMINAL --} | {5:-- TERMINAL --} |
]]) ]])
feed('i') feed_data('i')
screen:expect([[ screen:expect([[
{1: } | {1: } |
{2:~}{3: }| {2:~}{3: }|
@ -1898,6 +1896,30 @@ describe('TUI', function()
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
end) end)
it('draws line with many trailing spaces correctly #24955', function()
local screen = thelpers.screen_setup(0, '["'..nvim_prog..[[", "-u", "NONE", "-i", "NONE"]]
..[[, "--cmd", "call setline(1, ['1st line' .. repeat(' ', 153), '2nd line'])"]]..']', 80)
screen:expect{grid=[[
{1:1}st line |
|
|
2nd line |
{5:[No Name] [+] 1,1 All}|
|
{3:-- TERMINAL --} |
]]}
feed_data('$')
screen:expect{grid=[[
1st line |
|
{1: } |
2nd line |
{5:[No Name] [+] 1,161 All}|
|
{3:-- TERMINAL --} |
]]}
end)
end) end)
describe('TUI UIEnter/UILeave', function() describe('TUI UIEnter/UILeave', function()
@ -2703,8 +2725,8 @@ describe("TUI as a client", function()
local client_super = spawn_argv(true) local client_super = spawn_argv(true)
set_session(server) set_session(server)
local server_pipe = eval'v:servername' local server_pipe = meths.get_vvar('servername')
feed'iHalloj!<esc>' server:request('nvim_input', 'iHalloj!<Esc>')
set_session(client_super) set_session(client_super)
local screen = thelpers.screen_setup(0, local screen = thelpers.screen_setup(0,