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

Merge pull request #10913 from bfredl/nomsgsep

Browse Source 
screen: fixes for `set display-=msgsep`, fixes #10912
This commit is contained in:
Björn Linse 2019-09-02 13:32:25 +02:00 committed by GitHub
commit cb339ca0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/message.c
View File

@ -154,8 +154,8 @@ void msg_grid_validate(void)
{ {
grid_assign_handle(&msg_grid); grid_assign_handle(&msg_grid);
bool should_alloc = msg_dothrottle(); bool should_alloc = msg_dothrottle();
if (msg_grid.Rows != Rows || msg_grid.Columns != Columns if (should_alloc && (msg_grid.Rows != Rows || msg_grid.Columns != Columns
|| (should_alloc && !msg_grid.chars)) { || !msg_grid.chars)) {
// TODO(bfredl): eventually should be set to "invalid". I e all callers // TODO(bfredl): eventually should be set to "invalid". I e all callers
// will use the grid including clear to EOS if necessary. // will use the grid including clear to EOS if necessary.
grid_alloc(&msg_grid, Rows, Columns, false, true); grid_alloc(&msg_grid, Rows, Columns, false, true);

6
src/nvim/screen.c
View File

@ -404,7 +404,7 @@ int update_screen(int type)
default_grid.valid = true; default_grid.valid = true;
} }
if (type == NOT_VALID && msg_dothrottle()) { if (type == NOT_VALID && (msg_dothrottle() || msg_grid.chars)) {
grid_fill(&default_grid, Rows-p_ch, Rows, 0, Columns, ' ', ' ', 0); grid_fill(&default_grid, Rows-p_ch, Rows, 0, Columns, ' ', ' ', 0);
} }
@ -7288,9 +7288,9 @@ void screen_resize(int width, int height)
} }
} }
} }
ui_flush();
} }
ui_flush(); busy--;
--busy;
} }
/// Check if the new Nvim application "shell" dimensions are valid. /// Check if the new Nvim application "shell" dimensions are valid.

14
test/functional/ui/embed_spec.lua
View File

@ -81,6 +81,20 @@ local function test_embed(ext_linegrid)
eq(Screen.colors.Green, screen.default_colors.rgb_bg) eq(Screen.colors.Green, screen.default_colors.rgb_bg)
end} end}
end) end)
it("set display-=msgsep before first redraw", function()
startup('--cmd', 'set display-=msgsep')
screen:expect{grid=[[
^ |
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
{3:~ }|
|
]]}
end)
end end
describe('--embed UI on startup (ext_linegrid=true)', function() test_embed(true) end) describe('--embed UI on startup (ext_linegrid=true)', function() test_embed(true) end)