IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0617: Cursor moves beyond first line of folded end of buffer (#29859)

Browse Source 
Problem:  Cursor moves beyond start of a folded range at the end of a buffer.
Solution: Move cursor to start of fold when going beyond end of buffer.
          Check that cursor moved to detect FAIL in outer cursor function.
          (Luuk van Baal)

dc373d456b
This commit is contained in:
luukvbaal 2024-07-26 00:32:54 +02:00 committed by GitHub
parent 807eb4434c
commit dd61be59af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/edit.c
View File

@ -2650,7 +2650,6 @@ void cursor_down_inner(win_T *wp, int n)
// count each sequence of folded lines as one logical line // count each sequence of folded lines as one logical line
while (n--) { while (n--) {
// Move to last line of fold, will fail if it's the end-of-file.
if (hasFoldingWin(wp, lnum, NULL, &last, true, NULL)) { if (hasFoldingWin(wp, lnum, NULL, &last, true, NULL)) {
lnum = last + 1; lnum = last + 1;
} else { } else {
@ -2673,8 +2672,10 @@ void cursor_down_inner(win_T *wp, int n)
/// @param upd_topline When true: update topline /// @param upd_topline When true: update topline
int cursor_down(int n, bool upd_topline) int cursor_down(int n, bool upd_topline)
{ {
// This fails if the cursor is already in the last line. linenr_T lnum = curwin->w_cursor.lnum;
if (n > 0 && curwin->w_cursor.lnum >= curwin->w_buffer->b_ml.ml_line_count) { // This fails if the cursor is already in the last (folded) line.
hasFoldingWin(curwin, lnum, NULL, &lnum, true, NULL);
if (n > 0 && lnum >= curwin->w_buffer->b_ml.ml_line_count) {
return FAIL; return FAIL;
} }
cursor_down_inner(curwin, n); cursor_down_inner(curwin, n);

14
test/old/testdir/test_fold.vim
View File

@ -1659,4 +1659,18 @@ func Test_foldexpr_end_fold()
bwipe! bwipe!
endfunc endfunc
" Test moving cursor down to or beyond start of folded end of buffer.
func Test_cursor_down_fold_eob()
call setline(1, range(1, 4))
norm Gzf2kj
call assert_equal(2, line('.'))
norm zojzc
call assert_equal(3, line('.'))
norm j
call assert_equal(3, line('.'))
norm k2j
call assert_equal(4, line('.'))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab