mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-01-24 05:40:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(diff): fix incorrect item size of dout_ga (#34338)

Browse Source 
Related 267494151b
This commit is contained in:
zeertzjq
2025-06-06 12:34:28 +08:00
committed by GitHub
parent 552983515f
commit 60d0b7d0c3
4 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2800,3 +2800,39 @@ it('diff mode inline highlighting with 3 buffers', function()
command('diffthis')
screen:expect(s6)
end)
it('diff mode algorithm:histogram and inline:char with long lines #34329', function()
local screen = Screen.new(55, 20)
exec([[
set diffopt=internal,filler,closeoff,algorithm:histogram,inline:char
cd test/functional/fixtures/diff/
args inline_char_file1 inline_char_file2
vert all | windo diffthis | 1wincmd w
]])
screen:expect([[
{7: }{27:^aaaa,aaaaaaaa,aaaaaaaaaa,}│{7: }{27:bbbb,bbbbbbbb,bbbbbbbbbb,}|
{7: }{27:aaaaaaa-aaaaaaaaa-aaaaaa-}│{7: }{27:bbbbbbb-bbbbbbbbb-bbbbbb-}|*11
{1:~ }│{1:~ }|*6
{3:inline_char_file1 }{2:inline_char_file2 }|
|
]])
n.assert_alive()
feed('G$')
screen:expect([[
{7: }{4: }│{7: }{4: }|
{7: }{27:aa,aa,aa,aa,aa,a,a}{4:" }│{7: }{27:,bb,bb,bb,bb,bb,b,b}{4:" }|
{7: }{27:,aa,aa,aa,aa,aa,a}{4:" }│{7: }{27:b,bb,bb,bb,bb,bb,bb,b}{4:" }|
{7: }{27:,aa,aa,aa,aa,aa}{4:" }│{7: }{27:bb,bb,bb,bb,bb,bb,bb,bb}{4:" }|
{7: }{27:a,aa,aa,aa,aa}{4:" }│{7: }{27:,bb,b,bb,bb,bb}{4:" }|
{7: }{27:aa,aa,aa,aa,aa}{4:" }│{7: }{27:,bb,bb}{4:" }|
{7: }{27:a,a,a}{4:" }│{7: }{27:b,b,b,b,b}{4:" }|
{7: }{27:a,a,a,a,a}{4:" }│{7: }{27:,b,b,b,b,b}{4:" }|
{7: }{27:aa,a,a,a,a,a,a}{4:" }│{7: }{27:b,b,b,b,b,b}{4:" }|
{7: }{27:,aa,aa,a,a,a,a,a}{4:" }│{7: }{27:bb,b,b,b,b,b}{4:" }|
{7: }{27:aa,aa,aa,aa,a,a,a,a}{4:" }│{7: }{27:bb,bb,bb,b,b,b,b}{4:" }|
{7: }{27:,aa,aa,a,a,a}{4:^" }│{7: }{27:bb,bb,bb,bb,b,b,b}{4:" }|
{1:~ }│{1:~ }|*6
{3:inline_char_file1 }{2:inline_char_file2 }|
|
]])
end)