Wrapped lines alignment

[juliogarciap]

Hello!

First of all, thank you for this awesome plugin!

I noticed something that vscode manages to handle pretty effectively and was wondering if there could be a solution

Notice how line 7 in left split is one line down compared to right split

In vscode is properly aligned, i guess they add extra "blank" lines

I already tried with every diffopt combination and didn't manage to solve it

Thank you in advanced

[Gelio]

I suppose this could be solved by neovim/neovim#14537 which would match the lines in a better way.

Aside from that, I am not sure if a Lua plugin can help with diff buffers. They rely on the core (neo)vim functionality and plugins have little control over the way the diff is presented, as far as I know. This is the conclusion I came to in #9.

[sindrets]

@jgarciaokode There is realistically not much I can do about this here. I don't want to start inserting and managing virtual lines in the diff buffers in order to align wrapped lines. In my opinion this should be addressed as a feature request upstream.

There are a few half-measures you could consider though:

• Disable wrap in the diff buffers.
• Close the file panel while viewing diffs. This will give you some additional horizontal space.
• Use the horizontally split layout by setting set diffopts+=horizontal. This would give you a lot more horizontal space for each diff window.

@Gelio Unfortunately I don't thing the linked PR will help with this problem. The problem is that the diff-mode only operates on actual lines, and does not account for offsets produced by wrapped lines.

[juliogarciap]

I understand @sindrets, thank your for your quick response.

[jborbik]

Do you think there is a way to automatically disable wrap in the diff buffers but keep wrap as default otherwise?

[sindrets]

@jendker Yes. See the diff_buf_read hook example under :h diffview-config-hooks.