intellij-community icon indicating copy to clipboard operation
intellij-community copied to clipboard

[WIP] Pull intellij-diff-plugin into the tree

Open SamB opened this issue 3 years ago • 0 comments
trafficstars

This is an attempt to merge https://github.com/ThomasR/intellij-diff-plugin into the platform.

The primary reason for this is that I couldn't figure out how to associate a language with the PATCH filetype without adding a language attribute to the fileType element that declares the filetype and changing the FileType class, which seems ... impractical for an independent plugin to do. If I had a way to accomplish this by just modifying the plugin, I probably would.

(The biggest reason to want this on the actual PATCH filetype instead of just adding another is that the PATCH filetype has that Apply Patch action.)

However, it would also be nice to customize the colors for diff highlighting in various themes (but this PR doesn't actually do that).

N.B. Unfortunately, I didn't write the plugin, so I can't actually sign your CLA for that code, though I will note that the code is already Apache 2.0 licensed.

P.S. I would have rebased this, but that merge is ... too hard to rebase. I've already screwed up many times while trying to rebase it once (I can't even remember if I succeeded in the end); I really don't wanna screw it up again. Fortunately, it only touches four existing files and seems to merge cleanly.

SamB avatar Jun 19 '22 21:06 SamB