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.1.1385: inefficient loop for 'nosmoothscroll' scrolling

Browse Source 
Problem:  Loop that ensures "w_skipcol" is zero with 'nosmoothscroll'
	  for (half)-page scrolling is inefficient.
Solution: Calculate the required "count" instead of looping until
	  "w_skipcol" is zero (Luuk van Baal).

fixes: #17301
closes: #17306

Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Luuk van Baal
2025-05-12 20:45:41 +02:00
committed by Christian Brabandt
parent 13bea589a2
commit acf0ebe8a8
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/move.c
View File

@@ -3212,12 +3212,15 @@ static int scroll_with_sms(int dir, long count, long *curscount)
// extra for scrolling backward so that consuming skipcol is symmetric. // extra for scrolling backward so that consuming skipcol is symmetric.
if (labs(curwin->w_topline - prev_topline) > (dir == BACKWARD)) if (labs(curwin->w_topline - prev_topline) > (dir == BACKWARD))
fixdir = dir * -1; fixdir = dir * -1;
while (curwin->w_skipcol > 0
&& curwin->w_topline < curbuf->b_ml.ml_line_count) int width1 = curwin->w_width - curwin_col_off();
{ int width2 = width1 + curwin_col_off2();
scroll_redraw(fixdir == FORWARD, 1); count = 1 + (curwin->w_skipcol - width1) / width2;
*curscount += (fixdir == dir ? 1 : -1); if (fixdir == FORWARD)
} count = 2 + (linetabsize_eol(curwin, curwin->w_topline)
- curwin->w_skipcol - width1) / width2;
scroll_redraw(fixdir == FORWARD, count);
*curscount += count * (fixdir == dir ? 1 : -1);
} }
curwin->w_p_sms = prev_sms; curwin->w_p_sms = prev_sms;

9
src/testdir/test_normal.vim
View File

@@ -4345,4 +4345,13 @@ func Test_scroll_longline_scrolloff()
bwipe! bwipe!
endfunc endfunc
" Benchmark test for Ctrl-F with 'nosmoothscroll'
func Test_scroll_longline_benchmark()
call setline(1, ['foo'->repeat(20000)] + [''])
let start = reltime()
exe "normal! \<C-F>"
call assert_inrange(0, 0.1, reltimefloat(reltime(start)))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable " vim: shiftwidth=2 sts=2 expandtab nofoldenable

2
src/version.c
View File

@@ -704,6 +704,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 */
/**/
1385,
/**/ /**/
1384, 1384,
/**/ /**/