Skip to content

The Unified and Autonomous Development Platform

Fix issue #911 - Word diff presentation change?

Robin Shen490aac73df7e
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java b/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java
index a6b2993890..22cc865d1e 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java
@@ -2,7 +2,6 @@ package io.onedev.server.util.diff;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Nullable;
@@ -33,27 +32,22 @@ public class DiffRenderer {
if (i+1<diffBlocks.size()) {
DiffBlock<String> nextBlock = diffBlocks.get(i+1);
if (nextBlock.getOperation() == Operation.INSERT) {
- LinkedHashMap<Integer, LineDiff> lineChanges =
- DiffUtils.align(block.getElements(), nextBlock.getElements());
- int prevDeleteLineIndex = 0;
- int prevInsertLineIndex = 0;
- for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {
- int deleteLineIndex = entry.getKey();
- LineDiff lineChange = entry.getValue();
- int insertLineIndex = lineChange.getCompareLine();
-
- appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,
- prevInsertLineIndex, insertLineIndex);
-
- appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,
- lineChange.getDiffBlocks());
-
- prevDeleteLineIndex = deleteLineIndex+1;
- prevInsertLineIndex = insertLineIndex+1;
+ LinkedHashMap<Integer, List<DiffBlock<String>>> lineDiffs =
+ DiffUtils.diffLines(block.getElements(), nextBlock.getElements());
+ for (int j=0; j<block.getElements().size(); j++) {
+ List<DiffBlock<String>> lineDiff = lineDiffs.get(j);
+ if (lineDiff != null)
+ appendDelete(builder, block, j, lineDiff);
+ else
+ appendDelete(builder, block, j, null);
+ }
+ for (int j=0; j<nextBlock.getElements().size(); j++) {
+ List<DiffBlock<String>> lineDiff = lineDiffs.get(j);
+ if (lineDiff != null)
+ appendInsert(builder, nextBlock, j, lineDiff);
+ else
+ appendInsert(builder, nextBlock, j, null);
}
- appendDeletesAndInserts(builder, block, nextBlock,
- prevDeleteLineIndex, block.getElements().size(),
- prevInsertLineIndex, nextBlock.getElements().size());
i++;
} else {
for (int j=0; j<block.getElements().size(); j++)
@@ -72,15 +66,6 @@ public class DiffRenderer {
return builder.toString();
}
- private void appendDeletesAndInserts(StringBuilder builder, DiffBlock<String> deleteBlock,
- DiffBlock<String> insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,
- int fromInsertLineIndex, int toInsertLineIndex) {
- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
- appendDelete(builder, deleteBlock, i, null);
- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
- appendInsert(builder, insertBlock, i, null);
- }
-
private String getOperationClass(Operation operation) {
if (operation == Operation.INSERT)
return "insert";
@@ -182,25 +167,4 @@ public class DiffRenderer {
builder.append("</tr>");
}
- private void appendModification(StringBuilder builder, DiffBlock<String> deleteBlock,
- DiffBlock<String> insertBlock, int deleteLineIndex, int insertLineIndex,
- List<DiffBlock<String>> tokenDiffs) {
- builder.append("<tr class='code original'>");
-
- int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;
- int newLineNo = insertBlock.getNewStart() + insertLineIndex;
- builder.append("<td class='operation old new'>*</td>");
- builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<String> tokenBlock: tokenDiffs) {
- for (String token: tokenBlock.getElements())
- builder.append(toHtml(token, getOperationClass(tokenBlock.getOperation())));
- }
- }
- builder.append("</td>");
- builder.append("</tr>");
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java b/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
index bacb6e39c3..e78a45eb7f 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
@@ -21,8 +21,6 @@ import io.onedev.server.util.diff.DiffMatchPatch.Operation;
public class DiffUtils {
- private static final int CHANGE_CALC_TIMEOUT = 100;
-
public static final int MAX_DIFF_SIZE = 65535;
private static final Pattern WORD_PATTERN = Pattern.compile("\\w+");
@@ -113,26 +111,16 @@ public class DiffUtils {
});
}
- /**
- * This method checks deleted lines and inserted lines, and position them so that
- * similar delete line and insert line (indicates they are the same line with
- * modification) will be displayed on same row
- * @param deleteLines
- * @param insertLines
- * @return
- */
- public static LinkedHashMap<Integer, LineDiff> align(List<String> deleteLines, List<String> insertLines) {
- LinkedHashMap<Integer, LineDiff> lineDiffs = new LinkedHashMap<>();
+ public static LinkedHashMap<Integer, List<DiffBlock<String>>> diffLines(List<String> deleteLines, List<String> insertLines) {
+ LinkedHashMap<Integer, List<DiffBlock<String>>> lineDiffs = new LinkedHashMap<>();
DiffMatchPatch dmp = new DiffMatchPatch();
- long time = System.currentTimeMillis();
- int nextInsert = 0;
for (int i=0; i<deleteLines.size(); i++) {
String deleteLine = deleteLines.get(i);
List<String> deleteTokens = getTokens(deleteLine);
- for (int j=nextInsert; j<insertLines.size(); j++) {
- String insertLine = insertLines.get(j);
+ if (i < insertLines.size()) {
+ String insertLine = insertLines.get(i);
List<String> insertTokens = getTokens(insertLine);
TokensToCharsResult<String> result = DiffUtils.tokensToChars(deleteTokens, insertTokens);
@@ -177,15 +165,7 @@ public class DiffUtils {
}
}
- LineDiff lineDiff = new LineDiff(j, diffBlocks);
- lineDiffs.put(i, lineDiff);
- nextInsert = j+1;
- break;
- } else {
- if (System.currentTimeMillis()-time > CHANGE_CALC_TIMEOUT) {
- nextInsert = insertLines.size();
- break;
- }
+ lineDiffs.put(i, diffBlocks);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index b66aedd181..8fe39b0473 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -1,7 +1,7 @@
package io.onedev.server.web.component.diff.blob.text;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import static io.onedev.server.util.diff.DiffRenderer.toHtml;
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.io.Serializable;
import java.util.ArrayList;
@@ -60,7 +60,6 @@ import io.onedev.server.util.Pair;
import io.onedev.server.util.diff.DiffBlock;
import io.onedev.server.util.diff.DiffMatchPatch.Operation;
import io.onedev.server.util.diff.DiffUtils;
-import io.onedev.server.util.diff.LineDiff;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
@@ -583,49 +582,39 @@ public class BlobTextDiffPanel extends Panel {
if (i+1<change.getDiffBlocks().size()) {
DiffBlock<String> nextBlock = change.getDiffBlocks().get(i+1);
if (nextBlock.getOperation() == Operation.INSERT) {
- LinkedHashMap<Integer, LineDiff> lineChanges =
- DiffUtils.align(block.getElements(), nextBlock.getElements());
- if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {
+ LinkedHashMap<Integer, List<DiffBlock<String>>> lineDiffs =
+ DiffUtils.diffLines(block.getElements(), nextBlock.getElements());
+ if (diffMode == DiffViewMode.UNIFIED) {
for (int j=0; j<block.getElements().size(); j++) {
- LineDiff lineDiff = lineChanges.get(j);
- if (lineDiff != null) {
- appendDelete(builder, block, j, lineDiff.getDiffBlocks());
- } else {
+ List<DiffBlock<String>> lineDiff = lineDiffs.get(j);
+ if (lineDiff != null)
+ appendDelete(builder, block, j, lineDiff);
+ else
appendDelete(builder, block, j, null);
- }
- }
- Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();
- for (LineDiff diff: lineChanges.values()) {
- lineChangesByInsert.put(diff.getCompareLine(), diff);
}
for (int j=0; j<nextBlock.getElements().size(); j++) {
- LineDiff lineDiff = lineChangesByInsert.get(j);
- if (lineDiff != null) {
- appendInsert(builder, nextBlock, j, lineDiff.getDiffBlocks());
- } else {
+ List<DiffBlock<String>> lineDiff = lineDiffs.get(j);
+ if (lineDiff != null)
+ appendInsert(builder, nextBlock, j, lineDiff);
+ else
appendInsert(builder, nextBlock, j, null);
- }
}
} else {
- int prevDeleteLineIndex = 0;
- int prevInsertLineIndex = 0;
- for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {
- int deleteLineIndex = entry.getKey();
- LineDiff lineChange = entry.getValue();
- int insertLineIndex = lineChange.getCompareLine();
+ int prevLineIndex = 0;
+ for (Map.Entry<Integer, List<DiffBlock<String>>> entry: lineDiffs.entrySet()) {
+ int lineIndex = entry.getKey();
+ List<DiffBlock<String>> lineDiff = entry.getValue();
- appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,
- prevInsertLineIndex, insertLineIndex);
+ appendDeletesAndInserts(builder, block, nextBlock, prevLineIndex, lineIndex,
+ prevLineIndex, lineIndex);
- appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,
- lineChange.getDiffBlocks());
+ appendModification(builder, block, nextBlock, lineIndex, lineIndex, lineDiff);
- prevDeleteLineIndex = deleteLineIndex+1;
- prevInsertLineIndex = insertLineIndex+1;
+ prevLineIndex = lineIndex+1;
}
appendDeletesAndInserts(builder, block, nextBlock,
- prevDeleteLineIndex, block.getElements().size(),
- prevInsertLineIndex, nextBlock.getElements().size());
+ prevLineIndex, block.getElements().size(),
+ prevLineIndex, nextBlock.getElements().size());
}
i++;
} else {