Mercurial > vim
changeset 29688:1455814702ad v9.0.0184
patch 9.0.0184: virtual text prop highlight continues after truncation
Commit: https://github.com/vim/vim/commit/1d8844aa59416dd306912b5563b8e928dfd387ba
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 10 13:39:35 2022 +0100
patch 9.0.0184: virtual text prop highlight continues after truncation
Problem: Virtual text prop highlight continues after truncation.
Solution: Recompute the length of attributes.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 10 Aug 2022 14:45:02 +0200 |
| parents | fcd7cc10905b |
| children | efa44fb20906 |
| files | src/drawline.c src/testdir/dumps/Test_prop_with_wrap_1.dump src/testdir/test_textprop.vim src/version.c |
| diffstat | 4 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -1793,6 +1793,7 @@ win_line( wlv.p_extra = p_extra_free2 = l; wlv.n_extra = n_used + added; n_attr_skip = added; + n_attr = mb_charlen(wlv.p_extra); } }
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_prop_with_wrap_1.dump @@ -0,0 +1,6 @@ +>a+0&#ffffff0|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|s+0#e000e06&|o|m|e| |v|i|… +|d+0#0000000&|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| @17 +|~+0#4040ff13&| @48 +|~| @48 +|~| @48 +| +0#0000000&@31|1|,|1| @10|A|l@1|
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -1898,6 +1898,24 @@ func Test_prop_with_linebreak() call delete('XscriptPropWithLinebreak') endfunc +func Test_prop_with_wrap() + CheckRunVimInTerminal + + let lines =<< trim END + vim9script + set linebreak + setline(1, 'asdf '->repeat(15)) + prop_type_add('test', {highlight: 'Special'}) + prop_add(1, 43, {text: 'some virtual text', type: 'test'}) + END + call writefile(lines, 'XscriptPropWithWrap') + let buf = RunVimInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50}) + call VerifyScreenDump(buf, 'Test_prop_with_wrap_1', {}) + + call StopVimInTerminal(buf) + call delete('XscriptPropWithWrap') +endfunc + func Test_prop_after_tab() CheckRunVimInTerminal