Possibility of adding another diff view


I love having full editor capabilities available while in the diff view. Especially nice when fixing merge conflicts and errors are higlighted!

There is one thing, though, that I would like to change, and that is how the diff is rendered. Here is a db table diff, one of the great new features in 10.5:
Quite easy to see what has changed, but the problem is how missing or added lines are rendered: it does not scale well:
Screen shot 2011-09-14 at 10.51.45 .png
The screenshot above was taken from a diff of a quite large change in a relatively small build.gradle file. It is very hard to see the relationships between changes on the left hand side and on the right hand side.

Compare this to the Blocks mode of Kaleidoscope:

Or what is done in Beyond Compare:
Here there are no squiggly lines to mark what is related, but instead missing lines are simply marked as "not there". This scales infitively better and makes it much easier to work with big changes.

Beyond Compare also has another nice feature which shows a diff of the active line below the main diff view. Having the lines above each other makes it easier to spot differences and makes it possible to see all of longer lines without vertical scrolling.

Would it be possible to implement this "Blocks" diff view in IntelliJ IDEA? Of course this would be best as an option where one could choose the implementation :-)

Stig Kleppe-Jørgensen

Comment actions Permalink

Hello Stig, I like what you have suggested!
Thank you!
Though I can not say when we can implement it
I've created an issue to track it: IDEA-74511

Comment actions Permalink

Hi Irina,

That sounds very good!

Is this something that would be implemented as a plugin, or are there no APIs around this code?



Please sign in to leave a comment.