mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-16 03:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1018: v9.1.0743 causes regression with diff mode (#32047)

Browse Source 
Problem:  v9.1.0743 causes regression with diff mode
Solution: Fix the regression with overlapping regions

closes: vim/vim#16454

01f6509fb2

Co-authored-by: Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
This commit is contained in:
zeertzjq
2025-01-16 09:16:25 +08:00
committed by GitHub
parent 524be56042
commit 718e165360
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2044,6 +2044,26 @@ it('diff mode overlapped diff blocks will be merged', function()
{2:Xdifile1 Xdifile2 }{3:Xdifile3 }|
|
]])
WriteDiffFiles3('a\nb\nc', 'd\ne', 'b\nf')
screen:expect([[
{7: }{27:a}{4: }│{7: }{27:d}{4: }│{7: }{27:^b}{4: }|
{7: }{27:b}{4: }│{7: }{27:e}{4: }│{7: }{27:f}{4: }|
{7: }{22:c }│{7: }{23:---------}│{7: }{23:---------}|
{1:~ }│{1:~ }│{1:~ }|*15
{2:Xdifile1 Xdifile2 }{3:Xdifile3 }|
|
]])
WriteDiffFiles3('a\nb\nc', 'd\ne', 'b')
screen:expect([[
{7: }{27:a}{4: }│{7: }{27:d}{4: }│{7: }{27:^b}{4: }|
{7: }{27:b}{4: }│{7: }{27:e}{4: }│{7: }{23:---------}|
{7: }{22:c }│{7: }{23:---------}│{7: }{23:---------}|
{1:~ }│{1:~ }│{1:~ }|*15
{2:Xdifile1 Xdifile2 }{3:Xdifile3 }|
|
]])
end)
-- oldtest: Test_diff_topline_noscroll()