mirror of
https://github.com/neovim/neovim.git
synced 2025-11-04 09:44:31 +00:00
5887ecab6d
Problem: Display wrong when moving cursor to above the top line and
'smoothscroll' is set.
Solution: Call adjust_skipcol() in more places and make it work better.
(Luuk van Baal, closes vim/vim#12395)
798fa76dbf
343 lines
14 KiB
Lua
343 lines
14 KiB
Lua
local helpers = require('test.functional.helpers')(after_each)
|
|
|
|
local Screen = require('test.functional.ui.screen')
|
|
local clear = helpers.clear
|
|
local exec = helpers.exec
|
|
local feed = helpers.feed
|
|
local command = helpers.command
|
|
|
|
describe('display', function()
|
|
before_each(clear)
|
|
|
|
-- oldtest: Test_display_scroll_at_topline()
|
|
it('scroll when modified at topline vim-patch:8.2.1488', function()
|
|
local screen = Screen.new(20, 4)
|
|
screen:attach()
|
|
screen:set_default_attr_ids({
|
|
[1] = {bold = true},
|
|
})
|
|
|
|
command([[call setline(1, repeat('a', 21))]])
|
|
feed('O')
|
|
screen:expect([[
|
|
^ |
|
|
aaaaaaaaaaaaaaaaaaaa|
|
|
a |
|
|
{1:-- INSERT --} |
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_display_scroll_update_visual()
|
|
it('scrolling when modified at topline in Visual mode vim-patch:8.2.4626', function()
|
|
local screen = Screen.new(60, 8)
|
|
screen:attach()
|
|
screen:set_default_attr_ids({
|
|
[1] = {bold = true}, -- ModeMsg
|
|
[2] = {background = Screen.colors.LightGrey}, -- Visual
|
|
[3] = {background = Screen.colors.Grey, foreground = Screen.colors.DarkBlue}, -- SignColumn
|
|
})
|
|
|
|
exec([[
|
|
set scrolloff=0
|
|
call setline(1, repeat(['foo'], 10))
|
|
call sign_define('foo', { 'text': '>' })
|
|
call sign_place(1, 'bar', 'foo', bufnr(), { 'lnum': 2 })
|
|
call sign_place(2, 'bar', 'foo', bufnr(), { 'lnum': 1 })
|
|
autocmd CursorMoved * if getcurpos()[1] == 2 | call sign_unplace('bar', { 'id': 1 }) | endif
|
|
]])
|
|
feed('VG7kk')
|
|
screen:expect([[
|
|
{3: }^f{2:oo} |
|
|
{3: }foo |
|
|
{3: }foo |
|
|
{3: }foo |
|
|
{3: }foo |
|
|
{3: }foo |
|
|
{3: }foo |
|
|
{1:-- VISUAL LINE --} |
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_matchparen_clear_highlight()
|
|
it('matchparen highlight is cleared when switching buffer', function()
|
|
local screen = Screen.new(20, 5)
|
|
screen:set_default_attr_ids({
|
|
[0] = {bold = true, foreground = Screen.colors.Blue},
|
|
[1] = {background = Screen.colors.Cyan},
|
|
})
|
|
screen:attach()
|
|
|
|
local screen1 = [[
|
|
{1:^()} |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
|
|
|
]]
|
|
local screen2 = [[
|
|
^aa |
|
|
{0:~ }|
|
|
{0:~ }|
|
|
{0:~ }|
|
|
|
|
|
]]
|
|
|
|
exec([[
|
|
source $VIMRUNTIME/plugin/matchparen.vim
|
|
set hidden
|
|
call setline(1, ['()'])
|
|
normal 0
|
|
]])
|
|
screen:expect(screen1)
|
|
|
|
exec([[
|
|
enew
|
|
exe "normal iaa\<Esc>0"
|
|
]])
|
|
screen:expect(screen2)
|
|
|
|
feed('<C-^>')
|
|
screen:expect(screen1)
|
|
|
|
feed('<C-^>')
|
|
screen:expect(screen2)
|
|
end)
|
|
|
|
local function run_test_display_lastline(euro)
|
|
local screen = Screen.new(75, 10)
|
|
screen:set_default_attr_ids({
|
|
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
|
|
[2] = {bold = true, reverse = true}, -- StatusLine
|
|
[3] = {reverse = true}, -- StatusLineNC
|
|
})
|
|
screen:attach()
|
|
exec([[
|
|
call setline(1, ['aaa', 'b'->repeat(200)])
|
|
set display=truncate
|
|
|
|
vsplit
|
|
100wincmd <
|
|
]])
|
|
local fillchar = '@'
|
|
if euro then
|
|
command('set fillchars=lastline:€')
|
|
fillchar = '€'
|
|
end
|
|
screen:expect((([[
|
|
^a│aaa |
|
|
a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
b│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
|
b│{1:~ }|
|
|
b│{1:~ }|
|
|
b│{1:~ }|
|
|
{1:@}│{1:~ }|
|
|
{2:< }{3:[No Name] [+] }|
|
|
|
|
|
]]):gsub('@', fillchar)))
|
|
|
|
command('set display=lastline')
|
|
screen:expect_unchanged()
|
|
|
|
command('100wincmd >')
|
|
screen:expect((([[
|
|
^aaa │a|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb │b|
|
|
{1:~ }│b|
|
|
{1:~ }│b|
|
|
{1:~ }│b|
|
|
{1:~ }│{1:@}|
|
|
{2:[No Name] [+] }{3:<}|
|
|
|
|
|
]]):gsub('@', fillchar)))
|
|
|
|
command('set display=truncate')
|
|
screen:expect_unchanged()
|
|
|
|
command('close')
|
|
command('3split')
|
|
screen:expect((([[
|
|
^aaa |
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
{1:@@@ }|
|
|
{2:[No Name] [+] }|
|
|
aaa |
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
|
{3:[No Name] [+] }|
|
|
|
|
|
]]):gsub('@', fillchar)))
|
|
|
|
command('close')
|
|
command('2vsplit')
|
|
screen:expect((([[
|
|
^aa│aaa |
|
|
a │bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
|
bb│{1:~ }|
|
|
bb│{1:~ }|
|
|
bb│{1:~ }|
|
|
{1:@@}│{1:~ }|
|
|
{2:< }{3:[No Name] [+] }|
|
|
|
|
|
]]):gsub('@', fillchar)))
|
|
end
|
|
|
|
-- oldtest: Test_display_lastline()
|
|
it('display "lastline" works correctly', function()
|
|
run_test_display_lastline()
|
|
end)
|
|
it('display "lastline" works correctly with multibyte fillchar', function()
|
|
run_test_display_lastline(true)
|
|
end)
|
|
|
|
-- oldtest: Test_display_long_lastline()
|
|
it('"lastline" shows correct text when end of wrapped line is deleted', function()
|
|
local screen = Screen.new(35, 14)
|
|
screen:attach()
|
|
exec([[
|
|
set display=lastline smoothscroll scrolloff=0
|
|
call setline(1, [
|
|
\'aaaaa'->repeat(150),
|
|
\'bbbbb '->repeat(7) .. 'ccccc '->repeat(7) .. 'ddddd '->repeat(7)
|
|
\])
|
|
]])
|
|
feed('736|')
|
|
screen:expect([[
|
|
<<<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
^aaaaaaaaaaaaaaa |
|
|
|
|
|
]])
|
|
-- The correct part of the last line is moved into view.
|
|
feed('D')
|
|
screen:expect([[
|
|
<<<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa^a|
|
|
bbbbb bbbbb bbbbb bbbbb bbbbb bb@@@|
|
|
|
|
|
]])
|
|
-- "w_skipcol" does not change because the topline is still long enough
|
|
-- to maintain the current skipcol.
|
|
feed('g04l11gkD')
|
|
screen:expect([[
|
|
<<<^a |
|
|
bbbbb bbbbb bbbbb bbbbb bbbbb bbbbb|
|
|
bbbbb ccccc ccccc ccccc ccccc cccc|
|
|
c ccccc ccccc ddddd ddddd ddddd ddd|
|
|
dd ddddd ddddd ddddd |
|
|
~ |
|
|
~ |
|
|
~ |
|
|
~ |
|
|
~ |
|
|
~ |
|
|
~ |
|
|
~ |
|
|
|
|
|
]])
|
|
-- "w_skipcol" is reset to bring the entire topline into view because
|
|
-- the line length is now smaller than the current skipcol + marker.
|
|
feed('x')
|
|
screen:expect([[
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
|
|
aa^a |
|
|
bbbbb bbbbb bbbbb bbbbb bbbbb bbbbb|
|
|
bbbbb ccccc ccccc ccccc ccccc cccc|
|
|
c ccccc ccccc ddddd ddddd ddddd @@@|
|
|
|
|
|
]])
|
|
end)
|
|
|
|
-- oldtest: Test_display_cursor_long_line()
|
|
it("correctly shows line that doesn't fit in the window", function()
|
|
local screen = Screen.new(75, 8)
|
|
screen:attach()
|
|
exec([[
|
|
call setline(1, ['a', 'b ' .. 'bbbbb'->repeat(150), 'c'])
|
|
norm $j
|
|
]])
|
|
screen:expect([[
|
|
<<<bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
b^b |
|
|
|
|
|
]])
|
|
-- FIXME: moving the cursor above the topline does not set w_skipcol
|
|
-- correctly with cpo+=n and zero scrolloff (curs_columns() extra == 1).
|
|
exec('set number cpo+=n scrolloff=0')
|
|
feed('$0')
|
|
screen:expect([[
|
|
<<<b^bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
|
|
|
]])
|
|
-- Going to the start of the line with "b" did not set w_skipcol correctly with 'smoothscroll'.
|
|
exec('set smoothscroll')
|
|
feed('$b')
|
|
screen:expect([[
|
|
2 b ^bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
|
|
|
]])
|
|
-- Same for "ge".
|
|
feed('$ge')
|
|
screen:expect([[
|
|
2 ^b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
|
|
|
|
|
]])
|
|
end)
|
|
end)
|