GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): check size when switching buffers

Browse Source 
Problem: terminal not always resized when switching to its buffer.
Solution: add missing calls to terminal_check_size.

Adjust screen test for v0.11.
(cherry picked from commit e56292071a)
This commit is contained in:
Sean Dewar
2025-05-08 18:50:47 +01:00
committed by github-actions[bot]
parent fd8e0ae62d
commit 8daffd0cbb
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/buffer.c
View File

@ -1772,6 +1772,10 @@ void enter_buffer(buf_T *buf)
}
curbuf->b_last_used = time(NULL);
if (curbuf->terminal != NULL) {
terminal_check_size(curbuf->terminal);
}
redraw_later(curwin, UPD_NOT_VALID);
}

3
src/nvim/ex_cmds.c
View File

@ -2726,6 +2726,9 @@ theend:
if (bufref_valid(&old_curbuf) && old_curbuf.br_buf->terminal != NULL) {
terminal_check_size(old_curbuf.br_buf->terminal);
}
if ((!bufref_valid(&old_curbuf) || curbuf != old_curbuf.br_buf) && curbuf->terminal != NULL) {
terminal_check_size(curbuf->terminal);
}
if (did_inc_redrawing_disabled) {
RedrawingDisabled--;

21
test/functional/terminal/buffer_spec.lua
View File

@ -322,6 +322,27 @@ describe(':terminal buffer', function()
eq({ mode = 'nt', blocking = false }, api.nvim_get_mode())
command('bd!')
end)
it('correct size when switching buffers', function()
local term_buf = api.nvim_get_current_buf()
command('file foo | enew | vsplit')
api.nvim_set_current_buf(term_buf)
screen:expect([[
tty ready │ |
^rows: 5, cols: 25 │{4:~ }|
│{4:~ }|*3
{17:foo }{1:[No Name] }|
|
]])
feed('<C-^><C-W><C-O><C-^>')
screen:expect([[
tty ready |
^rows: 5, cols: 25 |
rows: 6, cols: 50 |
|*4
]])
end)
end)
describe(':terminal buffer', function()