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

fix(move): 'scrolloff' cursor correction no longer handles folds properly (#32642)

Browse Source 
Problem:  f58e7d5f passed `&botline` to `plines_win_full()`, (probably)
          assuming it would be set to the first line of the fold.
Solution: Reinstate call to `hasFolding()` to do so.
This commit is contained in:
luukvbaal
2025-02-27 08:52:19 +01:00
committed by GitHub
parent 1e4c708033
commit f86864f22f
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/move.c
View File

@ -2294,7 +2294,8 @@ void cursor_correct(win_T *wp)
int below = wp->w_filler_rows; // screen lines below botline
while ((above < above_wanted || below < below_wanted) && topline < botline) {
if (below < below_wanted && (below <= above || above >= above_wanted)) {
below += plines_win_full(wp, botline, &botline, NULL, true, true);
below += plines_win_full(wp, botline, NULL, NULL, true, true);
hasFolding(wp, botline, &botline, NULL);
botline--;
}
if (above < above_wanted && (above < below || below >= below_wanted)) {

2
src/nvim/plines.c
View File

@ -884,7 +884,7 @@ int plines_win_col(win_T *wp, linenr_T lnum, long column)
///
/// @param[in] wp window the line is in
/// @param[in] lnum line number
/// @param[out] nextp if not NULL, the line after a fold
/// @param[out] nextp if not NULL, the last line of a fold
/// @param[out] foldedp if not NULL, whether lnum is on a fold
/// @param[in] cache whether to use the window's cache for folds
/// @param[in] limit_winheight when true limit to window height

19
test/functional/ui/fold_spec.lua
View File

@ -2744,4 +2744,23 @@ describe('folded lines', function()
describe('without ext_multigrid', function()
with_ext_multigrid(false)
end)
it("do not interfere with corrected cursor position for 'scrolloff'", function()
local screen = Screen.new(40, 7)
exec([[
call setline(1, range(10))
6,7fold
set scrolloff=1
norm L
]])
screen:expect([[
0 |
1 |
2 |
3 |
^4 |
{13:+-- 2 lines: 5·························}|
|
]])
end)
end)