Arrows to revert changes in side by side diff editor

[Mingpan]

This PR fixes

1. Revert selected range for deleted blocks #98096, because it allows to revert a delete change.
2. Copy/replace/add left <-> right in compare views #25887 (partially), because it allows to move a change from left to right in the compare / side-by-side-diff view.

Description

This PR adds left -> right arrows in the side-by-side diff editor. When an arrow is clicked, the corresponding change will be reverted on the right hand side editor.

Breakpoints can still exist in side-by-side editor as usual. Though a breakpoint cannot be set on a line that already has an arrow.

Screencast

Example with breakpoints:

If there's anything that needs to be improved / fixed in the code, please let me know, thanks!

[hediet]

Thanks a lot for the PR!

Let's merge this and wait for feedback.
If the breakpoint thing is a blocker, we can still revert.

[Sebi2020]

@hediet does this only apply to changes made with git or to the compare view in general? You've closed #25887, but the issue targeted also the "compare selection" as far as I understand.

[Mingpan]

The feature does not depend on git. Normal compare views like "Select for compare" from the explorer right click context menu should also contain these arrows.

[tarekahf]

When it'll be released?

[AnrDaemon]

I suggest you take Insiders build and check the functionality. It could be more easily adjusted when it's still hot.

[tarekahf]

I suggest you take Insiders build and check the functionality. It could be more easily adjusted when it's still hot.

How I can do that? Can you please point me to the steps?

[alexdima]

@tarekahf You can install VS Code Insiders side-by-side with VS Code Stable.

[tarekahf]

@tarekahf You can install VS Code Insiders side-by-side with VS Code Stable.

Thanks a lot. I'll give it a try when possible. Fir now, I want to know the planned release date.

[hardyoyo]

The feature does not depend on git. Normal compare views like "Select for compare" from the explorer right click context menu should also contain these arrows.

While it is great to see VScode getting this very basic functionality for merging diffs from git, @Mingpan is correct, this is not the only glaring lack of an ability to merge diffs. The compare tool needs these arrows, too. I can't believe I have to manually copy/paste diffs when comparing files in VScode.

[Sebi2020]

@hardyoyo As far as I understood Mingpang's answer to my question this feature is also available in the normal compare tool.

[hardyoyo]

@Sebi2020 Oh! That would be cool. I'm downloading the Insiders version now, and we will see. I'll report back if this is correct.

[hardyoyo]

Can confirm, sort of, it looks like it makes an assumption about which way you'll want to be copying a diff, and when comparing files, that will require some awareness before selecting files to compare... I assume the order in which you click the files affects the direction of the arrow. Here's a sliver of a screenshot:

As you can see, the diff is presented as a deletion on one side, and an addition on the other, but you only get one arrow. Two arrows would be nice, and would be a good usability improvement.

[gulshan]

An option to switch sides in the comparison menu, when two editable files are being compared, will be helpful in this regard also, IMHO.