search

helix-editor / helix

A post-modern modal text editor.
https://helix-editor.com
Mozilla Public License 2.0
32.91k stars 2.43k forks source link

Side by side file diffing #405

Open kirawi opened 3 years ago

zbindenren commented 2 years ago

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.

sudormrfbin commented 2 years ago

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.

archseer commented 1 year ago

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

pascalkuthe commented 1 year ago

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.

LifeWorks commented 1 year ago

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

archseer commented 1 year ago

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

wh75er commented 9 months ago

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

stevenxxiu commented 9 months ago

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

Please open a separate issue for that.

Dmole commented 1 month ago

There are 2 uses cases I'd want helixdiff to handle: