helix icon indicating copy to clipboard operation
helix copied to clipboard

Side by side file diffing

Open kirawi opened this issue 4 years ago • 9 comments

kirawi avatar Jul 03 '21 07:07 kirawi

Maybe delta can help in that case: https://github.com/dandavison/delta

It is the best terminal diff viewer I ever used and it is also written in rust.

zbindenren avatar Apr 04 '22 07:04 zbindenren

Delta is a pager that acts on already diffed data (with - and + prepended to diffed lines like in the default git diff output) and simply applies syntax highlighting and better colors it. We will have to use similar for this, which we already use in helix to :reload the file from disk.

sudormrfbin avatar Apr 04 '22 17:04 sudormrfbin

@pascalkuthe mentioned he'll probably pick up the work on this in the future after git gutter is merged.

archseer avatar Nov 21 '22 03:11 archseer

After #3890 is merged, the main blocker will be rendering the diffs side by side (as a form of virtual text). I am working with @kirawi to land the necessary changes in the rendering system to make that happen.

pascalkuthe avatar Nov 21 '22 03:11 pascalkuthe

Is this feature available in the current version? I see it is open, so I assume I still can not diff two buffers?

LifeWorks avatar Apr 07 '23 15:04 LifeWorks

Yes, open issues typically indicate that a feature hasn't been implemented yet.

archseer avatar Apr 07 '23 16:04 archseer

Hello! Would it be possible to use inline git diff in one buffer? It would be amazing

wh75er avatar Dec 20 '23 18:12 wh75er

Hello! Would it be possible to use inline git diff in one buffer? It would be amazing

Please open a separate issue for that.

stevenxxiu avatar Dec 20 '23 19:12 stevenxxiu