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

IDEA-151702 diff: optimize chunks by searching for an unimportant line in inserted/deleted fragment

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-02-17 12:13:36 +03:00
committed by Aleksey Pivovarov
parent 7384fdf517
commit a327fffeec
2 changed files with 87 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/comparison/ChunkOptimizer.java
+56 -9
View File
@@ -24,6 +24,7 @@ import com.intellij.diff.util.Side;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.util.registry.Registry;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -226,21 +227,59 @@ abstract class ChunkOptimizer<T> {
@Override
protected int getShift(@NotNull Side touchSide, int equalForward, int equalBackward, @NotNull Range range1, @NotNull Range range2) {
Integer shift;
shift = getUnchangedBoundaryShift(touchSide, equalForward, equalBackward, range1, range2, 0);
if (shift != null) return shift;
shift = getChangedBoundaryShift(touchSide, equalForward, equalBackward, range1, range2, 0);
if (shift != null) return shift;
shift = getUnchangedBoundaryShift(touchSide, equalForward, equalBackward, range1, range2, myThreshold);
if (shift != null) return shift;
shift = getChangedBoundaryShift(touchSide, equalForward, equalBackward, range1, range2, myThreshold);
if (shift != null) return shift;
return 0;
}
/**
* search for an empty line boundary in unchanged lines
* ie: we want insertion/deletion to go right before/after of an empty line
*/
@Nullable
private Integer getUnchangedBoundaryShift(@NotNull Side touchSide,
int equalForward, int equalBackward,
@NotNull Range range1, @NotNull Range range2,
int threshold) {
List<Line> touchLines = touchSide.select(myData1, myData2);
int touchStart = touchSide.select(range2.start1, range2.start2);
int shiftForward = findNextUnimportantLine(touchLines, touchStart, equalForward + 1, 0);
int shiftBackward = findPrevUnimportantLine(touchLines, touchStart - 1, equalBackward + 1, 0);
int shiftForward = findNextUnimportantLine(touchLines, touchStart, equalForward + 1, threshold);
int shiftBackward = findPrevUnimportantLine(touchLines, touchStart - 1, equalBackward + 1, threshold);
if (shiftForward == -1 && shiftBackward == -1 && myThreshold != 0) {
shiftForward = findNextUnimportantLine(touchLines, touchStart, equalForward + 1, myThreshold);
shiftBackward = findPrevUnimportantLine(touchLines, touchStart - 1, equalBackward + 1, myThreshold);
}
return getShift(shiftForward, shiftBackward);
}
if (shiftForward == 0 || shiftBackward == 0) return 0;
if (shiftForward == -1 && shiftBackward == -1) return 0;
/**
* search for an empty line boundary in changed lines
* ie: we want insertion/deletion to start/end with an empty line
*/
@Nullable
private Integer getChangedBoundaryShift(@NotNull Side touchSide,
int equalForward, int equalBackward,
@NotNull Range range1, @NotNull Range range2,
int threshold) {
Side nonTouchSide = touchSide.other();
List<Line> nonTouchLines = nonTouchSide.select(myData1, myData2);
int changeStart = nonTouchSide.select(range1.end1, range1.end2);
int changeEnd = nonTouchSide.select(range2.start1, range2.start2);
return shiftForward != -1 ? shiftForward : -shiftBackward;
int shiftForward = findNextUnimportantLine(nonTouchLines, changeStart, equalForward + 1, threshold);
int shiftBackward = findPrevUnimportantLine(nonTouchLines, changeEnd - 1, equalBackward + 1, threshold);
return getShift(shiftForward, shiftBackward);
}
private static int findNextUnimportantLine(@NotNull List<Line> lines, int offset, int count, int threshold) {
@@ -256,5 +295,13 @@ abstract class ChunkOptimizer<T> {
}
return -1;
}
@Nullable
private static Integer getShift(int shiftForward, int shiftBackward) {
if (shiftForward == -1 && shiftBackward == -1) return null;
if (shiftForward == 0 || shiftBackward == 0) return 0;
return shiftForward != -1 ? shiftForward : -shiftBackward;
}
}
}
platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt
+31
View File
@@ -288,6 +288,37 @@ class LineComparisonUtilTest : ComparisonUtilTestBase() {
}
}
fun `test prefer chunks bounded by short line`() {
lines {
("A====_B====_o====_o====_Y====_Z====_!_A====_B====_z====_z====_Y====_Z====" -
"A====_B====_o====_o====_Y====_Z====_!_A====_B====_u====_u====_Y====_Z====_!_A====_B====_z====_z====_Y====_Z====")
default(ins(7, 7, 7))
testAll()
}
lines {
("A====_B====_o====_o====_Y====_Z====_ _A====_B====_!_!_Y====_Z====" -
"A====_B====_o====_o====_Y====_Z====_ _A====_B====_u====_u====_Y====_Z====_ _A====_B====_!_!_Y====_Z====")
default(ins(7, 7, 7))
testAll()
}
lines {
("A====_B====_o====_o====_Y====_Z====_!_A====_B====_ _ _Y====_Z====" -
"A====_B====_o====_o====_Y====_Z====_!_A====_B====_u====_u====_Y====_Z====_!_A====_B====_ _ _Y====_Z====")
default(ins(9, 9, 7))
testAll()
}
}
fun `test prefer chunks bounded by empty line - using inserted content`() {
lines {
("e_x_A_B_z" - "x_A_B_ _q_A_B_z")
default(del(0, 0, 1), ins(4, 3, 4))
testAll()
}
}
fun `test prefer smaller amount of chunks`() {
lines() {
("X_A_X_Y_" - "X_Y_")