mirror of
https://github.com/neovim/neovim.git
synced 2025-09-07 11:58:17 +00:00
e21423bb35
Problem: "zb" does not reveal filler lines at the start of a buffer.
Scrolled cursor position with 'smoothscroll' is unpredictable,
and may reset skipcol later if it is not visible (after v9.1.258)
Solution: Replace confusing for loop that reaches final control value too
early with while loop. Set "w_curswant" accordingly so cursor
will be placed in visible part of topline.
(Luuk van Baal)
bd28cae1f1
105 lines
3.3 KiB
Lua
105 lines
3.3 KiB
Lua
local t = require('test.functional.testutil')(after_each)
|
|
local Screen = require('test.functional.ui.screen')
|
|
local clear = t.clear
|
|
local exec = t.exec
|
|
local feed = t.feed
|
|
local api = t.api
|
|
local eq = t.eq
|
|
local fn = t.fn
|
|
|
|
describe('normal', function()
|
|
local screen
|
|
|
|
before_each(function()
|
|
clear()
|
|
screen = Screen.new(40, 19)
|
|
screen:attach()
|
|
end)
|
|
|
|
-- oldtest: Test_normal_j_below_botline()
|
|
it([[no skipped lines with "j" scrolling below botline and 'foldmethod' not "manual"]], function()
|
|
exec([[
|
|
set number foldmethod=diff scrolloff=0
|
|
call setline(1, map(range(1, 9), 'repeat(v:val, 200)'))
|
|
norm Lj
|
|
]])
|
|
screen:expect([[
|
|
{8: 2 }222222222222222222222222222222222222|
|
|
{8: }222222222222222222222222222222222222|*4
|
|
{8: }22222222222222222222 |
|
|
{8: 3 }333333333333333333333333333333333333|
|
|
{8: }333333333333333333333333333333333333|*4
|
|
{8: }33333333333333333333 |
|
|
{8: 4 }^444444444444444444444444444444444444|
|
|
{8: }444444444444444444444444444444444444|*4
|
|
{8: }44444444444444444444 |
|
|
|
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_single_line_scroll()
|
|
it('(Half)-page scroll up or down reveals virtual lines #19605, #27967', function()
|
|
fn.setline(1, 'foobar one two three')
|
|
exec('set smoothscroll')
|
|
local ns = api.nvim_create_namespace('')
|
|
api.nvim_buf_set_extmark(0, ns, 0, 0, {
|
|
virt_lines = { { { '---', 'IncSearch' } } },
|
|
virt_lines_above = true,
|
|
})
|
|
-- Nvim: not actually necessary to scroll down to hide the virtual line.
|
|
-- Check topfill instead of skipcol and show the screen state.
|
|
feed('<C-E>')
|
|
eq(0, fn.winsaveview().topfill)
|
|
local s1 = [[
|
|
^foobar one two three |
|
|
{1:~ }|*17
|
|
|
|
|
]]
|
|
screen:expect(s1)
|
|
feed('<C-B>')
|
|
eq(1, fn.winsaveview().topfill)
|
|
local s2 = [[
|
|
{2:---} |
|
|
^foobar one two three |
|
|
{1:~ }|*16
|
|
|
|
|
]]
|
|
screen:expect(s2)
|
|
feed('<C-E>')
|
|
eq(0, fn.winsaveview().topfill)
|
|
screen:expect(s1)
|
|
feed('<C-U>')
|
|
eq(1, fn.winsaveview().topfill)
|
|
screen:expect(s2)
|
|
|
|
-- Nvim: also test virt_lines below the last line
|
|
feed('yy100pG<C-L>')
|
|
api.nvim_buf_set_extmark(0, ns, 100, 0, { virt_lines = { { { '---', 'IncSearch' } } } })
|
|
screen:expect({
|
|
grid = [[
|
|
foobar one two three |*17
|
|
^foobar one two three |
|
|
|
|
|
]],
|
|
})
|
|
feed('<C-F>')
|
|
screen:expect({
|
|
grid = [[
|
|
^foobar one two three |
|
|
{2:---} |
|
|
{1:~ }|*16
|
|
|
|
|
]],
|
|
})
|
|
feed('ggG<C-D>')
|
|
screen:expect({
|
|
grid = [[
|
|
foobar one two three |*16
|
|
^foobar one two three |
|
|
{2:---} |
|
|
|
|
|
]],
|
|
})
|
|
end)
|
|
end)
|