Mercurial > vim
changeset 29615:bab343b21da8 v9.0.0148
patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Commit: https://github.com/vim/vim/commit/3ec3b8e92da8299bcbfd851fa76fccf5403e4097
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 5 21:39:30 2022 +0100
patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Problem: A "below" aligned text property gets 'showbreak' displayed.
Solution: Do not use 'showbreak' before or in virtual text. (issue https://github.com/vim/vim/issues/10851)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 05 Aug 2022 22:45:03 +0200 |
| parents | 08ce158c6238 |
| children | ff849d59173b |
| files | src/drawline.c src/testdir/test_textprop.vim src/version.c |
| diffstat | 3 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -392,6 +392,7 @@ win_line( #ifdef FEAT_LINEBREAK int need_showbreak = FALSE; // overlong line, skipping first x // chars + int dont_use_showbreak = FALSE; // do not use 'showbreak' #endif #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) @@ -1567,7 +1568,15 @@ win_line( if (*ptr == NUL) // don't combine char attr after EOL text_prop_flags &= ~PT_FLAG_COMBINE; - +#ifdef FEAT_LINEBREAK + if (below || right) + { + // no 'showbreak' before "below" text property + // or after "right" text property + need_showbreak = FALSE; + dont_use_showbreak = TRUE; + } +#endif // Keep in sync with where // textprop_size_after_trunc() is called in // win_lbr_chartabsize(). @@ -3441,9 +3450,11 @@ win_line( n_extra = 0; lcs_prec_todo = wp->w_lcs_chars.prec; #ifdef FEAT_LINEBREAK + if (!dont_use_showbreak # ifdef FEAT_DIFF - if (filler_todo <= 0) + && filler_todo <= 0 # endif + ) need_showbreak = TRUE; #endif #ifdef FEAT_DIFF
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -2311,6 +2311,7 @@ func Test_props_with_text_after() CheckRunVimInTerminal let lines =<< trim END + set showbreak=+++ call setline(1, 'some text here and other text there') call prop_type_add('rightprop', #{highlight: 'ErrorMsg'}) call prop_type_add('afterprop', #{highlight: 'Search'})