Diff view shows a lot of noise caused by blank lines about neogit

[dbatten5]

Getting this issue as well. I'll add that I'm using diffview and if I run :DiffviewOpen then I don't see this issue

[miguno]

Same here. I am using diffiview.nvim, too, and I don't see this when calling :DiffviewOpen manually.

[murtaza64]

hmm... I get this both with neogit and diffview

edit: that only happens when I open diffview after opening neogit diff

[miguno]

Yes, exactly. When I open diffview separately (without going through neogit), then everything looks fine and as expected. The issue reported here happens only when I first open neogit, and then use a neogit sub-command like dd to then open diffview from neogit.

[murtaza64]

I bet this is a \n vs \r\n issue? but I'm on a mac and don't work with windows devs so 🤷

[eternity74]

I am having the same problem and I am using it on linux.
After debugging a while, looks the problem is related trim() https://github.com/NeogitOrg/neogit/blob/master/lua/neogit/lib/git/cli.lua#L1003
It seems empty line is removed by trim()
After I put {trim = false} to https://github.com/NeogitOrg/neogit/blob/master/lua/neogit/integrations/diffview.lua#L97
like
local fdata = neogit.cli.show.file(path).call_sync({ trim = false }).stdout
The problem is gone.

[eternity74]

Hmm, After applying my change, it shows empty line at the last line.
Maybe it is related to https://neovim.io/doc/user/channel.html#on_stdout

The callback is invoked immediately as data is available, where a single-item list [''] indicates EOF (stream closed).

But I'm not sure. Need to check.

[CKolkey]

lemme know if if you need any pointers ;)

[eternity74]

@CKolkey
I think the additional empty line of the file is added by EOF marker ['']
Current implementation of handle_output (https://github.com/NeogitOrg/neogit/blob/master/lua/neogit/process.lua#L285) is not handling channel.

I think if channel provides lines as below
["abc"]
[""] <-- complete line
["def"]
[""] <-- complete line
[""] <-- EOF
then stdout should be
"abc"
"def"
(EOF)
but current implementation maybe makes
"abcdef"

[eternity74]

I am trying to modify call_sync to use plenary.job instead of neogit.process.