From 60d0b7d0c3f727f32d29e1fc8a9a32dcf4fefbfa Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 6 Jun 2025 12:34:28 +0800
Subject: fix(diff): fix incorrect item size of dout_ga (#34338)

Related https://github.com/neovim/neovim/commit/267494151bcc6e4fff7b9b8c80b7a5f42e2aa002
---
 test/functional/ui/diff_spec.lua | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'test/functional/ui/diff_spec.lua')

diff --git a/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua
index 21174eaa45..c5310ce27e 100644
--- a/test/functional/ui/diff_spec.lua
+++ b/test/functional/ui/diff_spec.lua
@@ -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)
-- 
cgit