DiffFile v1.4

Build 4 is available at:

http://www.intellij.org/twiki/bin/view/Main/DiffFilePlugin

Changes since v1.3:

- Again basing my work on a look at the source
of Mike Aizatsky's StarTeam plugin DiffWindow, I have
been able to work around the copy and find button bug.
(See IntelliJ Tracker #2612.)
- Removed some erroneous copyright notices. (Leftovers
from a new class template. Oops.)

Other than keeping up with changes to the OpenAPI are there any requests
for enhancements/changes? If not, it may be a while before the next
release. I can't think of anthing that's really necessary for my
personal use that isn't in the plugin now.


~Mike

2 comments
Comment actions Permalink

Hi Mike, thanks for the plugin,

Other than keeping up with changes to the OpenAPI are there any requests
for enhancements/changes? If not, it may be a while before the next
release. I can't think of anthing that's really necessary for my
personal use that isn't in the plugin now.


so asked, I'd have some wishes,

  • If possible, run diff on two files selected simultaneously from the

file chooser.

  • Part or all of the functionality asked for the original vcs diff in

http://www.intellij.net/tracker/idea/viewSCR?publicId=8289

Merry Christmas,
Karsten
--
Karsten Tinnefeld tinnefeld@adesso.de
adesso AG
Stockholmer Allee 24 T +49 231 9309211
44269 Dortmund, Deutschland M +49 172 4542646 F +49 231 9309331

0
Comment actions Permalink

Karsten,

Thanks for letting me know your "wishes".

First I want to make sure I understand your first item. You want to be
able to pick two files to diff against each other without regard to what
is in the current editor? If so, I have to wonder why you find it
necessary. Here's my reasoning:
- The CtrlN or CtrlShift+N functionality in IDEA can open
the first file in the editor, significantly faster than
finding it via a file chooser.
- The file chooser dialog that pops up when you run the
DiffFile plugin's action starts in the same directory as
the editor file.
- Therefore, it should be much easier to do things the way
they are now.
Is that not the case for you, or are you wanting something different?
The only thing I can think of is that you're wanting to do a diff on two
files when neither is in your project. That might be valid. If so, I'll
consider supporting it soon. (It's a busy time so not it will be into
the new year before I get it done.) It would likely be an action with no
default shortcut so that only those that use it will map it.

As for SCR 8289... for the first part (highlighting differences within
lines that have changed), I don't think there is much I can do. I am
simply using the widget provided by IDEA to display the diff. The widget
takes care of finding the diffs and how they are displayed.

The second part (merge functionality) might be possible if I can get
access to the differences in some way. However, I don't think that has
been made part of the OpenAPI as yet. Perhaps it is part of the PSI that
is avalible but unsupported -- I'll have to check -- but I doubt it. As
something of a poor work-around, you can use copy-and-paste with the
ability to click on the line number to go to that line. So, you would
select the diff you'd like added in and copy using the copy toolbar
button or Ctrl+C, then click on the line number where you'd like to
insert the text. The diff window would disappear and you could paste the
text into the editor.

I think the thing to do is to vote for SCR 2458 and probably post a
new one for the merge functionality since 8289 has been marked as a
duplicate which will likely keep it from getting done any time soon.


~Mike

Karsten Tinnefeld <tinnefeld@adesso.de> wrote in
news:audfm8$lt0$1@is.intellij.net:

Hi Mike, thanks for the plugin,

>> Other than keeping up with changes to the OpenAPI are there any
>> requests for enhancements/changes? If not, it may be a while before
>> the next release. I can't think of anthing that's really necessary
>> for my personal use that isn't in the plugin now.


so asked, I'd have some wishes,

  • If possible, run diff on two files selected simultaneously from the

file chooser.

  • Part or all of the functionality asked for the original vcs diff in

http://www.intellij.net/tracker/idea/viewSCR?publicId=8289

Merry Christmas,
Karsten


0

Please sign in to leave a comment.