diff options
| -rw-r--r-- | src/drawline.c | 12 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_props_with_text_truncated_just_before_after_1.dump | 8 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_props_with_text_truncated_just_before_after_2.dump | 8 | ||||
| -rw-r--r-- | src/testdir/test_textprop.vim | 34 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 59 insertions, 5 deletions
diff --git a/src/drawline.c b/src/drawline.c index 103760fa18..8abe8bfa5f 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -2323,15 +2323,17 @@ win_line( else if (text_prop_next < text_prop_count && text_props[text_prop_next].tp_col == MAXCOL && ((*ptr != NUL && ptr[mb_ptr2len(ptr)] == NUL) - || (!wp->w_p_wrap - && wlv.col == wp->w_width - 1 - && (text_props[text_prop_next].tp_flags - & TP_FLAG_ALIGN_BELOW)))) + || (!wp->w_p_wrap && wlv.col == wp->w_width - 1))) + { // When at last-but-one character and a text property // follows after it, we may need to flush the line after // displaying that character. // Or when not wrapping and at the rightmost column. - text_prop_follows = TRUE; + int only_below_follows = !wp->w_p_wrap && wlv.col == wp->w_width - 1; + if (!only_below_follows + || (text_props[text_prop_next].tp_flags & TP_FLAG_ALIGN_BELOW)) + text_prop_follows = TRUE; + } } if (wlv.start_extra_for_textprop) diff --git a/src/testdir/dumps/Test_props_with_text_truncated_just_before_after_1.dump b/src/testdir/dumps/Test_props_with_text_truncated_just_before_after_1.dump new file mode 100644 index 0000000000..f46f47ec0d --- /dev/null +++ b/src/testdir/dumps/Test_props_with_text_truncated_just_before_after_1.dump @@ -0,0 +1,8 @@ +|h+0&#ffffff0|e|r|e| |i|s| |t|e|x|t| |l|o|n|g| |e|n|o|u|g|h| |t|o| |f|i|l@1| |t|h|e| |r|o|>+0#4040ff13& +|s+0#0000000&|e|c|o|n|d| |l|i|n>e| @28 +|~+0#4040ff13&| @38 +|~| @38 +|~| @38 +|~| @38 +|~| @38 +| +0#0000000&@21|2|,|1@1| @9|A|l@1| diff --git a/src/testdir/dumps/Test_props_with_text_truncated_just_before_after_2.dump b/src/testdir/dumps/Test_props_with_text_truncated_just_before_after_2.dump new file mode 100644 index 0000000000..3434669301 --- /dev/null +++ b/src/testdir/dumps/Test_props_with_text_truncated_just_before_after_2.dump @@ -0,0 +1,8 @@ +|h+0&#ffffff0|e|r|e| |i|s| |t|e|x|t| |l|o|n|g| |e|n|o|u|g|h| |t|o| |f|i|l@1| |t|h|e| |r|o|>+0#4040ff13& +|b+0#ffffff16#ff404010|e|l|o|w| |t|e|x|t| +0#0000000#ffffff0@29 +|s|e|c|o|n|d| |l|i|n>e| @28 +|~+0#4040ff13&| @38 +|~| @38 +|~| @38 +|~| @38 +| +0#0000000&@21|2|,|1@1| @9|A|l@1| diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim index 63cc533693..22c7e4651b 100644 --- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -3068,6 +3068,40 @@ func Test_props_with_text_after_below_trunc() call StopVimInTerminal(buf) endfunc +func Test_props_with_text_truncated_just_before_after() + CheckRunVimInTerminal + + let lines =<< trim END + vim9script + set showbreak=+++ + set list listchars=extends:> + set nowrap + + setline(1, [ + 'here is text long enough to fill the row', + 'second line', + ]) + + prop_type_add("test", {"highlight": "Error"}) + prop_add(1, 0, {type: "test", text: "after text", text_padding_left: 1}) + def g:AddPropBelow() + prop_add(1, 0, {type: "test", text_align: "below", text: "below text"}) + enddef + def g:AddPropRight() + prop_add(1, 0, {type: "test", text_align: "right", text: "right text"}) + enddef + normal G$ + END + call writefile(lines, 'XscriptPropsWithTextTruncatedJustBeforeAfter', 'D') + let buf = RunVimInTerminal('-S XscriptPropsWithTextTruncatedJustBeforeAfter', #{rows: 8, cols: 40}) + call VerifyScreenDump(buf, 'Test_props_with_text_truncated_just_before_after_1', {}) + + call term_sendkeys(buf, ":call AddPropBelow()\<CR>") + call VerifyScreenDump(buf, 'Test_props_with_text_truncated_just_before_after_2', {}) + + call StopVimInTerminal(buf) +endfunc + func Test_prop_with_text_below_after_empty() CheckRunVimInTerminal diff --git a/src/version.c b/src/version.c index 20618a6910..f853a6968a 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 221, +/**/ 220, /**/ 219, |