MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

lst: do not create trimmable ranges in smart mode

Browse Source 
They can be trimmable because we ignore whitespaces, thus " \n" vs "" can mark first lines as equal.
In this case we can't reuse existing changes and have to recalculate changes.

Actually, let's recalculate changes always, as it greatly simplifies code and performance gains are not clear.
This commit is contained in:
Aleksey Pivovarov
2016-07-14 16:59:52 +03:00
parent 6b61d6de74
commit 9c9d5bb50a
1 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java
+54 -50
View File
@@ -18,7 +18,6 @@ package com.intellij.openapi.vcs.ex;
import com.intellij.diff.comparison.ByLine;
import com.intellij.diff.comparison.ComparisonPolicy;
import com.intellij.diff.comparison.TrimUtil;
import com.intellij.diff.comparison.iterables.DiffIterable;
import com.intellij.diff.comparison.iterables.DiffIterableUtil;
import com.intellij.diff.comparison.iterables.FairDiffIterable;
import com.intellij.diff.util.DiffUtil;
@@ -27,7 +26,6 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.progress.DumbProgressIndicator;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vcs.ex.Range.InnerRange;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.diff.FilesTooBigForDiffException;
import org.jetbrains.annotations.NotNull;
@@ -69,7 +67,7 @@ public class RangesBuilder {
int vcsShift) throws FilesTooBigForDiffException {
FairDiffIterable iterable = ByLine.compare(vcs, current, ComparisonPolicy.DEFAULT, DumbProgressIndicator.INSTANCE);
List<Range> result = new ArrayList<Range>();
List<Range> result = new ArrayList<>();
for (com.intellij.diff.util.Range range : iterable.iterateChanges()) {
int vcsLine1 = vcsShift + range.start1;
int vcsLine2 = vcsShift + range.end1;
@@ -106,7 +104,7 @@ public class RangesBuilder {
rangeBuilder.flushChange();
}
else {
rangeBuilder.markChangedWhitespaces(vcsIndex, currentIndex);
rangeBuilder.markChanged(vcsIndex, currentIndex);
}
}
}
@@ -124,10 +122,12 @@ public class RangesBuilder {
private final int myCurrentShift;
private final int myVcsShift;
@NotNull private final List<Range> myRanges = new ArrayList<>();
@NotNull private final List<Range> myResult = new ArrayList<>();
private com.intellij.diff.util.Range change;
private ArrayList<InnerRange> innerRanges;
private int vcsLine1 = -1;
private int vcsLine2 = -1;
private int currentLine1 = -1;
private int currentLine2 = -1;
public RangeBuilder(@NotNull List<String> current,
@NotNull List<String> vcs,
@@ -140,66 +140,70 @@ public class RangesBuilder {
}
public void flushChange() {
if (change == null) return;
if (vcsLine1 == -1) return;
for (InnerRange range : innerRanges) {
range.shift(myCurrentShift);
}
innerRanges.trimToSize();
int forward = TrimUtil.expandForward(myVcs, myCurrent, vcsLine1, currentLine1, vcsLine2, currentLine2);
vcsLine1 += forward;
currentLine1 += forward;
int currentLine1 = myCurrentShift + change.start2;
int currentLine2 = myCurrentShift + change.end2;
int vcsLine1 = myVcsShift + change.start1;
int vcsLine2 = myVcsShift + change.end1;
myRanges.add(new Range(currentLine1, currentLine2, vcsLine1, vcsLine2, innerRanges));
int backward = TrimUtil.expandBackward(myVcs, myCurrent, vcsLine1, currentLine1, vcsLine2, currentLine2);
vcsLine2 -= backward;
currentLine2 -= backward;
change = null;
innerRanges = null;
List<String> vcs = myVcs.subList(vcsLine1, vcsLine2);
List<String> current = myCurrent.subList(currentLine1, currentLine2);
List<InnerRange> inner = calcInnerRanges(vcs, current, myCurrentShift + currentLine1);
myResult.add(new Range(myCurrentShift + currentLine1, myCurrentShift + currentLine2,
myVcsShift + vcsLine1, myVcsShift + vcsLine2,
inner));
currentLine1 = -1;
currentLine2 = -1;
vcsLine1 = -1;
vcsLine2 = -1;
}
public void markChangedWhitespaces(int vcsIndex, int currentIndex) {
appendChangedLine(vcsIndex, vcsIndex + 1, currentIndex, currentIndex + 1);
appendInnerEquals(vcsIndex, vcsIndex + 1, currentIndex, currentIndex + 1);
public void markChanged(int vcsIndex, int currentIndex) {
markChanged(vcsIndex, vcsIndex + 1, currentIndex, currentIndex + 1);
}
public void markChanged(int vcsStart, int vcsEnd, int currentStart, int currentEnd) {
appendChangedLine(vcsStart, vcsEnd, currentStart, currentEnd);
appendInnerChange(vcsStart, vcsEnd, currentStart, currentEnd);
if (vcsLine1 == -1) {
vcsLine1 = vcsStart;
vcsLine2 = vcsEnd;
currentLine1 = currentStart;
currentLine2 = currentEnd;
}
else {
assert vcsStart == vcsLine2;
assert currentStart == currentLine2;
vcsLine2 = vcsEnd;
currentLine2 = currentEnd;
}
}
@NotNull
public List<Range> finish() {
flushChange();
return myRanges;
return myResult;
}
}
private void appendChangedLine(int vcsStart, int vcsEnd, int currentStart, int currentEnd) {
if (change == null) {
change = new com.intellij.diff.util.Range(vcsStart, vcsEnd, currentStart, currentEnd);
innerRanges = new ArrayList<>();
}
else {
assert vcsStart == change.end1;
assert currentStart == change.end2;
change = new com.intellij.diff.util.Range(change.start1, vcsEnd, change.start2, currentEnd);
}
}
@NotNull
private static List<InnerRange> calcInnerRanges(@NotNull List<String> vcs, @NotNull List<String> current, int startOffset) {
ArrayList<InnerRange> result = new ArrayList<>();
FairDiffIterable iwIterable = ByLine.compare(vcs, current, ComparisonPolicy.IGNORE_WHITESPACES, DumbProgressIndicator.INSTANCE);
for (Pair<com.intellij.diff.util.Range, Boolean> pair : DiffIterableUtil.iterateAll(iwIterable)) {
com.intellij.diff.util.Range range = pair.first;
Boolean equals = pair.second;
private void appendInnerChange(int vcsStart, int vcsEnd, int currentStart, int currentEnd) {
byte type = getChangeType(vcsStart, vcsEnd, currentStart, currentEnd);
innerRanges.add(new InnerRange(currentStart, currentEnd, type));
}
private void appendInnerEquals(int vcsStart, int vcsEnd, int currentStart, int currentEnd) {
InnerRange last = ContainerUtil.getLastItem(innerRanges);
if (last == null || last.getType() != Range.EQUAL) {
innerRanges.add(new InnerRange(currentStart, currentEnd, Range.EQUAL));
}
else {
assert currentStart == last.getLine2();
innerRanges.set(innerRanges.size() - 1, new InnerRange(last.getLine1(), currentEnd, Range.EQUAL));
}
byte type = equals ? Range.EQUAL : getChangeType(range.start1, range.end1, range.start2, range.end2);
result.add(new InnerRange(range.start2 + startOffset, range.end2 + startOffset, type));
}
result.trimToSize();
return result;
}
private static byte getChangeType(int vcsStart, int vcsEnd, int currentStart, int currentEnd) {