mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.3723: when using 'linebreak' a text property starts too early
Problem: When using 'linebreak' a text property starts too early. Solution: Decrement "bcol" when looking for property start. (closes #9242)
This commit is contained in:
parent
5e86964bf4
commit
acdc911e4e
@ -1453,6 +1453,11 @@ win_line(
|
||||
}
|
||||
}
|
||||
|
||||
# ifdef FEAT_LINEBREAK
|
||||
if (n_extra > 0 && in_linebreak)
|
||||
// not on the next char yet, don't start another prop
|
||||
--bcol;
|
||||
# endif
|
||||
// Add any text property that starts in this column.
|
||||
while (text_prop_next < text_prop_count
|
||||
&& bcol >= text_props[text_prop_next].tp_col - 1)
|
||||
|
10
src/testdir/dumps/Test_prop_after_linebreak.dump
Normal file
10
src/testdir/dumps/Test_prop_after_linebreak.dump
Normal file
@ -0,0 +1,10 @@
|
||||
>x+0&#ffffff0@36|+| @36
|
||||
|(+0#ffffff16#e000002|x+0#0000000#ffffff0@36|)| @35
|
||||
|~+0#4040ff13&| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
| +0#0000000&@56|1|,|1| @10|A|l@1|
|
@ -1651,6 +1651,24 @@ func Test_prop_after_tab()
|
||||
call delete('XscriptPropAfterTab')
|
||||
endfunc
|
||||
|
||||
func Test_prop_after_linebreak()
|
||||
CheckRunVimInTerminal
|
||||
|
||||
let lines =<< trim END
|
||||
set linebreak wrap
|
||||
call printf('%s+(%s)', 'x'->repeat(&columns / 2), 'x'->repeat(&columns / 2))->setline(1)
|
||||
call prop_type_add('test', #{highlight: 'ErrorMsg'})
|
||||
call prop_add(1, (&columns / 2) + 2, #{length: 1, type: 'test'})
|
||||
END
|
||||
call writefile(lines, 'XscriptPropAfterLinebreak')
|
||||
let buf = RunVimInTerminal('-S XscriptPropAfterLinebreak', #{rows: 10})
|
||||
call TermWait(buf)
|
||||
call VerifyScreenDump(buf, 'Test_prop_after_linebreak', {})
|
||||
|
||||
call StopVimInTerminal(buf)
|
||||
call delete('XscriptPropAfterLinebreak')
|
||||
endfunc
|
||||
|
||||
" Buffer number of 0 should be ignored, as if the parameter wasn't passed.
|
||||
def Test_prop_bufnr_zero()
|
||||
new
|
||||
|
@ -753,6 +753,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3723,
|
||||
/**/
|
||||
3722,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user