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

patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly

Browse Source 
Problem:    When 'rnu' is set folded lines are not displayed correctly.
            (Vitaly Yashin)
Solution:   When only redrawing line numbers do draw folded lines.
            (closes #3484)
This commit is contained in:
Bram Moolenaar
2018-10-02 21:20:32 +02:00
parent 4a5abbd613
commit 7701f30856
5 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/screen.c
View File

@@ -2176,7 +2176,14 @@ win_update(win_T *wp)
{
// 'relativenumber' set: The text doesn't need to be drawn, but
// the number column nearly always does.
(void)win_line(wp, lnum, srow, wp->w_height, TRUE, TRUE);
fold_count = foldedCount(wp, lnum, &win_foldinfo);
if (fold_count != 0)
{
fold_line(wp, fold_count, &win_foldinfo, lnum, row);
--fold_count;
}
else
(void)win_line(wp, lnum, srow, wp->w_height, TRUE, TRUE);
}
// This line does not need to be drawn, advance to the next one.
@@ -3315,8 +3322,8 @@ win_line(
has_spell = TRUE;
extra_check = TRUE;
/* Get the start of the next line, so that words that wrap to the next
* line are found too: "et<line-break>al.".
/* Get the start of the next line, so that words that wrap to the
* next line are found too: "et<line-break>al.".
* Trick: skip a few chars for C/shell/Vim comments */
nextline[SPWORDLEN] = NUL;
if (lnum < wp->w_buffer->b_ml.ml_line_count)
@@ -3325,8 +3332,8 @@ win_line(
spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN);
}
/* When a word wrapped from the previous line the start of the current
* line is valid. */
/* When a word wrapped from the previous line the start of the
* current line is valid. */
if (lnum == checked_lnum)
cur_checked_col = checked_col;
checked_lnum = 0;

20
src/testdir/dumps/Test_folds_with_rnu_01.dump Normal file
View File

@@ -0,0 +1,20 @@
|++0#0000e05#a8a8a8255| @2|0| >+|-@1| @1|2| |l|i|n|e|s|:| |-@54
|+| @2|1| |+|-@1| @1|2| |l|i|n|e|s|:| |-@54
| @1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000000&@56|1|,|1| @10|A|l@1|

20
src/testdir/dumps/Test_folds_with_rnu_02.dump Normal file
View File

@@ -0,0 +1,20 @@
|++0#0000e05#a8a8a8255| @2|1| |+|-@1| @1|2| |l|i|n|e|s|:| |-@54
|+| @2|0| >+|-@1| @1|2| |l|i|n|e|s|:| |-@54
| @1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000e05#a8a8a8255@1|~+0#4040ff13#ffffff0| @71
| +0#0000000&@56|3|,|1| @10|A|l@1|

21
src/testdir/test_fold.vim
View File

@@ -1,6 +1,7 @@
" Test for folding
source view_util.vim
source screendump.vim
func PrepIndent(arg)
return [a:arg] + repeat(["\t".a:arg], 5)
@@ -674,3 +675,23 @@ func Test_fold_last_line_with_pagedown()
set fdm&
enew!
endfunc
func Test_folds_with_rnu()
if !CanRunVimInTerminal()
return
endif
call writefile([
\ 'set fdm=marker rnu foldcolumn=2',
\ 'call setline(1, ["{{{1", "nline 1", "{{{1", "line 2"])',
\ ], 'Xtest_folds_with_rnu')
let buf = RunVimInTerminal('-S Xtest_folds_with_rnu', {})
call VerifyScreenDump(buf, 'Test_folds_with_rnu_01', {})
call term_sendkeys(buf, "j")
call VerifyScreenDump(buf, 'Test_folds_with_rnu_02', {})
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_folds_with_rnu')
endfunc

2
src/version.c
View File

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