kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0869: Problem: curswant not set on gm in folded line (#31247)

Browse Source 
Problem:  curswant not set on gm in folded line
          (citizenmatt)
Solution: in a folded line, call update_curswant_force()

fixes: vim/vim#11596
closes: vim/vim#11994
closes: vim/vim#15398

9848face74

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-11-18 09:52:11 +08:00 committed by GitHub
parent 965dc81f81
commit 1763eddede
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/normal.c
View File

@ -5249,6 +5249,12 @@ void nv_g_home_m_cmd(cmdarg_T *cap)
curwin->w_valid &= ~VALID_WCOL;
}
curwin->w_set_curswant = true;
if (hasAnyFolding(curwin)) {
validate_cheight(curwin);
if (curwin->w_cline_folded) {
update_curswant_force();
}
}
adjust_skipcol();
}

29
test/functional/legacy/normal_spec.lua
View File

@ -102,4 +102,33 @@ describe('normal', function()
]],
})
end)
-- oldtest: Test_normal_gm()
it('gm sets curswant correctly', function()
screen:try_resize(75, 10)
exec([[
call setline(1, repeat([" abcd\tefgh\tij"], 10))
call cursor(1, 1)
]])
feed('jVjzf')
-- gm
feed('gmk')
eq(18, fn.virtcol('.'))
-- g0
feed('gj0k')
eq(1, fn.virtcol('.'))
-- g^
feed('jg^k')
eq(3, fn.virtcol('.'))
exec('call cursor(10, 1)')
-- gm
feed('gmk')
eq(18, fn.virtcol('.'))
-- g0
feed('gj0k')
eq(1, fn.virtcol('.'))
-- g^
feed('jg^k')
eq(3, fn.virtcol('.'))
end)
end)

52
test/old/testdir/test_curswant.vim
View File

@ -1,4 +1,7 @@
" Tests for curswant not changing when setting an option
" Tests for not changing curswant
source check.vim
source term_util.vim
func Test_curswant()
new
@ -19,5 +22,50 @@ func Test_curswant()
let &ttimeoutlen=&ttimeoutlen
call assert_equal(7, winsaveview().curswant)
enew!
bw!
endfunc
func Test_normal_gm()
CheckRunVimInTerminal
let lines =<< trim END
call setline(1, repeat([" abcd\tefgh\tij"], 10))
call cursor(1, 1)
END
call writefile(lines, 'XtestCurswant', 'D')
let buf = RunVimInTerminal('-S XtestCurswant', #{rows: 10})
if has("folding")
call term_sendkeys(buf, "jVjzf")
" gm
call term_sendkeys(buf, "gmk")
call term_sendkeys(buf, ":echo virtcol('.')\<cr>")
call WaitFor({-> term_getline(buf, 10) =~ '^18\s\+'})
" g0
call term_sendkeys(buf, "jg0k")
call term_sendkeys(buf, ":echo virtcol('.')\<cr>")
call WaitFor({-> term_getline(buf, 10) =~ '^1\s\+'})
" g^
call term_sendkeys(buf, "jg^k")
call term_sendkeys(buf, ":echo virtcol('.')\<cr>")
call WaitFor({-> term_getline(buf, 10) =~ '^3\s\+'})
endif
call term_sendkeys(buf, ":call cursor(10, 1)\<cr>")
" gm
call term_sendkeys(buf, "gmk")
call term_sendkeys(buf, ":echo virtcol('.')\<cr>")
call term_wait(buf)
call WaitFor({-> term_getline(buf, 10) =~ '^18\s\+'})
" g0
call term_sendkeys(buf, "g0k")
call term_sendkeys(buf, ":echo virtcol('.')\<cr>")
call WaitFor({-> term_getline(buf, 10) =~ '^1\s\+'})
" g^
call term_sendkeys(buf, "g^k")
call term_sendkeys(buf, ":echo virtcol('.')\<cr>")
call WaitFor({-> term_getline(buf, 10) =~ '^3\s\+'})
" clean up
call StopVimInTerminal(buf)
wincmd p
wincmd c
endfunc
" vim: shiftwidth=2 sts=2 expandtab