aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-26 09:14:23 -04:00
Code Activity

patch 9.0.0153: no fold and sign column for virtual text with "below" align

Browse Source 
Problem:    No fold and sign column for virtual text with "below" align and
            'nowrap'.
Solution:   Go back to draw state WL_START when moving to the next line.
            (closes #10851)
This commit is contained in:
Bram Moolenaar
2022-08-06 15:59:06 +01:00
parent e2086350d3
commit 1306b36a7b
4 changed files with 488 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

922
src/drawline.c
View File

File diff suppressed because it is too large Load Diff

8
src/testdir/dumps/Test_prop_with_text_after_nowrap_2.dump Normal file
View File

@@ -0,0 +1,8 @@
| +0#0000e05#a8a8a8255@4|o+0#0000000#ffffff0|n|e| @51
| +0#0000e05#a8a8a8255@4| +0#ffffff16#e000002|B|e|l|o|w| |t|h|e| |l|i|n|e| | +0#0000000#ffffff0@38
| +0#0000e05#a8a8a8255@4|t+0#0000000#ffffff0|w|o| @51
| +0#0000e05#a8a8a8255@4|a+0#0000000#ffff4012|n|o|t|h|e|r| +0&#ffffff0@47
| +0#0000e05#a8a8a8255@4|O+0#ffffff16#e000002|n|e| |M|o|r|e| |H|e|r|e| +0#0000000#ffffff0@41
| +0#0000e05#a8a8a8255@4|t+0#0000000#ffffff0|h|r|e>e| @49
|~+0#4040ff13&| @58
| +0#0000000&@41|3|,|5| @10|A|l@1|

3
src/testdir/test_textprop.vim
View File

@@ -2443,6 +2443,9 @@ func Test_props_with_text_after_nowrap()
let buf = RunVimInTerminal('-S XscriptPropsAfterNowrap', #{rows: 8, cols: 60}) let buf = RunVimInTerminal('-S XscriptPropsAfterNowrap', #{rows: 8, cols: 60})
call VerifyScreenDump(buf, 'Test_prop_with_text_after_nowrap_1', {}) call VerifyScreenDump(buf, 'Test_prop_with_text_after_nowrap_1', {})
call term_sendkeys(buf, ":set signcolumn=yes foldcolumn=3\<CR>")
call VerifyScreenDump(buf, 'Test_prop_with_text_after_nowrap_2', {})
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call delete('XscriptPropsAfterNowrap') call delete('XscriptPropsAfterNowrap')
endfunc endfunc

2
src/version.c
View File

@@ -735,6 +735,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 */
/**/
153,
/**/ /**/
152, 152,
/**/ /**/