Mercurial > vim
changeset 30741:11875afe85b2 v9.0.0705
patch 9.0.0705: virtual text truncation does not take padding into account
Commit: https://github.com/vim/vim/commit/13845c48d8ca96e0fa5bb237db519dd00045742f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 9 15:26:03 2022 +0100
patch 9.0.0705: virtual text truncation does not take padding into account
Problem: Virtual text truncation does not take padding into account.
Solution: Subtract the padding from the available space. (closes https://github.com/vim/vim/issues/11318)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 09 Oct 2022 16:30:03 +0200 |
| parents | 71a6ce174473 |
| children | 67e296324bd5 |
| files | src/drawline.c src/testdir/dumps/Test_long_text_with_padding_1.dump src/testdir/test_textprop.vim src/version.c |
| diffstat | 4 files changed, 43 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -573,6 +573,7 @@ textprop_size_after_trunc( win_T *wp, int flags, // TP_FLAG_ALIGN_* int added, + int padding, char_u *text, int *n_used_ptr) { @@ -585,6 +586,8 @@ textprop_size_after_trunc( // if the remaining size is to small wrap anyway and use the next line if (space < PROP_TEXT_MIN_CELLS) space += wp->w_width; + if (flags & TP_FLAG_ALIGN_BELOW) + space -= padding; for (n_used = 0; n_used < len; n_used += (*mb_ptr2len)(text + n_used)) { int clen = ptr2cells(text + n_used); @@ -629,7 +632,7 @@ text_prop_position( char_u *l = NULL; int strsize = vim_strsize(*p_extra); int cells = wrap ? strsize : textprop_size_after_trunc(wp, - tp->tp_flags, before, *p_extra, &n_used); + tp->tp_flags, before, padding, *p_extra, &n_used); if (wrap || right || above || below || padding > 0 || n_used < *n_extra) { @@ -715,7 +718,7 @@ text_prop_position( // change last character to '…' lp -= (*mb_head_off)(l, lp); STRCPY(lp, "…"); - n_used = lp - l + 3 - padding; + n_used = lp - l + 3 - before - padding; } else // change last character to '>'
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_long_text_with_padding_1.dump @@ -0,0 +1,8 @@ +|f+0&#ffffff0|i|r|s|t| |l|i|n|e| @49 +@3|a+0&#ffd7ff255|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|… +| +0&#ffffff0@29|m+0&#ffd7ff255|o|r|e| |m|o|r|e| |m|o|r|e| |m|o|r|e| |m|o|r|e| |m|o|r|e|… +|s+0&#ffffff0|e|c|o|n|d| >l|i|n|e| @48 +|~+0#4040ff13&| @58 +|~| @58 +|~| @58 +| +0#0000000&@41|2|,|8| @10|A|l@1|
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -3183,6 +3183,34 @@ func Test_insert_text_with_padding() call StopVimInTerminal(buf) endfunc +func Test_long_text_below_with_padding() + CheckRunVimInTerminal + + let lines =<< trim END + vim9script + setline(1, ['first line', 'second line']) + prop_type_add('theprop', {highlight: 'DiffChange'}) + prop_add(1, 0, { + type: 'theprop', + text: 'after '->repeat(20), + text_align: 'below', + text_padding_left: 3, + }) + prop_add(1, 0, { + type: 'theprop', + text: 'more '->repeat(20), + text_align: 'below', + text_padding_left: 30, + }) + normal 2Gw + END + call writefile(lines, 'XlongTextBelowWithPadding', 'D') + let buf = RunVimInTerminal('-S XlongTextBelowWithPadding', #{rows: 8, cols: 60}) + call VerifyScreenDump(buf, 'Test_long_text_with_padding_1', {}) + + call StopVimInTerminal(buf) +endfunc + func Test_insert_text_change_arg() CheckRunVimInTerminal