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(terminal): check terminal size at end of screen update (#25480)

Browse Source
This commit is contained in:
zeertzjq 2023-10-03 10:23:03 +08:00 committed by GitHub
parent 3c76038755
commit e115732465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/drawscreen.c
View File

@ -1519,16 +1519,12 @@ static void win_update(win_T *wp, DecorProviders *providers)
} }
} }
// Force redraw when width of 'number' or 'relativenumber' column const int nrwidth_before = wp->w_nrwidth;
// changes. int nrwidth_new = (wp->w_p_nu || wp->w_p_rnu || *wp->w_p_stc) ? number_width(wp) : 0;
int nrwidth = (wp->w_p_nu || wp->w_p_rnu || *wp->w_p_stc) ? number_width(wp) : 0; // Force redraw when width of 'number' or 'relativenumber' column changes.
if (wp->w_nrwidth != nrwidth) { if (wp->w_nrwidth != nrwidth_new) {
type = UPD_NOT_VALID; type = UPD_NOT_VALID;
wp->w_nrwidth = nrwidth; wp->w_nrwidth = nrwidth_new;
if (buf->terminal) {
terminal_check_size(buf->terminal);
}
} else if (buf->b_mod_set } else if (buf->b_mod_set
&& buf->b_mod_xlines != 0 && buf->b_mod_xlines != 0
&& wp->w_redraw_top != 0) { && wp->w_redraw_top != 0) {
@ -2498,6 +2494,10 @@ static void win_update(win_T *wp, DecorProviders *providers)
} }
} }
if (nrwidth_before != wp->w_nrwidth && buf->terminal) {
terminal_check_size(buf->terminal);
}
// restore got_int, unless CTRL-C was hit while redrawing // restore got_int, unless CTRL-C was hit while redrawing
if (!got_int) { if (!got_int) {
got_int = save_got_int; got_int = save_got_int;

41
test/functional/terminal/window_spec.lua
View File

@ -44,7 +44,7 @@ describe(':terminal window', function()
{7:6 } | {7:6 } |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
feed_data({'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}) feed_data('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
screen:expect([[ screen:expect([[
{7:1 }tty ready | {7:1 }tty ready |
{7:2 }rows: 6, cols: 48 | {7:2 }rows: 6, cols: 48 |
@ -55,8 +55,6 @@ describe(':terminal window', function()
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
skip(is_os('win'), 'win: :terminal resize is unreliable #7007')
-- numberwidth=9 -- numberwidth=9
feed([[<C-\><C-N>]]) feed([[<C-\><C-N>]])
feed([[:set numberwidth=9 number<CR>i]]) feed([[:set numberwidth=9 number<CR>i]])
@ -69,7 +67,7 @@ describe(':terminal window', function()
{7: 6 } | {7: 6 } |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
feed_data({' abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}) feed_data(' abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
screen:expect([[ screen:expect([[
{7: 1 }tty ready | {7: 1 }tty ready |
{7: 2 }rows: 6, cols: 48 | {7: 2 }rows: 6, cols: 48 |
@ -82,6 +80,41 @@ describe(':terminal window', function()
end) end)
end) end)
describe("with 'statuscolumn'", function()
it('wraps text', function()
command([[set number statuscolumn=++%l\ \ ]])
screen:expect([[
{7:++1 }tty ready |
{7:++2 }rows: 6, cols: 45 |
{7:++3 }{1: } |
{7:++4 } |
{7:++5 } |
{7:++6 } |
{3:-- TERMINAL --} |
]])
feed_data('\n\n\n\n\nabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
screen:expect([[
{7:++4 } |
{7:++5 } |
{7:++6 } |
{7:++7 } |
{7:++8 }abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS|
{7:++9 }TUVWXYZ{1: } |
{3:-- TERMINAL --} |
]])
feed_data('\nabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
screen:expect([[
{7:++7 } |
{7:++8 }abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQR|
{7:++9 }STUVWXYZ |
{7:++10 }abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQR|
{7:++11 }STUVWXYZrows: 6, cols: 44 |
{7:++12 }{1: } |
{3:-- TERMINAL --} |
]])
end)
end)
describe("with 'colorcolumn'", function() describe("with 'colorcolumn'", function()
before_each(function() before_each(function()
feed([[<C-\><C-N>]]) feed([[<C-\><C-N>]])