GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1385: inefficient loop for 'nosmoothscroll' scrolling (#33992)

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).

acf0ebe8a8
(cherry picked from commit d539a952da)
---------

Co-authored-by: luukvbaal <luukvbaal@gmail.com>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
neovim-backports[bot]
2025-05-13 10:43:25 +02:00
committed by GitHub
parent 3e83a33108
commit f623fad9c4
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/move.c
View File

@ -2424,11 +2424,16 @@ static bool scroll_with_sms(Direction dir, int count, int *curscount)
if (labs(curwin->w_topline - prev_topline) > (dir == BACKWARD)) {
fixdir = dir * -1;
}
while (curwin->w_skipcol > 0
&& curwin->w_topline < curbuf->b_ml.ml_line_count) {
scroll_redraw(fixdir == FORWARD, 1);
*curscount += (fixdir == dir ? 1 : -1);
int width1 = curwin->w_width_inner - win_col_off(curwin);
int width2 = width1 + win_col_off2(curwin);
count = 1 + (curwin->w_skipcol - width1) / width2;
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;

9
test/old/testdir/test_normal.vim
View File

@ -4339,4 +4339,13 @@ func Test_scroll_longline_scrolloff()
bwipe!
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