aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.1305: cursor in wrong line with virtual text above

Browse Source 
Problem:    Cursor in wrong line with virtual text above.
Solution:   Count extra line for text property above/below. (closes #11959)
This commit is contained in:
Bram Moolenaar
2023-02-12 18:03:57 +00:00
parent 234c3fab28
commit 55a27d8ea7
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/charset.c
View File

@@ -813,6 +813,11 @@ win_linetabsize_cts(chartabsize_T *cts, colnr_T len)
{ {
(void)win_lbr_chartabsize(cts, NULL); (void)win_lbr_chartabsize(cts, NULL);
cts->cts_vcol += cts->cts_cur_text_width; 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 #endif
} }
@@ -1217,6 +1222,10 @@ win_lbr_chartabsize(
tab_size = win_chartabsize(wp, s, vcol + size); tab_size = win_chartabsize(wp, s, vcol + size);
size += tab_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) if (tp->tp_col != MAXCOL && tp->tp_col - 1 > col)

1
src/structs.h
View File

@@ -4781,6 +4781,7 @@ typedef struct {
textprop_T *cts_text_props; // text props (allocated) textprop_T *cts_text_props; // text props (allocated)
char cts_has_prop_with_text; // TRUE if if a property inserts text 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_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_first_char; // width text props above the line
int cts_with_trailing; // include size of trailing props with int cts_with_trailing; // include size of trailing props with
// last character // last character

16
src/testdir/dumps/Test_prop_above_empty_1.dump Normal file
View File

@@ -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|

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1305,
/**/ /**/
1304, 1304,
/**/ /**/