Mercurial > vim
changeset 31946:05414bdc5c2c v9.0.1305
patch 9.0.1305: cursor in wrong line with virtual text above
Commit: https://github.com/vim/vim/commit/55a27d8ea7c112429fff14aba5db562de7f765f1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 12 18:03:57 2023 +0000
patch 9.0.1305: cursor in wrong line with virtual text above
Problem: Cursor in wrong line with virtual text above.
Solution: Count extra line for text property above/below. (closes https://github.com/vim/vim/issues/11959)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 12 Feb 2023 19:15:03 +0100 |
| parents | 884702f65f17 |
| children | 563b4f8f009e |
| files | src/charset.c src/structs.h src/testdir/dumps/Test_prop_above_empty_1.dump src/version.c |
| diffstat | 4 files changed, 28 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c +++ b/src/charset.c @@ -813,6 +813,11 @@ win_linetabsize_cts(chartabsize_T *cts, { (void)win_lbr_chartabsize(cts, NULL); cts->cts_vcol += cts->cts_cur_text_width; + + // when properties are above or below the empty line must also be + // counted + if (cts->cts_prop_lines > 0) + ++cts->cts_vcol; } #endif } @@ -1217,6 +1222,10 @@ win_lbr_chartabsize( tab_size = win_chartabsize(wp, s, vcol + size); size += tab_size; } + if (tp->tp_col == MAXCOL && (tp->tp_flags + & (TP_FLAG_ALIGN_ABOVE | TP_FLAG_ALIGN_BELOW))) + // count extra line for property above/below + ++cts->cts_prop_lines; } } if (tp->tp_col != MAXCOL && tp->tp_col - 1 > col)
--- a/src/structs.h +++ b/src/structs.h @@ -4781,6 +4781,7 @@ typedef struct { textprop_T *cts_text_props; // text props (allocated) char cts_has_prop_with_text; // TRUE if if a property inserts text int cts_cur_text_width; // width of current inserted text + int cts_prop_lines; // nr of properties above or below int cts_first_char; // width text props above the line int cts_with_trailing; // include size of trailing props with // last character
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_prop_above_empty_1.dump @@ -0,0 +1,16 @@ +| +0#af5f00255#ffffff0@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 +| +0#af5f00255&@1|1| |1+0#0000000&@7| @47 +| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 +| +0#af5f00255&@1|2| | +0#0000000&@55 +| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 +| +0#af5f00255&@1|3| |3+0#0000000&@8| @46 +| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 +| +0#af5f00255&@1|4| | +0#0000000&@55 +| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52 +| +0#af5f00255&@1|5| >5+0#0000000&@10| @44 +|~+0#4040ff13&| @58 +|~| @58 +|~| @58 +|~| @58 +|~| @58 +| +0#0000000&@41|5|,|1|-|5|7| @7|A|l@1|