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 181135 - Disappeared highlights in the merge resolver
Summary: Disappeared highlights in the merge resolver
Status: RESOLVED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 6.x
Hardware: All All
: P2 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords: REGRESSION
Depends on:
Blocks:
 
Reported: 2010-02-24 07:03 UTC by Ondrej Vrabec
Modified: 2010-03-09 03:44 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
disappeared highlighting (42.76 KB, image/png)
2010-02-24 07:05 UTC, Ondrej Vrabec 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Ondrej Vrabec 2010-02-24 07:03:31 UTC 
Merge resolver doesn't highlight critical areas with conflicts as it did in 6.8
Probably caused by changes in http://hg.netbeans.org/main/diff/f1fdee5a67f3/editor.lib/src/org/netbeans/editor/GuardedDocument.java.
We should use the Highlighting SPI to fix this.
Comment 1 Ondrej Vrabec 2010-02-24 07:05:11 UTC 
Created attachment 94476 [details]
disappeared highlighting
Comment 2 Ondrej Vrabec 2010-03-09 03:44:40 UTC 
fix: http://hg.netbeans.org/cdev/rev/8c145939a53e