forked from aniani/vim
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.
This commit is contained in:
@@ -643,7 +643,7 @@ text_prop_position(
|
|||||||
int right = (tp->tp_flags & TP_FLAG_ALIGN_RIGHT);
|
int right = (tp->tp_flags & TP_FLAG_ALIGN_RIGHT);
|
||||||
int above = (tp->tp_flags & TP_FLAG_ALIGN_ABOVE);
|
int above = (tp->tp_flags & TP_FLAG_ALIGN_ABOVE);
|
||||||
int below = (tp->tp_flags & TP_FLAG_ALIGN_BELOW);
|
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
|
int padding = tp->tp_col == MAXCOL && tp->tp_len > 1
|
||||||
? tp->tp_len - 1 : 0;
|
? tp->tp_len - 1 : 0;
|
||||||
int col_with_padding = scr_col + (below ? 0 : padding);
|
int col_with_padding = scr_col + (below ? 0 : padding);
|
||||||
|
@@ -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|…
|
|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
|
||||||
|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
|
|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
|
|~+0#4040ff13&| @48
|
||||||
|~| @48
|
|~| @48
|
||||||
|~| @48
|
|~| @48
|
||||||
| +0#0000000&@31|1|,|1| @10|A|l@1|
|
| +0#0000000&@31|1|,|7|5|-|9|2| @6|A|l@1|
|
||||||
|
@@ -1978,6 +1978,7 @@ func Test_prop_with_wrap()
|
|||||||
setline(1, 'asdf '->repeat(15))
|
setline(1, 'asdf '->repeat(15))
|
||||||
prop_type_add('test', {highlight: 'Special'})
|
prop_type_add('test', {highlight: 'Special'})
|
||||||
prop_add(1, 43, {text: 'some virtual text', type: 'test'})
|
prop_add(1, 43, {text: 'some virtual text', type: 'test'})
|
||||||
|
normal G$
|
||||||
END
|
END
|
||||||
call writefile(lines, 'XscriptPropWithWrap', 'D')
|
call writefile(lines, 'XscriptPropWithWrap', 'D')
|
||||||
let buf = RunVimInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50})
|
let buf = RunVimInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50})
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
1124,
|
||||||
/**/
|
/**/
|
||||||
1123,
|
1123,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user