fix(fold): cursor is incorrect with screenrow motions on folded line

Fix #22232

src/nvim/normal.c

@@ -2534,6 +2534,7 @@ static bool nv_screengo(oparg_T *oap, int dir, long dist)
  }
  }
 
+ foldAdjustCursor(); // Adjust for when cursor has landed on a closed fold
  if (virtual_active() && atend) {
  coladvance(MAXCOL);
  } else {

test/functional/ui/fold_spec.lua

@@ -1975,6 +1975,49 @@ describe("folded lines", function()
  ]])
  end
  end)
+
+ it('cursorline highlight is applied correctly with gj/gk', function()
+ funcs.setline(1, 'line 1')
+ funcs.setline(2, 'line 2')
+ funcs.setline(3, 'line 3')
+ funcs.setline(4, 'line 4')
+ command('set number cursorline')
+ feed("zfjjgk")
+ if multigrid then
+ screen:expect([[
+ ## grid 1
+ [2:---------------------------------------------]|
+ [2:---------------------------------------------]|
+ [2:---------------------------------------------]|
+ [2:---------------------------------------------]|
+ [2:---------------------------------------------]|
+ [2:---------------------------------------------]|
+ [2:---------------------------------------------]|
+ [3:---------------------------------------------]|
+ ## grid 2
+ {9: 1 }{12:^+-- 2 lines: line 1·····················}|
+ {8: 3 }line 3 |
+ {8: 4 }line 4 |
+ {1:~ }|
+ {1:~ }|
+ {1:~ }|
+ {1:~ }|
+ ## grid 3
+ |
+ ]])
+ else
+ screen:expect([[
+ {9: 1 }{12:^+-- 2 lines: line 1·····················}|
+ {8: 3 }line 3 |
+ {8: 4 }line 4 |
+ {1:~ }|
+ {1:~ }|
+ {1:~ }|
+ {1:~ }|
+ |
+ ]])
+ end
+ end)
  end
 
  describe("with ext_multigrid", function()