Mercurial > vim
view src/testdir/test_suspend.vim @ 34682:a36144b38683 v9.1.0222
patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text
Commit: https://github.com/vim/vim/commit/fe0a76b2bca12b13982ad66bafadc0d6c1681d00
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 11:47:32 2024 +0100
patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text
Problem: When a line is truncated just before 'after'/'right' virtual
text and the line also has 'below' virtual text, then the
'below' virtual text would not be displayed, depending on the
order these text properties were added.
Solution: In the loop to make text properties active, skip instead of
break for 'after'/'right' virtual text properties that are
ignored due to truncation, so following 'below' text
properties can still be made active.
Similarly, a loop is needed to determine if a text property
follows at the end of the screen. (Dylan Thacker-Smith)
related: #14307
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:00: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