Skip to content

Commit 04626c2

Browse files
brammoolbrammool
committed
patch 8.2.3394: filler lines are wrong when changing text in diff mode
Problem: Filler lines are wrong when changing text in diff mode. Solution: Don't change the filler lines on every change. Check scrollbinding when updating the filler lines. (closes #8809)
1 parent 6631597 commit 04626c2

6 files changed

Lines changed: 86 additions & 1 deletion

File tree

‎src/diff.c‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,13 +655,17 @@ diff_redraw(
655655
int dofold) // also recompute the folds
656656
{
657657
win_T *wp;
658+
win_T *wp_other = NULL;
659+
int used_max_fill = FALSE;
658660
int n;
659661

660662
need_diff_redraw = FALSE;
661663
FOR_ALL_WINDOWS(wp)
662664
if (wp->w_p_diff)
663665
{
664666
redraw_win_later(wp, SOME_VALID);
667+
if (wp != curwin)
668+
wp_other = wp;
665669
#ifdef FEAT_FOLDING
666670
if (dofold && foldmethodIsDiff(wp))
667671
foldUpdateAll(wp);
@@ -674,10 +678,19 @@ diff_redraw(
674678
if (wp->w_topfill > n)
675679
wp->w_topfill = (n < 0 ? 0 : n);
676680
else if (n > 0 && n > wp->w_topfill)
681+
{
677682
wp->w_topfill = n;
683+
if (wp == curwin)
684+
used_max_fill = TRUE;
685+
}
678686
check_topfill(wp, FALSE);
679687
}
680688
}
689+
690+
if (wp_other != NULL && used_max_fill && curwin->w_p_scb)
691+
// The current window was set to used the maximum number of filler
692+
// lines, may need to reduce them.
693+
diff_set_topline(wp_other, curwin);
681694
}
682695

683696
static void

‎src/move.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,10 @@ changed_window_setting_win(win_T *wp)
535535
void
536536
set_topline(win_T *wp, linenr_T lnum)
537537
{
538+
#ifdef FEAT_DIFF
539+
linenr_T prev_topline = wp->w_topline;
540+
#endif
541+
538542
#ifdef FEAT_FOLDING
539543
// go to first of folded lines
540544
(void)hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL);
@@ -546,7 +550,9 @@ set_topline(win_T *wp, linenr_T lnum)
546550
wp->w_topline = lnum;
547551
wp->w_topline_was_set = TRUE;
548552
#ifdef FEAT_DIFF
549-
wp->w_topfill = 0;
553+
if (lnum != prev_topline)
554+
// Keep the filler lines when the topline didn't change.
555+
wp->w_topfill = 0;
550556
#endif
551557
wp->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_TOPLINE);
552558
// Don't set VALID_TOPLINE here, 'scrolloff' needs to be checked.

‎src/testdir/dumps/Test_diff_scroll_change_01.dump‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|6+0#0000000#5fd7ff255| @33
2+
| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|7+0#0000000#5fd7ff255| @33
3+
| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|8+0#0000000#5fd7ff255| @33
4+
| +0#0000e05#a8a8a8255@1|9+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|9+0#0000000#ffffff0| @33
5+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|0| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|0| @32
6+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0@1| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0@1| @32
7+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|2| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|2| @32
8+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|3| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|3| @32
9+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|4| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|4| @32
10+
|-+0#0000e05#a8a8a8255| |1+0#0000000#ffffff0>5| @32||+1&&|-+0#0000e05#a8a8a8255| |1+0#0000000#ffffff0|5| @32
11+
|~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
12+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
13+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
14+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
15+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
16+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
17+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
18+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
19+
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|7|,|2| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|1|5|,|2| @10|B|o|t
20+
| +0&&@74

‎src/testdir/dumps/Test_diff_scroll_change_02.dump‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|6+0#0000000#5fd7ff255| @33
2+
| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|7+0#0000000#5fd7ff255| @33
3+
| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|8+0#0000000#5fd7ff255| @33
4+
| +0#0000e05#a8a8a8255@1|9+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|9+0#0000000#ffffff0| @33
5+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|0| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|0| @32
6+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0@1| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0@1| @32
7+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|2| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|2| @32
8+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|3| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|3| @32
9+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|4| @32||+1&&| +0#0000e05#a8a8a8255@1|1+0#0000000#ffffff0|4| @32
10+
| +0#0000e05#a8a8a8255@1|1+0#0000000#ffd7ff255|5>x+2&#ff404010| +0&#ffd7ff255@31||+1&#ffffff0| +0#0000e05#a8a8a8255@1|1+0#0000000#ffd7ff255|5| @32
11+
|~+0#4040ff13#ffffff0| @35||+1#0000000&|~+0#4040ff13&| @35
12+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
13+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
14+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
15+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
16+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
17+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
18+
|~| @35||+1#0000000&|~+0#4040ff13&| @35
19+
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|7|,|3| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|1|5|,|3| @10|B|o|t
20+
| +0&&@74

‎src/testdir/test_diffmode.vim‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,6 +993,30 @@ func Test_diff_screen()
993993
call delete('XdiffSetup')
994994
endfunc
995995

996+
func Test_diff_with_scroll_and_change()
997+
CheckScreendump
998+
999+
let lines =<< trim END
1000+
call setline(1, range(1, 15))
1001+
vnew
1002+
call setline(1, range(9, 15))
1003+
windo diffthis
1004+
wincmd h
1005+
exe "normal Gl5\<C-E>"
1006+
END
1007+
call writefile(lines, 'Xtest_scroll_change')
1008+
let buf = RunVimInTerminal('-S Xtest_scroll_change', {})
1009+
1010+
call VerifyScreenDump(buf, 'Test_diff_scroll_change_01', {})
1011+
1012+
call term_sendkeys(buf, "ax\<Esc>")
1013+
call VerifyScreenDump(buf, 'Test_diff_scroll_change_02', {})
1014+
1015+
" clean up
1016+
call StopVimInTerminal(buf)
1017+
call delete('Xtest_scroll_change')
1018+
endfunc
1019+
9961020
func Test_diff_with_cursorline()
9971021
CheckScreendump
9981022

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ static char *(features[]) =
755755

756756
static int included_patches[] =
757757
{ /* Add new patch number below this line */
758+
/**/
759+
3394,
758760
/**/
759761
3393,
760762
/**/

0 commit comments

Comments
 (0)