This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 183017 - [69cat] incorrect diff
Summary: [69cat] incorrect diff
Status: RESOLVED DUPLICATE of bug 182810
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 6.x
Hardware: PC Linux
: P2 normal (vote)
Assignee: Tomas Stupka
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-28 17:06 UTC by gholmer
Modified: 2010-04-07 11:52 UTC (History)
2 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
changed code in editor (8.42 KB, image/png)
2010-03-28 17:07 UTC, gholmer
Details
changed code in diff view (21.26 KB, image/png)
2010-03-28 17:07 UTC, gholmer
Details
screenshot (35.20 KB, image/png)
2010-04-06 12:06 UTC, gholmer
Details

Note You need to log in before you can comment on or make changes to this bug.
Description gholmer 2010-03-28 17:06:34 UTC
[ BUILD # : 201003270201 ]
[ JDK VERSION : 1.6.* ]

See attached screenshots.  The first shows a source file where line 21 was
changed. The blue  highlight is on line 23. The second screenshot shows the
diff view of the same code. It appears to have to do with the fact that the
font for the line numbers in the gutter does not line up with the font for the
editor itself (which I have set to Lucida Sans Typewriter 10 point).
Comment 1 gholmer 2010-03-28 17:07:16 UTC
Created attachment 96104 [details]
changed code in editor
Comment 2 gholmer 2010-03-28 17:07:43 UTC
Created attachment 96105 [details]
changed code in diff view
Comment 3 Ondrej Vrabec 2010-03-30 18:16:00 UTC
This is actually a regression caused by recent changes in editor, reassigning back to editor.
Comment 4 David Strupl 2010-04-02 18:34:16 UTC
This should be fixed by Mila's 
http://hg.netbeans.org/jet-main/rev/71f839ae7563
If it is still wron please reopen.
Comment 5 Michel Graciano 2010-04-05 18:14:05 UTC
It is working for me. Build 100405-ba96ec22818f
Comment 6 gholmer 2010-04-06 12:05:58 UTC
Still seeing problems with 0406 build, see attached screenshot.
Comment 7 gholmer 2010-04-06 12:06:39 UTC
Created attachment 96759 [details]
screenshot
Comment 8 David Strupl 2010-04-06 19:31:50 UTC
Glen, any chance you have line wrap turned on in Options --> Editor --> Formatting --> Line Wrap? If I turn line wrap on I can see something similar to what you can see ...
Comment 9 gholmer 2010-04-06 19:41:18 UTC
No, line wrap is off.  Does the fact that I switched from the default font to Lucida Typewriter have anything to do with it?
Comment 10 David Strupl 2010-04-07 11:49:12 UTC
Althouth the behaviour regressed after Mila's rewrite (I added the status whiteboard for this) I would like to ask the vcs/diff guys to check it after consulting with Mila what APIs should be called to determine vertical positions in the editor. Thank a lot for helping us with this problem.
Comment 11 Ondrej Vrabec 2010-04-07 11:52:00 UTC
should be fixed (see bug 182810)

*** This bug has been marked as a duplicate of bug 182810 ***