aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.0357: 'linebreak' interferes with text property highlight

Browse Source 
Problem:    'linebreak' interferes with text property highlight if there is
            syntax highlighting.
Solution:   Check the text prop attributes after combining with syntax
            attributes. (closes #11035)
This commit is contained in:
Bram Moolenaar
2022-09-02 13:26:29 +01:00
parent a02a8a4d84
commit cf2bb63397
5 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/drawline.c
View File

@@ -612,6 +612,8 @@ win_line(
proptype_T *text_prop_type = NULL;
int extra_for_textprop = FALSE; // wlv.n_extra set for textprop
int text_prop_attr = 0;
int text_prop_attr_comb = 0; // text_prop_attr combined with
// syntax_attr
int text_prop_id = 0; // active property ID
int text_prop_flags = 0;
int text_prop_follows = FALSE; // another text prop to display
@@ -1676,7 +1678,7 @@ win_line(
--pi;
# ifdef FEAT_LINEBREAK
// not exactly right but should work in most cases
if (in_linebreak && syntax_attr == text_prop_attr)
if (in_linebreak && syntax_attr == text_prop_attr_comb)
syntax_attr = 0;
# endif
}
@@ -1716,6 +1718,7 @@ win_line(
if (wlv.n_extra == 0 || !extra_for_textprop)
{
text_prop_attr = 0;
text_prop_attr_comb = 0;
text_prop_flags = 0;
text_prop_type = NULL;
text_prop_id = 0;
@@ -1789,6 +1792,7 @@ win_line(
saved_search_attr = search_attr;
search_attr = 0; // restore when n_extra is zero
text_prop_attr = 0;
text_prop_attr_comb = 0;
if (*ptr == NUL)
// don't combine char attr after EOL
text_prop_flags &= ~PT_FLAG_COMBINE;
@@ -1974,6 +1978,7 @@ win_line(
syntax_attr = hl_combine_attr(syntax_attr, text_prop_attr);
else
syntax_attr = text_prop_attr;
text_prop_attr_comb = syntax_attr;
}
# endif
#endif

2
src/testdir/dumps/Test_prop_linebreak.dump → src/testdir/dumps/Test_prop_linebreak_1.dump
View File

@@ -1,4 +1,4 @@
>x+0&#ffffff0@49|]+0#ffffff16#e000002| +0#0000000#ffffff0@23
>x+0&#ffffff0@49|]+0&#40ffff15| +0&#ffffff0@23
|x@69| @4
|~+0#4040ff13&| @73
|~| @73

10
src/testdir/dumps/Test_prop_linebreak_2.dump Normal file
View File

@@ -0,0 +1,10 @@
| +0#0000e05#a8a8a8255@1>x+0&#ffffff0@49|]+0&#40ffff15| +0#0000000#ffffff0@21
| +0#0000e05#a8a8a8255@1|x+0&#ffffff0@69| +0#0000000&@2
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
| +0#0000000&@56|1|,|1| @10|A|l@1|

13
src/testdir/test_textprop.vim
View File

@@ -1925,12 +1925,21 @@ func Test_prop_in_linebreak()
let lines =<< trim END
set breakindent linebreak breakat+=]
call printf('%s]%s', repeat('x', 50), repeat('x', 70))->setline(1)
call prop_type_add('test', #{highlight: 'ErrorMsg'})
call prop_type_add('test', #{highlight: 'MatchParen'})
call prop_add(1, 51, #{length: 1, type: 'test'})
func AddMatch()
syntax on
syntax match xTest /.*/
hi link xTest Comment
set signcolumn=yes
endfunc
END
call writefile(lines, 'XscriptPropLinebreak')
let buf = RunVimInTerminal('-S XscriptPropLinebreak', #{rows: 10})
call VerifyScreenDump(buf, 'Test_prop_linebreak', {})
call VerifyScreenDump(buf, 'Test_prop_linebreak_1', {})
call term_sendkeys(buf, ":call AddMatch()\<CR>")
call VerifyScreenDump(buf, 'Test_prop_linebreak_2', {})
call StopVimInTerminal(buf)
call delete('XscriptPropLinebreak')

2
src/version.c
View File

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