Mercurial > vim
view src/testdir/test_suspend.vim @ 34379:37b4c89ba420 v9.1.0116
patch 9.1.0116: win_split_ins may not check available room
Commit: https://github.com/vim/vim/commit/0fd44a5ad81ade342cb54d8984965bdedd2272c8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Feb 20 20:28:15 2024 +0100
patch 9.1.0116: win_split_ins may not check available room
Problem: win_split_ins has no check for E36 when moving an existing
window
Solution: check for room and fix the issues in f_win_splitmove()
(Sean Dewar)
win_split_ins has no check for E36 when moving an existing window,
allowing for layouts with many overlapping zero-sized windows to be
created (which may also cause drawing issues with tablines and such).
f_win_splitmove also has some bugs.
So check for room and fix the issues in f_win_splitmove. Handle failure
in the two relevant win_split_ins callers by restoring the original
layout, and factor the common logic into win_splitmove.
Don't check for room when opening an autocommand window, as it's a
temporary window that's rarely interacted with or drawn anyhow, and is
rather important for some autocommands.
Issues fixed in f_win_splitmove:
- Error if splitting is disallowed.
- Fix heap-use-after-frees if autocommands fired from switching to "targetwin"
close "wp" or "oldwin".
- Fix splitting the wrong window if autocommands fired from switching to
"targetwin" switch to a different window.
- Ensure -1 is returned for all errors.
Also handle allocation failure a bit earlier in make_snapshot (callers,
except win_splitmove, don't really care if a snapshot can't be made, so
just ignore the return value).
Note: Test_smoothscroll_in_zero_width_window failed after these changes with
E36, as it was using the previous behaviour to create a zero-width window.
I've fixed the test such that it fails with UBSAN as expected when v9.0.1367 is
reverted (and simplified it too).
related: #14042
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 20 Feb 2024 22:30:04 +0100 |
parents | 543cb94c6c09 |
children |
line wrap: on
line source
" Test :suspend source check.vim source term_util.vim source shared.vim func CheckSuspended(buf, fileExists) call WaitForAssert({-> assert_match('[$#] $', term_getline(a:buf, '.'))}) if a:fileExists call assert_equal(['foo'], readfile('Xfoo')) else " Without 'autowrite', buffer should not be written. call assert_equal(0, filereadable('Xfoo')) endif call term_sendkeys(a:buf, "fg\<CR>\<C-L>") call WaitForAssert({-> assert_equal(' 1 foo', term_getline(a:buf, '.'))}) endfunc func Test_suspend() CheckFeature terminal CheckExecutable /bin/sh " Somehow the modifyOtherKeys response may get to the terminal when using " Mac OS. Make t_RK and 'keyprotocol' empty to avoid that. set t_RK= keyprotocol= call WaitForResponses() let buf = term_start('/bin/sh') " Wait for shell prompt. call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) call term_sendkeys(buf, v:progpath \ . " --clean -X" \ . " -c 'set nu keyprotocol='" \ . " -c 'call setline(1, \"foo\")'" \ . " Xfoo\<CR>") " Cursor in terminal buffer should be on first line in spawned vim. call WaitForAssert({-> assert_equal(' 1 foo', term_getline(buf, '.'))}) for suspend_cmd in [":suspend\<CR>", \ ":stop\<CR>", \ ":suspend!\<CR>", \ ":stop!\<CR>", \ "\<C-Z>"] " Suspend and wait for shell prompt. call term_sendkeys(buf, suspend_cmd) call CheckSuspended(buf, 0) endfor " Test that :suspend! with 'autowrite' writes content of buffers if modified. call term_sendkeys(buf, ":set autowrite\<CR>") call assert_equal(0, filereadable('Xfoo')) call term_sendkeys(buf, ":suspend\<CR>") " Wait for shell prompt. call CheckSuspended(buf, 1) " Quit gracefully to dump coverage information. call term_sendkeys(buf, ":qall!\<CR>") call TermWait(buf) " Wait until Vim actually exited and shell shows a prompt call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) call StopShellInTerminal(buf) exe buf . 'bwipe!' call delete('Xfoo') endfunc func Test_suspend_autocmd() CheckFeature terminal CheckExecutable /bin/sh " Somehow the modifyOtherKeys response may get to the terminal when using " Mac OS. Make t_RK and 'keyprotocol' empty to avoid that. set t_RK= keyprotocol= call WaitForResponses() let buf = term_start('/bin/sh', #{term_rows: 6}) " Wait for shell prompt. call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) call term_sendkeys(buf, v:progpath \ . " --clean -X" \ . " -c 'set nu keyprotocol='" \ . " -c 'let g:count = 0'" \ . " -c 'au VimSuspend * let g:count += 1'" \ . " -c 'au VimResume * let g:count += 1'" \ . " -c 'call setline(1, \"foo\")'" \ . " Xfoo\<CR>") " Cursor in terminal buffer should be on first line in spawned vim. call WaitForAssert({-> assert_equal(' 1 foo', term_getline(buf, '.'))}) for suspend_cmd in [":suspend\<CR>", \ ":stop\<CR>", \ ":suspend!\<CR>", \ ":stop!\<CR>", \ "\<C-Z>"] " Suspend and wait for shell prompt. Then "fg" will restore Vim. call term_sendkeys(buf, suspend_cmd) call CheckSuspended(buf, 0) endfor call term_sendkeys(buf, ":echo g:count\<CR>") call TermWait(buf) call WaitForAssert({-> assert_match('^10', term_getline(buf, 6))}) " Quit gracefully to dump coverage information. call term_sendkeys(buf, ":qall!\<CR>") call TermWait(buf) " Wait until Vim actually exited and shell shows a prompt call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) call StopShellInTerminal(buf) exe buf . 'bwipe!' call delete('Xfoo') endfunc " vim: shiftwidth=2 sts=2 expandtab