mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-24 00:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): restore options properly when switching buffer (#37485)

Browse Source
This commit is contained in:
zeertzjq
2026-01-21 18:42:47 +08:00
committed by GitHub
parent 1883fe39bd
commit 25ce44845d
3 changed files with 104 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,21 +33,35 @@ describe(':terminal buffer', function()
end)
it('terminal-mode forces various options', function()
local expr =
'[&l:cursorlineopt, &l:cursorline, &l:cursorcolumn, &l:scrolloff, &l:sidescrolloff]'
feed([[<C-\><C-N>]])
command('setlocal cursorline cursorlineopt=both cursorcolumn scrolloff=4 sidescrolloff=7')
eq(
{ 'both', 1, 1, 4, 7 },
eval('[&l:cursorlineopt, &l:cursorline, &l:cursorcolumn, &l:scrolloff, &l:sidescrolloff]')
)
eq({ 'both', 1, 1, 4, 7 }, eval(expr))
eq('nt', eval('mode(1)'))
-- Enter terminal-mode ("insert" mode in :terminal).
-- Enter Terminal mode ("insert" mode in :terminal).
feed('i')
eq('t', eval('mode(1)'))
eq(
{ 'number', 1, 0, 0, 0 },
eval('[&l:cursorlineopt, &l:cursorline, &l:cursorcolumn, &l:scrolloff, &l:sidescrolloff]')
)
eq({ 'number', 1, 0, 0, 0 }, eval(expr))
-- Return to Normal mode.
feed([[<C-\><C-N>]])
eq('nt', eval('mode(1)'))
eq({ 'both', 1, 1, 4, 7 }, eval(expr))
-- Enter Terminal mode again.
feed('i')
eq('t', eval('mode(1)'))
eq({ 'number', 1, 0, 0, 0 }, eval(expr))
-- Delete the terminal buffer and return to the previous buffer.
command('bwipe!')
feed('<Ignore>') -- Add input to separate two RPC requests
eq('n', eval('mode(1)'))
-- Window options in the old buffer should be unchanged. #37484
eq({ 'both', 0, 0, -1, -1 }, eval(expr))
end)
it('terminal-mode does not change cursorlineopt if cursorline is disabled', function()