mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-21 09:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0753: Wrong display when typing in diff mode with 'smoothscroll' (#30614)

Browse Source 
Problem:  Wrong display when typing in diff mode with 'smoothscroll'.
Solution: Use adjust_plines_for_skipcol() (zeertzjq).

closes: vim/vim#15776

47f8584a80
This commit is contained in:
zeertzjq
2024-10-02 06:55:43 +08:00
committed by GitHub
parent 5331f87f61
commit 0e484c2041
3 changed files with 136 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,6 +375,108 @@ describe('smoothscroll', function()
screen:expect_unchanged()
end)
-- oldtest: Test_smoothscroll_diff_change_line()
it('works in diff mode when changing line', function()
screen:try_resize(55, 20)
exec([[
set diffopt+=followwrap smoothscroll
call setline(1, repeat(' abc', &columns))
call setline(2, 'bar')
call setline(3, repeat(' abc', &columns))
vnew
call setline(1, repeat(' abc', &columns))
call setline(2, 'foo')
call setline(3, 'bar')
call setline(4, repeat(' abc', &columns))
windo exe "normal! 2gg5\<C-E>"
windo diffthis
]])
screen:expect([[
{1:<<<}bc abc abc abc abc abc a│{1:<<<}bc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{7: }{22:foo }│{7: }{23:-------------------------}|
{7: }bar │{7: }^bar |
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{1:~ }│{1:~ }|*3
{2:[No Name] [+] }{3:[No Name] [+] }|
|
]])
feed('Abar')
screen:expect([[
{1:<<<}bc abc abc abc abc abc a│{1:<<<}bc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{7: }{22:foo }│{7: }{23:-------------------------}|
{7: }bar │{7: }barbar^ |
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{1:~ }│{1:~ }|*3
{2:[No Name] [+] }{3:[No Name] [+] }|
{5:-- INSERT --} |
]])
feed('<Esc>')
screen:expect([[
{1:<<<}bc abc abc abc abc abc a│{1:<<<}bc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{7: }{27:foo}{4: }│{7: }{27:barba^r}{4: }|
{7: }{22:bar }│{7: }{23:-------------------------}|
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{1:~ }│{1:~ }|*3
{2:[No Name] [+] }{3:[No Name] [+] }|
|
]])
feed('yyp')
screen:expect([[
{1:<<<}bc abc abc abc abc abc a│{1:<<<}bc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{7: }{27:foo}{4: }│{7: }{27:barbar}{4: }|
{7: }{4:bar }│{7: }{4:^bar}{27:bar}{4: }|
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc abc │{7: } abc abc abc abc abc abc |
{7: }abc abc abc abc abc abc a│{7: }abc abc abc abc abc abc a|
{7: }bc abc abc abc abc abc ab│{7: }bc abc abc abc abc abc ab|
{7: }c abc abc abc abc abc abc│{7: }c abc abc abc abc abc abc|
{7: } abc abc abc abc abc │{7: } abc abc abc abc abc |
{1:~ }│{1:~ }|*3
{2:[No Name] [+] }{3:[No Name] [+] }|
|
]])
end)
-- oldtest: Test_smoothscroll_wrap_scrolloff_zero()
it("works with zero 'scrolloff'", function()
screen:try_resize(40, 8)