Mercurial > vim
changeset 31584:cfc60c536a2f v9.0.1124
patch 9.0.1124: virtual text at a column position is truncated
Commit: https://github.com/vim/vim/commit/1aeb3eb092a384e63a407096102fd5a954aabeb8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 1 14:04:51 2023 +0000
patch 9.0.1124: virtual text at a column position is truncated
Problem: Virtual text at a column position is truncated at the window edge.
(Yegappan Lakshmanan)
Solution: Do not truncated virtual text that is placed at a column.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 01 Jan 2023 15:15:03 +0100 |
| parents | fe76403c44fd |
| children | d85a9fa468f2 |
| 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, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -643,7 +643,7 @@ text_prop_position( int right = (tp->tp_flags & TP_FLAG_ALIGN_RIGHT); int above = (tp->tp_flags & TP_FLAG_ALIGN_ABOVE); int below = (tp->tp_flags & TP_FLAG_ALIGN_BELOW); - int wrap = (tp->tp_flags & TP_FLAG_WRAP); + int wrap = tp->tp_col < MAXCOL || (tp->tp_flags & TP_FLAG_WRAP); int padding = tp->tp_col == MAXCOL && tp->tp_len > 1 ? tp->tp_len - 1 : 0; int col_with_padding = scr_col + (below ? 0 : padding);
--- a/src/testdir/dumps/Test_prop_with_wrap_1.dump +++ b/src/testdir/dumps/Test_prop_with_wrap_1.dump @@ -1,6 +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 +|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|r +|t|u|a|l| |t|e|x|t|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> @8 |~+0#4040ff13&| @48 |~| @48 |~| @48 -| +0#0000000&@31|1|,|1| @10|A|l@1| +| +0#0000000&@31|1|,|7|5|-|9|2| @6|A|l@1|
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -1978,6 +1978,7 @@ func Test_prop_with_wrap() setline(1, 'asdf '->repeat(15)) prop_type_add('test', {highlight: 'Special'}) prop_add(1, 43, {text: 'some virtual text', type: 'test'}) + normal G$ END call writefile(lines, 'XscriptPropWithWrap', 'D') let buf = RunVimInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50})