mirror of
https://github.com/neovim/neovim.git
synced 2026-04-25 16:54:12 +00:00
:terminal : fix crash on resize (#7547)
closes #7538 Fix wrong window references from #7440 Remove some eager resizing. Still mostly doesn't address #4997.
This commit is contained in:
@@ -3,6 +3,9 @@ local thelpers = require('test.functional.terminal.helpers')
|
||||
local clear = helpers.clear
|
||||
local feed, nvim = helpers.feed, helpers.nvim
|
||||
local feed_command = helpers.feed_command
|
||||
local command = helpers.command
|
||||
local eq = helpers.eq
|
||||
local eval = helpers.eval
|
||||
|
||||
describe('terminal', function()
|
||||
local screen
|
||||
@@ -22,72 +25,66 @@ describe('terminal', function()
|
||||
screen:detach()
|
||||
end)
|
||||
|
||||
it('resets its size when entering terminal window', function()
|
||||
it('next to a closing window', function()
|
||||
command('split')
|
||||
command('terminal')
|
||||
command('vsplit foo')
|
||||
eq(3, eval("winnr('$')"))
|
||||
feed('ZQ') -- Close split, should not crash. #7538
|
||||
eq(2, eval("1+1")) -- Still alive?
|
||||
end)
|
||||
|
||||
it('does not change size on WinEnter', function()
|
||||
if helpers.pending_win32(pending) then return end
|
||||
feed('<c-\\><c-n>')
|
||||
feed_command('2split')
|
||||
screen:expect([[
|
||||
rows: 2, cols: 50 |
|
||||
{2:^ } |
|
||||
tty ready |
|
||||
^rows: 5, cols: 50 |
|
||||
========== |
|
||||
rows: 2, cols: 50 |
|
||||
tty ready |
|
||||
rows: 5, cols: 50 |
|
||||
{2: } |
|
||||
{4:~ }|
|
||||
{4:~ }|
|
||||
{4:~ }|
|
||||
|
|
||||
|
|
||||
========== |
|
||||
:2split |
|
||||
]])
|
||||
feed_command('wincmd p')
|
||||
screen:expect([[
|
||||
tty ready |
|
||||
rows: 2, cols: 50 |
|
||||
rows: 5, cols: 50 |
|
||||
========== |
|
||||
tty ready |
|
||||
rows: 2, cols: 50 |
|
||||
rows: 5, cols: 50 |
|
||||
^rows: 5, cols: 50 |
|
||||
{2: } |
|
||||
^ |
|
||||
========== |
|
||||
:wincmd p |
|
||||
]])
|
||||
feed_command('wincmd p')
|
||||
screen:expect([[
|
||||
rows: 2, cols: 50 |
|
||||
{2:^ } |
|
||||
========== |
|
||||
rows: 2, cols: 50 |
|
||||
{2: } |
|
||||
{4:~ }|
|
||||
{4:~ }|
|
||||
{4:~ }|
|
||||
|
|
||||
|
|
||||
========== |
|
||||
:wincmd p |
|
||||
]])
|
||||
end)
|
||||
|
||||
describe('when the screen is resized', function()
|
||||
it('will forward a resize request to the program', function()
|
||||
feed([[<C-\><C-N>:]]) -- Go to cmdline-mode, so cursor is at bottom.
|
||||
screen:try_resize(screen._width - 3, screen._height - 2)
|
||||
screen:expect([[
|
||||
tty ready |
|
||||
rows: 7, cols: 47 |
|
||||
{2: } |
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
:^ |
|
||||
]])
|
||||
screen:try_resize(screen._width - 6, screen._height - 3)
|
||||
screen:expect([[
|
||||
tty ready |
|
||||
rows: 7, cols: 47 |
|
||||
rows: 4, cols: 41 |
|
||||
{2: } |
|
||||
:^ |
|
||||
]])
|
||||
end)
|
||||
it('forwards resize request to the program', function()
|
||||
feed([[<C-\><C-N>:]]) -- Go to cmdline-mode, so cursor is at bottom.
|
||||
screen:try_resize(screen._width - 3, screen._height - 2)
|
||||
screen:expect([[
|
||||
tty ready |
|
||||
rows: 7, cols: 47 |
|
||||
{2: } |
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
:^ |
|
||||
]])
|
||||
screen:try_resize(screen._width - 6, screen._height - 3)
|
||||
screen:expect([[
|
||||
tty ready |
|
||||
rows: 7, cols: 47 |
|
||||
rows: 4, cols: 41 |
|
||||
{2: } |
|
||||
:^ |
|
||||
]])
|
||||
end)
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user