Description Manja Nelius 2007-12-03 03:40:35 EST

Created attachment 84294 [details]
screen shot: diff infos ok vs not ok

attachment upper part:
the shown infos are ok for the selected diff and the cursor position

attachment lower part:
the infos for the selected diff at the END of the file and the cursor position at the END of the line are NOT shown correctly

fix - see line 1242 in TextMergeViewer, method overlaps:

   1237   boolean overlaps(MergeSourceViewer w, int start, int end) {
   1238        Position h= getPosition(w);
   1239        if (h != null) {
   1240           int ds= h.getOffset();
   1241           int de= ds + h.getLength();
   1242           if ((start < de) && (end >= ds))
     --> must be: if ((start <= de) && (end >= ds))
   1243              return true;	
   1244        }
   1245        return false;
   1246   }