Mercurial > vim
changeset 26384:e624b4ddbdf0 v8.2.3723
patch 8.2.3723: when using 'linebreak' a text property starts too early
Commit: https://github.com/vim/vim/commit/acdc911e4e1120ef29d86fce8e890c72cdd1bf30
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 2 19:46:57 2021 +0000
patch 8.2.3723: when using 'linebreak' a text property starts too early
Problem: When using 'linebreak' a text property starts too early.
Solution: Decrement "bcol" when looking for property start. (closes https://github.com/vim/vim/issues/9242)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 02 Dec 2021 21:00:03 +0100 |
| parents | ada8c0364d67 |
| children | bd043fef8ab2 |
| files | src/drawline.c src/testdir/dumps/Test_prop_after_linebreak.dump src/testdir/test_textprop.vim src/version.c |
| diffstat | 4 files changed, 35 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -1453,6 +1453,11 @@ win_line( } } +# ifdef FEAT_LINEBREAK + if (n_extra > 0 && in_linebreak) + // not on the next char yet, don't start another prop + --bcol; +# endif // Add any text property that starts in this column. while (text_prop_next < text_prop_count && bcol >= text_props[text_prop_next].tp_col - 1)
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_prop_after_linebreak.dump @@ -0,0 +1,10 @@ +>x+0&#ffffff0@36|+| @36 +|(+0#ffffff16#e000002|x+0#0000000#ffffff0@36|)| @35 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|,|1| @10|A|l@1|
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -1651,6 +1651,24 @@ func Test_prop_after_tab() call delete('XscriptPropAfterTab') endfunc +func Test_prop_after_linebreak() + CheckRunVimInTerminal + + let lines =<< trim END + set linebreak wrap + call printf('%s+(%s)', 'x'->repeat(&columns / 2), 'x'->repeat(&columns / 2))->setline(1) + call prop_type_add('test', #{highlight: 'ErrorMsg'}) + call prop_add(1, (&columns / 2) + 2, #{length: 1, type: 'test'}) + END + call writefile(lines, 'XscriptPropAfterLinebreak') + let buf = RunVimInTerminal('-S XscriptPropAfterLinebreak', #{rows: 10}) + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_prop_after_linebreak', {}) + + call StopVimInTerminal(buf) + call delete('XscriptPropAfterLinebreak') +endfunc + " Buffer number of 0 should be ignored, as if the parameter wasn't passed. def Test_prop_bufnr_zero() new