mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 22:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0734: cursor position invalid when scrolling with 'smoothscroll'

Browse Source 
Problem:    Cursor position invalid when scrolling with 'smoothscroll' set.
            (Ernie Rael)
Solution:   Add w_valid_skipcol and clear flags when it changes.  Adjust
            w_skipcol after moving the cursor.

2fbabd238a

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Luuk van Baal
2023-04-26 22:32:38 +02:00
parent 36c98b47a3
commit bf12a85a69
6 changed files with 130 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/functional/legacy/scroll_opt_spec.lua
View File

@@ -428,14 +428,36 @@ describe('smoothscroll', function()
|
]])
-- 'scrolloff' set to 2, scrolling down, cursor moves screen line up
feed('<C-E>gjgj<C-Y>')
feed('<C-E>gj<C-Y>')
screen:expect_unchanged()
end)
-- oldtest: Test_smoothscroll_one_long_line()
it("scrolls correctly when moving the cursor", function()
screen:try_resize(40, 6)
exec([[
call setline(1, 'with lots of text '->repeat(7))
set smoothscroll scrolloff=0
]])
local s1 = [[
^with lots of text with lots of text with|
lots of text with lots of text with lot|
s of text with lots of text with lots of|
text |
~ |
|
]]
screen:expect(s1)
feed('<C-E>')
screen:expect([[
<<<of text with lots of text with lots o|
f text with lots of text with lots of te|
xt with l^ots of text with lots of text w|
ith lots of text with lots of text with |
lots of text with lots of text with lots|
<<<ts of text with lots of text with lot|
^s of text with lots of text with lots of|
text |
~ |
~ |
|
]])
feed('0')
screen:expect(s1)
end)
end)

21
test/old/testdir/test_scroll_opt.vim
View File

@@ -265,5 +265,26 @@ func Test_smoothscroll_wrap_long_line()
call StopVimInTerminal(buf)
endfunc
func Test_smoothscroll_one_long_line()
CheckScreendump
let lines =<< trim END
vim9script
setline(1, 'with lots of text '->repeat(7))
set smoothscroll scrolloff=0
END
call writefile(lines, 'XSmoothOneLong', 'D')
let buf = RunVimInTerminal('-S XSmoothOneLong', #{rows: 6, cols: 40})
call VerifyScreenDump(buf, 'Test_smooth_one_long_1', {})
call term_sendkeys(buf, "\<C-E>")
call VerifyScreenDump(buf, 'Test_smooth_one_long_2', {})
call term_sendkeys(buf, "0")
call VerifyScreenDump(buf, 'Test_smooth_one_long_1', {})
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab