mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 15:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0646: with 'smoothscroll' CTRL-E is wrong when 'foldmethod' set

Browse Source 
Problem:    with 'smoothscroll' set CTRL-E does not work properly when
            'foldmethod' is set to "indent". (Yee Cheng Chin)
Solution:   Merge the code for scroling with folds and 'smoothscroll'.
            (closes vim/vim#11262)

6b2d4ff714

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Luuk van Baal
2023-04-26 04:32:50 +02:00
parent 69af5e8782
commit d6050e9bda
3 changed files with 136 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,23 +31,9 @@ describe('smoothscroll', function()
it('works with <C-E> and <C-E>', function()
exec([[
call setline(1, [ 'line one', 'word '->repeat(20), 'line three', 'long word '->repeat(7), 'line', 'line', 'line', ])
set smoothscroll
set smoothscroll scrolloff=5
:5
]])
local s0 = [[
line one |
word word word word word word word word |
word word word word word word word word |
word word word word |
line three |
long word long word long word long word |
long word long word long word |
^line |
line |
line |
~ |
|
]]
local s1 = [[
word word word word word word word word |
word word word word word word word word |
@@ -94,13 +80,69 @@ describe('smoothscroll', function()
line three |
long word long word long word long word |
long word long word long word |
line |
line |
^line |
~ |
~ |
~ |
~ |
~ |
|
]]
local s5 = [[
word word word word |
line three |
long word long word long word long word |
long word long word long word |
line |
line |
^line |
~ |
~ |
~ |
~ |
|
]]
local s6 = [[
word word word word word word word word |
word word word word |
line three |
long word long word long word long word |
long word long word long word |
line |
line |
^line |
~ |
~ |
~ |
|
]]
local s7 = [[
word word word word word word word word |
word word word word word word word word |
word word word word |
line three |
long word long word long word long word |
long word long word long word |
line |
line |
^line |
~ |
~ |
|
]]
local s8 = [[
line one |
word word word word word word word word |
word word word word word word word word |
word word word word |
line three |
long word long word long word long word |
long word long word long word |
line |
line |
^line |
~ |
|
]]
@@ -113,12 +155,22 @@ describe('smoothscroll', function()
feed('<C-E>')
screen:expect(s4)
feed('<C-Y>')
screen:expect(s3)
screen:expect(s5)
feed('<C-Y>')
screen:expect(s2)
screen:expect(s6)
feed('<C-Y>')
screen:expect(s7)
feed('<C-Y>')
screen:expect(s8)
exec('set foldmethod=indent')
-- move the cursor so we can reuse the same dumps
feed('5G<C-E>')
screen:expect(s1)
feed('<C-E>')
screen:expect(s2)
feed('7G<C-Y>')
screen:expect(s7)
feed('<C-Y>')
screen:expect(s0)
screen:expect(s8)
end)
end)

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

@@ -105,6 +105,21 @@ func Test_smoothscroll_CtrlE_CtrlY()
call term_sendkeys(buf, "\<C-Y>")
call VerifyScreenDump(buf, 'Test_smoothscroll_8', {})
if has('folding')
call term_sendkeys(buf, ":set foldmethod=indent\<CR>")
" move the cursor so we can reuse the same dumps
call term_sendkeys(buf, "5G")
call term_sendkeys(buf, "\<C-E>")
call VerifyScreenDump(buf, 'Test_smoothscroll_1', {})
call term_sendkeys(buf, "\<C-E>")
call VerifyScreenDump(buf, 'Test_smoothscroll_2', {})
call term_sendkeys(buf, "7G")
call term_sendkeys(buf, "\<C-Y>")
call VerifyScreenDump(buf, 'Test_smoothscroll_7', {})
call term_sendkeys(buf, "\<C-Y>")
call VerifyScreenDump(buf, 'Test_smoothscroll_8', {})
endif
call StopVimInTerminal(buf)
endfunc