Mercurial > vim
view src/testdir/test_suspend.vim @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +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