.rightStart() - mstart, ystart, es.leftStart() - ystart); if (rd.maxLength() != 0)
RangeDifference rdi = rd[i]; log.debug( rdi.kindString() + " left " + rdi.leftStart() + "," + rdi.leftLength() + " right " + rdi.rightStart() + "," + rdi.rightLength() ); for (int k = rdi.rightStart() ; k< rdi.rightEnd() ; k++) { if (rdi.kind()==rdi.CHANGE) {
.rightStart() - mstart, ystart, es.leftStart() - ystart, astart, es .ancestorStart()
toRangeString( left, rd[x].leftStart(), rd[x].leftLength(), true ) + rd[x].kindString() + toRangeString( right, rd[x].rightStart(), rd[x].rightLength(), true ) ); for (int i=rd[x].rightStart(); i<(rd[x].rightStart()+rd[x].rightLength()); i++) {
private List<RangeDifference> preProcess(RangeDifference[] differences, int span) { List<RangeDifference> newRanges = new LinkedList<RangeDifference>(); for (int i = 0; i < differences.length; i++) { int leftStart = differences[i].leftStart(); int leftEnd = differences[i].leftEnd(); int rightStart = differences[i].rightStart(); int rightEnd = differences[i].rightEnd(); int kind = differences[i].kind(); while (i + 1 < differences.length && differences[i + 1].kind() == kind && differences[i + 1].leftStart() <= leftEnd + span && differences[i + 1].rightStart() <= rightEnd + span) { leftEnd = differences[i + 1].leftEnd(); rightEnd = differences[i + 1].rightEnd(); i++; } newRanges.add(new RangeDifference(kind, rightStart, rightEnd - rightStart, leftStart, leftEnd - leftStart)); } return newRanges; }
pdifferences.get(i).rightStart(), leftComparator, rightComparator); .leftStart(), pdifferences.get(i).leftEnd()); String rightString = rightComparator.substring(pdifferences.get(i) .rightStart(), pdifferences.get(i).rightEnd());
RangeDifference es= in[i]; rd= new RangeDifference(RangeDifference.NOCHANGE, mstart, es.rightStart() - mstart, ystart, es.leftStart() - ystart); if (rd.maxLength() != 0) out.add(rd);
RangeDifference es= in[i]; rd= factory.createRangeDifference(RangeDifference.NOCHANGE, mstart, es.rightStart() - mstart, ystart, es.leftStart() - ystart); if (rd.maxLength() != 0) out.add(rd);
.rightStart() - mstart, ystart, es.leftStart() - ystart); if (rd.maxLength() != 0)
.rightStart() - mstart, ystart, es.leftStart() - ystart); if (rd.maxLength() != 0)
RangeDifference curr= differences[i]; if (curr.kind() == RangeDifference.CHANGE && curr.rightLength() > 0) { int startLine= curr.rightStart(); int endLine= curr.rightEnd() - 1;
RangeDifference curr= differences[i]; if (curr.kind() == RangeDifference.CHANGE && curr.rightLength() > 0) { int startLine= curr.rightStart(); int endLine= curr.rightEnd() - 1;
RangeDifference es= in[i]; rd= new RangeDifference(RangeDifference.NOCHANGE, mstart, es.rightStart() - mstart, ystart, es.leftStart() - ystart, astart, es.ancestorStart() - astart); if (rd.maxLength() > 0) out.add(rd);
RangeDifference es= in[i]; rd= factory.createRangeDifference(RangeDifference.NOCHANGE, mstart, es.rightStart() - mstart, ystart, es.leftStart() - ystart, astart, es.ancestorStart() - astart); if (rd.maxLength() > 0) out.add(rd);
String left = lDoc.get(lRegion.getOffset(), leftEnd - lRegion.getOffset()); IRegion rRegion = rDoc.getLineInformation(diff.rightStart()); int rightEnd = sright.getTokenStart(diff.rightStart() + diff.rightLength()); String right = rDoc.get(rRegion.getOffset(),
private List<RangeDifference> preProcess(RangeDifference[] differences) { List<RangeDifference> newRanges = new LinkedList<RangeDifference>(); for (int i = 0; i < differences.length; i++) { int ancestorStart = differences[i].ancestorStart(); int ancestorEnd = differences[i].ancestorEnd(); int leftStart = differences[i].leftStart(); int leftEnd = differences[i].leftEnd(); int rightStart = differences[i].rightStart(); int rightEnd = differences[i].rightEnd(); int kind = differences[i].kind(); int ancestorLength = ancestorEnd - ancestorStart; int leftLength = leftEnd - leftStart; int rightLength = rightEnd - rightStart; while (i + 1 < differences.length && differences[i + 1].kind() == kind && score(leftLength, differences[i + 1].leftLength(), rightLength, differences[i + 1].rightLength()) > (differences[i + 1] .leftStart() - leftEnd)) { leftEnd = differences[i + 1].leftEnd(); rightEnd = differences[i + 1].rightEnd(); ancestorEnd = differences[i + 1].ancestorEnd(); leftLength = leftEnd - leftStart; rightLength = rightEnd - rightStart; ancestorLength = ancestorEnd - ancestorStart; i++; } newRanges.add(new RangeDifference(kind, rightStart, rightLength, leftStart, leftLength, ancestorStart, ancestorLength)); } return newRanges; }
.leftStart(), currentIndexRight, d.rightStart(), leftComparator); leftComparator, d.rightStart(), d.rightEnd()); rightComparator.markAsNew(d.rightStart(), d.rightEnd());
int leftEnd2= leftStart + getTokenEnd(sy, es.leftStart(), es.leftLength()); int rightStart2= rightStart + sm.getTokenStart(es.rightStart()); int rightEnd2= rightStart + getTokenEnd(sm, es.rightStart(), es.rightLength());
int leftEnd2= leftStart + getTokenEnd(sy, es.leftStart(), es.leftLength()); int rightStart2= rightStart + sm.getTokenStart(es.rightStart()); int rightEnd2= rightStart + getTokenEnd(sm, es.rightStart(), es.rightLength());
public TextChange createChange() throws Exception { TextChange change = oldFile == null ? new DocumentChange(label, oldDocument) : new TextFileChange(label, oldFile); // change.setSaveMode(TextFileChange.FORCE_SAVE); change.setEdit(new MultiTextEdit()); Object leftSide = new LineComparator(oldDocument); Object rightSide = new LineComparator(newDocument); RangeDifference[] differences = RangeDifferencer.findDifferences((IRangeComparator) leftSide, (IRangeComparator) rightSide); for(int i = 0; i < differences.length; i++ ) { RangeDifference curr = differences[i]; if(curr.leftLength() == 0 && curr.rightLength() == 0) continue; int rightOffset = newDocument.getLineOffset(curr.rightStart()); int rightLength = curr.rightLength() == 0 ? 0 : newDocument.getLineOffset(curr.rightEnd() - 1) - rightOffset + newDocument.getLineLength(curr.rightEnd() - 1); int leftOffset = oldDocument.getLineOffset(curr.leftStart()); int leftLength = curr.leftLength() == 0 ? 0 : oldDocument.getLineOffset(curr.leftEnd() - 1) - leftOffset + oldDocument.getLineLength(curr.leftEnd() - 1); String newText = newDocument.get(rightOffset, rightLength); addEdit(change, curr.leftStart(), new ReplaceEdit(leftOffset, leftLength, newText)); } return change; }