Garbled diff view

[fleimgruber]

This is a follow-up from https://github.com/Cretezy/lazyjj/issues/39#issuecomment-2404794252

Specifically, the second bullet point from OP where I inspected more and found that the garbled mix results from scrolling through the list of modified files (in pane 2) so it seems to me that the diff view pane is not cleared properly of the scrolled-from file and thus some parts of that diff linger around and get mixed into the diff of the scrolled-to file.

[Cretezy]

I think this is fixed in newer releases. Could you test again?

[dotdash]

I currently have a repo state locally that messes up both the log and the diff view if a certain line is selected in the log view. I'll try to have a look.

[fleimgruber]

I tested the diff view with 0.5.0 and it did work on Linux, but does not on Windows.

[dotdash]

@fleimgruber Ah! Your comment about it not working on Windows should have been a dead giveaway, but it being broken for me on Linux too was a red herring that deterred me. The issue is with CRLF line endings. Commits 896c07c678ceda0c827da701a8a51c765e61e1f8 and 7b81ee8087b8fc607c7f2cb2105e5c3f4873682d, for example, are what breaks the output for me, and they have CRLF line endings in their commit messages. I, by chance, had noticed that the extra whitespace in the left pane matches up with the stuff that's left behind in the right pane, and now it all makes sense, the carriage return moves the cursor to the left and then the wrong stuff gets erased 😅

[Cretezy]

Here's the relevant fix: https://github.com/ratatui/ansi-to-tui/pull/56

[Cretezy]

Can you try https://github.com/Cretezy/lazyjj/pull/117 if possible and confirm if that fixes it?

[dotdash]

That works for me