mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 03:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.5155: in diff mode windows may get out of sync

Browse Source 
Problem:    In diff mode windows may get out of sync. (Gary Johnson)
Solution:   Avoid that the other window scrolls for 'cursorbind'.
a315ce1f32
This commit is contained in:
zeertzjq
2022-07-25 19:12:06 +08:00
parent e12c62c1f7
commit 611b43369e
3 changed files with 165 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
test/functional/ui/diff_spec.lua
View File

@@ -6,6 +6,7 @@ local clear = helpers.clear
local command = helpers.command
local insert = helpers.insert
local write_file = helpers.write_file
local dedent = helpers.dedent
local exec = helpers.exec
describe('Diff mode screen', function()
@@ -985,6 +986,93 @@ int main(int argc, char **argv)
]])
end)
end)
-- oldtest: Test_diff_scroll()
-- This was scrolling for 'cursorbind' but 'scrollbind' is more important
it('scrolling works correctly vim-patch:8.2.5155', function()
screen:try_resize(40, 12)
write_file(fname, dedent([[
line 1
line 2
line 3
line 4
// Common block
// one
// containing
// four lines
// Common block
// two
// containing
// four lines]]), false)
write_file(fname_2, dedent([[
line 1
line 2
line 3
line 4
Lorem
ipsum
dolor
sit
amet,
consectetur
adipiscing
elit.
Etiam
luctus
lectus
sodales,
dictum
// Common block
// one
// containing
// four lines
Vestibulum
tincidunt
aliquet
nulla.
// Common block
// two
// containing
// four lines]]), false)
reread()
feed('<C-W><C-W>jjjj')
screen:expect([[
{1: }line 1 │{1: }line 1 |
{1: }line 2 │{1: }line 2 |
{1: }line 3 │{1: }line 3 |
{1: }line 4 │{1: }line 4 |
{1: } │{1: }^ |
{1: }{2:-----------------}│{1: }{4:Lorem }|
{1: }{2:-----------------}│{1: }{4:ipsum }|
{1: }{2:-----------------}│{1: }{4:dolor }|
{1: }{2:-----------------}│{1: }{4:sit }|
{1: }{2:-----------------}│{1: }{4:amet, }|
{3:<nal-diff-screen-1 }{7:<al-diff-screen-1.2 }|
:e |
]])
feed('j')
screen:expect([[
{1: }line 1 │{1: }line 1 |
{1: }line 2 │{1: }line 2 |
{1: }line 3 │{1: }line 3 |
{1: }line 4 │{1: }line 4 |
{1: } │{1: } |
{1: }{2:-----------------}│{1: }{4:^Lorem }|
{1: }{2:-----------------}│{1: }{4:ipsum }|
{1: }{2:-----------------}│{1: }{4:dolor }|
{1: }{2:-----------------}│{1: }{4:sit }|
{1: }{2:-----------------}│{1: }{4:amet, }|
{3:<nal-diff-screen-1 }{7:<al-diff-screen-1.2 }|
:e |
]])
end)
end)
it('win_update redraws lines properly', function()
@@ -1227,6 +1315,7 @@ it('Align the filler lines when changing text in diff mode', function()
]]}
end)
-- oldtest: Test_diff_binary()
it('diff mode works properly if file contains NUL bytes vim-patch:8.2.3925', function()
clear()
local screen = Screen.new(40, 20)