nyx/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-03-30 22:46:45 +02:00
Code Issues1 Projects Releases Packages Wiki Activity Actions3

patch 9.0.1568: with 'smoothscroll' cursor may move below botline

Browse source 
Problem:    With 'smoothscroll' cursor may move below botline.
Solution:   Call redraw_later() if needed,  Compute cursor row with adjusted
            condition. (Luuk van Baal, closes )
This commit is contained in:
Luuk van Baal 2023-05-19 14:04:47 +01:00 • committed by Bram Moolenaar
parent d13c254d10
commit d49f646bf5
9 changed files with 75 additions and 9 deletions

7
src/move.c
View file

@ -519,6 +519,8 @@ update_topline(void)
// When 'smoothscroll' is not set, should reset w_skipcol.
if (!curwin->w_p_sms)
reset_skipcol();
else if (curwin->w_skipcol != 0)
redraw_later(UPD_SOME_VALID);
// May need to set w_skipcol when cursor in w_topline.
if (curwin->w_cursor.lnum == curwin->w_topline)
@ -892,10 +894,11 @@ curs_rows(win_T *wp)
--i; // hold at inserted lines
}
if (valid
&& (lnum != wp->w_topline || (wp->w_skipcol == 0
#ifdef FEAT_DIFF
&& (lnum != wp->w_topline || !wp->w_p_diff)
&& !wp->w_p_diff
#endif
)
)))
{
#ifdef FEAT_FOLDING
lnum = wp->w_lines[i].wl_lastlnum + 1;

8
src/testdir/dumps/Test_smooth_incsearch_1.dump Normal file
View file

@ -0,0 +1,8 @@
|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
| +0#af5f00255&|1|2| | +0#0000000&@35
| +0#af5f00255&|1|3| | +0#0000000&@35
| +0#af5f00255&|1|4| |b+1#0000000&|b+0&&@2| @31
| +0#af5f00255&|1|5| | +0#0000000&@35
| +0#af5f00255&|1|6| | +0#0000000&@35
| +0#af5f00255&|1|7| | +0#0000000&@35
|/|b> @37

8
src/testdir/dumps/Test_smooth_incsearch_2.dump Normal file
View file

@ -0,0 +1,8 @@
|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
| +0#af5f00255&|1|2| | +0#0000000&@35
| +0#af5f00255&|1|3| | +0#0000000&@35
| +0#af5f00255&|1|4| |b+1#0000000&@1|b+0&&@1| @31
| +0#af5f00255&|1|5| | +0#0000000&@35
| +0#af5f00255&|1|6| | +0#0000000&@35
| +0#af5f00255&|1|7| | +0#0000000&@35
|/|b@1> @36

8
src/testdir/dumps/Test_smooth_incsearch_3.dump Normal file
View file

@ -0,0 +1,8 @@
|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
| +0#af5f00255&|1|2| | +0#0000000&@35
| +0#af5f00255&|1|3| | +0#0000000&@35
| +0#af5f00255&|1|4| |b+1#0000000&@2|b+0&&| @31
| +0#af5f00255&|1|5| | +0#0000000&@35
| +0#af5f00255&|1|6| | +0#0000000&@35
| +0#af5f00255&|1|7| | +0#0000000&@35
|/|b@2> @35

8
src/testdir/dumps/Test_smooth_incsearch_4.dump Normal file
View file

@ -0,0 +1,8 @@
|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
| +0#af5f00255&|1|2| | +0#0000000&@35
| +0#af5f00255&|1|3| | +0#0000000&@35
| +0#af5f00255&|1|4| |b+1#0000000&@3| +0&&@31
| +0#af5f00255&|1|5| | +0#0000000&@35
| +0#af5f00255&|1|6| | +0#0000000&@35
| +0#af5f00255&|1|7| | +0#0000000&@35
|/|b@3> @34

6
src/testdir/dumps/Test_smooth_wrap_2.dump
View file

@ -1,8 +1,8 @@
|L+0&#ffffff0|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h|
|<+0#4040ff13#ffffff0@2|h+0#0000000&| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10
|L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h|
|s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t|
|w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10
>L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h|
|s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t|
|w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10
|@+0#4040ff13&@2| @36
| +0#0000000&@21|4|,|1| @10|4|0|%|
@22|4|,|1| @10|2|5|%|

4
src/testdir/dumps/Test_smooth_wrap_4.dump
View file

@ -2,7 +2,7 @@
|L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h|
|s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t|
|w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10
|L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h|
>L|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h|
|s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t|
>w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10
|w|i|t|h| |s|o|m|e| |t|e|x|t| |w|i|t|h| |s|o|m|e| |t|e|x|t| @10
@22|7|,|1| @10|B|o|t|

33
src/testdir/test_scroll_opt.vim
View file

@ -257,11 +257,14 @@ func Test_smoothscroll_wrap_scrolloff_zero()
call term_sendkeys(buf, "G")
call VerifyScreenDump(buf, 'Test_smooth_wrap_4', {})
" moving cursor up right after the >>> marker - no need to show whole line
call term_sendkeys(buf, "4\<C-Y>G")
call VerifyScreenDump(buf, 'Test_smooth_wrap_4', {})
" moving cursor up right after the <<< marker - no need to show whole line
call term_sendkeys(buf, "2gj3l2k")
call VerifyScreenDump(buf, 'Test_smooth_wrap_5', {})
" moving cursor up where the >>> marker is - whole top line shows
" moving cursor up where the <<< marker is - whole top line shows
call term_sendkeys(buf, "2j02k")
call VerifyScreenDump(buf, 'Test_smooth_wrap_6', {})
@ -705,4 +708,30 @@ func Test_smoothscroll_eob()
call StopVimInTerminal(buf)
endfunc
" skipcol should not reset when doing incremental search on the same word
func Test_smoothscroll_incsearch()
CheckScreendump
let lines =<< trim END
set smoothscroll number scrolloff=0 incsearch
call setline(1, repeat([''], 20))
call setline(11, repeat('a', 100))
call setline(14, 'bbbb')
END
call writefile(lines, 'XSmoothIncsearch', 'D')
let buf = RunVimInTerminal('-S XSmoothIncsearch', #{rows: 8, cols:40})
call term_sendkeys(buf, "/b")
call VerifyScreenDump(buf, 'Test_smooth_incsearch_1', {})
call term_sendkeys(buf, "b")
call VerifyScreenDump(buf, 'Test_smooth_incsearch_2', {})
call term_sendkeys(buf, "b")
call VerifyScreenDump(buf, 'Test_smooth_incsearch_3', {})
call term_sendkeys(buf, "b")
call VerifyScreenDump(buf, 'Test_smooth_incsearch_4', {})
call term_sendkeys(buf, "\<CR>")
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View file

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