Skip to content

The Unified and Autonomous Development Platform

Fix issue #740 - Improve performance of large diff page by only syntax highlighting differences

Robin Shenb3697b6f2042
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobChange.java b/server-core/src/main/java/io/onedev/server/git/BlobChange.java
index 6638fc7042..34dbdf1d89 100644
--- a/server-core/src/main/java/io/onedev/server/git/BlobChange.java
+++ b/server-core/src/main/java/io/onedev/server/git/BlobChange.java
@@ -16,7 +16,6 @@ import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
-import io.onedev.commons.jsyntax.Tokenized;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CoverageStatus;
@@ -42,7 +41,7 @@ public abstract class BlobChange implements Serializable {
protected final BlobIdent newBlobIdent;
- private transient List<DiffBlock<Tokenized>> diffBlocks;
+ private transient List<DiffBlock<String>> diffBlocks;
public BlobChange(ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,
WhitespaceOption whitespaceOption) {
@@ -72,7 +71,7 @@ public abstract class BlobChange implements Serializable {
return newBlobIdent.path != null? newBlobIdent.path: oldBlobIdent.path;
}
- public List<DiffBlock<Tokenized>> getDiffBlocks() {
+ public List<DiffBlock<String>> getDiffBlocks() {
if (diffBlocks == null) {
try {
if (type == ChangeType.ADD || type == ChangeType.COPY) {
@@ -80,10 +79,7 @@ public abstract class BlobChange implements Serializable {
List<String> newLines = getNewText().getLines();
if (newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
List<String> oldLines = new ArrayList<>();
- diffBlocks = DiffUtils.diff(
- oldLines, "a.txt",
- newLines, newBlobIdent.isFile()?newBlobIdent.path:"b.txt",
- WhitespaceOption.DEFAULT);
+ diffBlocks = DiffUtils.diff(oldLines, newLines, WhitespaceOption.DEFAULT);
} else {
diffBlocks = new ArrayList<>();
}
@@ -95,10 +91,7 @@ public abstract class BlobChange implements Serializable {
List<String> oldLines = getOldText().getLines();
if (oldLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
List<String> newLines = new ArrayList<>();
- diffBlocks = DiffUtils.diff(
- oldLines, oldBlobIdent.isFile()?oldBlobIdent.path:"a.txt",
- newLines, "b.txt",
- WhitespaceOption.DEFAULT);
+ diffBlocks = DiffUtils.diff(oldLines, newLines, WhitespaceOption.DEFAULT);
} else {
diffBlocks = new ArrayList<>();
}
@@ -109,14 +102,10 @@ public abstract class BlobChange implements Serializable {
if (getOldText() != null && getNewText() != null) {
List<String> oldLines = getOldText().getLines();
List<String> newLines = getNewText().getLines();
- if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
- diffBlocks = DiffUtils.diff(
- oldLines, oldBlobIdent.isFile()?newBlobIdent.path:"a.txt",
- newLines, newBlobIdent.isFile()?newBlobIdent.path:"b.txt",
- whitespaceOption);
- } else {
+ if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE)
+ diffBlocks = DiffUtils.diff(oldLines, newLines, whitespaceOption);
+ else
diffBlocks = new ArrayList<>();
- }
} else {
diffBlocks = new ArrayList<>();
}
@@ -130,18 +119,18 @@ public abstract class BlobChange implements Serializable {
public int getAdditions() {
int additions = 0;
- for (DiffBlock<Tokenized> diff: getDiffBlocks()) {
+ for (DiffBlock<String> diff: getDiffBlocks()) {
if (diff.getOperation() == Operation.INSERT)
- additions += diff.getUnits().size();
+ additions += diff.getElements().size();
}
return additions;
}
public int getDeletions() {
int deletions = 0;
- for (DiffBlock<Tokenized> diff: getDiffBlocks()) {
+ for (DiffBlock<String> diff: getDiffBlocks()) {
if (diff.getOperation() == Operation.DELETE)
- deletions += diff.getUnits().size();
+ deletions += diff.getElements().size();
}
return deletions;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 6f495d92f9..8da3dce721 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -1723,7 +1723,7 @@ public class Project extends AbstractEntity {
if (text != null) {
List<String> normalizedLines = new ArrayList<>();
for (String line: text.getLines())
- normalizedLines.add(whitespaceOption.process(line));
+ normalizedLines.add(whitespaceOption.apply(line));
return normalizedLines;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/Mark.java b/server-core/src/main/java/io/onedev/server/model/support/Mark.java
index 6a40a7cbd2..1286d2e898 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/Mark.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/Mark.java
@@ -117,7 +117,7 @@ public class Mark implements Serializable {
if (newBlob.getText() == null)
return null;
for (String line: newBlob.getText().getLines())
- newLines.add(WhitespaceOption.DEFAULT.process(line));
+ newLines.add(WhitespaceOption.DEFAULT.apply(line));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -128,7 +128,7 @@ public class Mark implements Serializable {
BlobIdent oldBlobIdent = new BlobIdent(commitHash, path, treeWalk.getFileMode(0).getBits());
Blob oldBlob = new Blob(oldBlobIdent, treeWalk.getObjectId(0), treeWalk.getObjectReader());
for (String line: oldBlob.getText().getLines())
- oldLines.add(WhitespaceOption.DEFAULT.process(line));
+ oldLines.add(WhitespaceOption.DEFAULT.apply(line));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/DiffBlock.java b/server-core/src/main/java/io/onedev/server/util/diff/DiffBlock.java
index 6383e0692e..fd3969df41 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/DiffBlock.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/DiffBlock.java
@@ -11,14 +11,14 @@ public class DiffBlock<T> implements Serializable {
private final DiffMatchPatch.Operation operation;
- private final List<T> units;
+ private final List<T> elements;
private final int oldStart, newStart;
- public DiffBlock(DiffMatchPatch.Operation operation, List<T> units,
+ public DiffBlock(DiffMatchPatch.Operation operation, List<T> elements,
int oldStart, int newStart) {
this.operation = operation;
- this.units = units;
+ this.elements = elements;
this.oldStart = oldStart;
this.newStart = newStart;
}
@@ -27,8 +27,8 @@ public class DiffBlock<T> implements Serializable {
return operation;
}
- public List<T> getUnits() {
- return units;
+ public List<T> getElements() {
+ return elements;
}
public int getOldStart() {
@@ -43,14 +43,14 @@ public class DiffBlock<T> implements Serializable {
if (operation == Operation.INSERT)
return oldStart;
else
- return oldStart + units.size();
+ return oldStart + elements.size();
}
public int getNewEnd() {
if (operation == Operation.DELETE)
return newStart;
else
- return newStart + units.size();
+ return newStart + elements.size();
}
}
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 f15c6855f3..bacb6e39c3 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
@@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -13,14 +14,8 @@ import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import io.onedev.commons.jsyntax.TextToken;
-import io.onedev.commons.jsyntax.TokenTypes;
-import io.onedev.commons.jsyntax.TokenUtils;
-import io.onedev.commons.jsyntax.Tokenized;
-import io.onedev.commons.jsyntax.Tokenizer;
-import io.onedev.commons.jsyntax.TokenizerRegistry;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.PlanarRange;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.diff.DiffMatchPatch.Diff;
import io.onedev.server.util.diff.DiffMatchPatch.Operation;
@@ -30,27 +25,7 @@ public class DiffUtils {
public static final int MAX_DIFF_SIZE = 65535;
- private static final Pattern pattern = Pattern.compile("\\w+");
-
- private static List<Long> splitByWord(String line, long token) {
- int beginPos = TokenUtils.getBeginPos(token);
- int endPos = TokenUtils.getEndPos(token);
- int typeId = TokenUtils.getTypeId(token);
- String text = TokenUtils.getText(line, token);
- List<Long> tokens = new ArrayList<>();
- Matcher matcher = pattern.matcher(text);
- int lastEnd = 0;
- while (matcher.find()) {
- int start = matcher.start();
- if (start > lastEnd)
- tokens.add(TokenUtils.getToken(lastEnd+beginPos, start+beginPos, typeId));
- tokens.add(TokenUtils.getToken(matcher.start()+beginPos, matcher.end()+beginPos, typeId));
- lastEnd = matcher.end();
- }
- if (lastEnd < text.length())
- tokens.add(TokenUtils.getToken(lastEnd+beginPos, endPos, typeId));
- return tokens;
- }
+ private static final Pattern WORD_PATTERN = Pattern.compile("\\w+");
public static List<String> getLines(@Nullable String text) {
List<String> lines = new ArrayList<>();
@@ -61,96 +36,66 @@ public class DiffUtils {
return lines;
}
- private static List<Tokenized> tokenize(List<String> lines, @Nullable String fileName) {
- Tokenizer tokenizer = TokenizerRegistry.getTokenizer(fileName);
- if (tokenizer != null) {
- List<Tokenized> tokenizedLines = tokenizer.tokenize(lines);
- List<Tokenized> refinedTokens = new ArrayList<>();
- int index = 0;
- for (Tokenized tokenizedLine: tokenizedLines) {
- List<Long> refinedLine = new ArrayList<>();
- for (long token: tokenizedLine.getTokens()) {
- int typeId = TokenUtils.getTypeId(token);
- if (typeId == 0 || (typeId & TokenTypes.COMMENT) != 0 || (typeId & TokenTypes.STRING) != 0
- || (typeId & TokenTypes.STRING2) != 0 || (typeId & TokenTypes.META) != 0
- || (typeId & TokenTypes.LINK) != 0 || (typeId & TokenTypes.ATTRIBUTE) != 0
- || (typeId & TokenTypes.PROPERTY) != 0) {
- refinedLine.addAll(splitByWord(lines.get(index), token));
- } else {
- refinedLine.add(token);
- }
- }
- refinedTokens.add(new Tokenized(tokenizedLine.getText(), TokenUtils.toArray(refinedLine)));
- index++;
- }
- return refinedTokens;
- } else {
- List<Tokenized> tokenizedLines = new ArrayList<>();
- for (String line: lines) {
- /*
- * Do not tokenize line if file name is not specified, as sometimes we want to
- * show addition/deletion as a whole. To tokenize line as plain text, specify
- * file name with a .txt suffix
- */
- if (line.length() != 0) {
- long[] tokens = new long[1];
- tokens[0] = TokenUtils.getToken(0, line.length(), 0);
- tokenizedLines.add(new Tokenized(line, tokens));
- } else {
- tokenizedLines.add(new Tokenized(line, new long[0]));
- }
+ private static List<String> getTokens(String line) {
+ List<String> tokens = new ArrayList<>();
+ Matcher matcher = WORD_PATTERN.matcher(line);
+ int lastEnd = 0;
+ while (matcher.find()) {
+ int start = matcher.start();
+ if (start > lastEnd) {
+ for (int i=lastEnd; i<start; i++)
+ tokens.add(String.valueOf(line.charAt(i)));
}
- return tokenizedLines;
+ tokens.add(line.substring(matcher.start(), matcher.end()));
+ lastEnd = matcher.end();
+ }
+ if (lastEnd < line.length()) {
+ for (int i=lastEnd; i<line.length(); i++)
+ tokens.add(String.valueOf(line.charAt(i)));
}
+ return tokens;
}
- /**
- * Diff two list of strings.
- */
- public static List<DiffBlock<Tokenized>> diff(List<String> oldLines, @Nullable String oldFileName,
- List<String> newLines, @Nullable String newFileName, WhitespaceOption whitespaceOption) {
- Preconditions.checkArgument(oldLines.size() + newLines.size() <= MAX_DIFF_SIZE,
+ public static <T> List<DiffBlock<T>> diff(List<T> oldElements, List<T> newElements, Function<T, T> processor) {
+ Preconditions.checkArgument(oldElements.size() + newElements.size() <= MAX_DIFF_SIZE,
"Total size of old lines and new lines should be less than " + MAX_DIFF_SIZE + ".");
- List<String> processedOldLines = new ArrayList<>();
- for (String line: oldLines)
- processedOldLines.add(whitespaceOption.process(line));
+ List<T> processedOldElements = new ArrayList<>();
+ for (T element: oldElements)
+ processedOldElements.add(processor.apply(element));
- List<String> processedNewLines = new ArrayList<>();
- for (String line: newLines)
- processedNewLines.add(whitespaceOption.process(line));
+ List<T> processedNewElements = new ArrayList<>();
+ for (T element: newElements)
+ processedNewElements.add(processor.apply(element));
- List<Tokenized> oldTokenizedLines = tokenize(oldLines, oldFileName);
- List<Tokenized> newTokenizedLines = tokenize(newLines, newFileName);
-
DiffMatchPatch dmp = new DiffMatchPatch();
- TokensToCharsResult<String> result1 = tokensToChars(processedOldLines, processedNewLines);
+ TokensToCharsResult<T> result1 = tokensToChars(processedOldElements, processedNewElements);
List<DiffMatchPatch.Diff> diffs = dmp.diff_main(result1.chars1, result1.chars2, false);
- List<DiffBlock<Tokenized>> diffBlocks = new ArrayList<>();
- int oldLineNo = 0;
- int newLineNo = 0;
- for (Diff diff : diffs) {
- List<Tokenized> lines = new ArrayList<>();
+ List<DiffBlock<T>> diffBlocks = new ArrayList<>();
+ int oldElementIndex = 0;
+ int newElementIndex = 0;
+ for (Diff diff: diffs) {
+ List<T> elements = new ArrayList<>();
if (diff.operation == Operation.EQUAL) {
for (int i = 0; i < diff.text.length(); i++) {
- lines.add(newTokenizedLines.get(newLineNo));
- oldLineNo++;
- newLineNo++;
+ elements.add(newElements.get(newElementIndex));
+ oldElementIndex++;
+ newElementIndex++;
}
- diffBlocks.add(new DiffBlock<>(diff.operation, lines,
- oldLineNo-lines.size(), newLineNo-lines.size()));
+ diffBlocks.add(new DiffBlock<>(diff.operation, elements,
+ oldElementIndex-elements.size(), newElementIndex-elements.size()));
} else if (diff.operation == Operation.INSERT) {
for (int i = 0; i < diff.text.length(); i++)
- lines.add(newTokenizedLines.get(newLineNo++));
- diffBlocks.add(new DiffBlock<>(diff.operation, lines,
- oldLineNo, newLineNo-lines.size()));
+ elements.add(newElements.get(newElementIndex++));
+ diffBlocks.add(new DiffBlock<>(diff.operation, elements,
+ oldElementIndex, newElementIndex-elements.size()));
} else {
for (int i = 0; i < diff.text.length(); i++)
- lines.add(oldTokenizedLines.get(oldLineNo++));
- diffBlocks.add(new DiffBlock<>(diff.operation, lines,
- oldLineNo-lines.size(), newLineNo));
+ elements.add(oldElements.get(oldElementIndex++));
+ diffBlocks.add(new DiffBlock<>(diff.operation, elements,
+ oldElementIndex-elements.size(), newElementIndex));
}
}
@@ -158,38 +103,14 @@ public class DiffUtils {
}
public static <T> List<DiffBlock<T>> diff(List<T> oldLines, List<T> newLines) {
- Preconditions.checkArgument(oldLines.size() + newLines.size() <= MAX_DIFF_SIZE,
- "Total size of old lines and new lines should be less than " + MAX_DIFF_SIZE + ".");
-
- DiffMatchPatch dmp = new DiffMatchPatch();
- TokensToCharsResult<T> result1 = tokensToChars(oldLines, newLines);
-
- List<DiffMatchPatch.Diff> diffs = dmp.diff_main(result1.chars1, result1.chars2, false);
+ return diff(oldLines, newLines, new Function<T, T>() {
- List<DiffBlock<T>> diffBlocks = new ArrayList<>();
- int oldLineNo = 0;
- int newLineNo = 0;
- for (Diff diff : diffs) {
- List<T> lines = new ArrayList<>();
- if (diff.operation == Operation.EQUAL) {
- for (int i = 0; i < diff.text.length(); i++) {
- lines.add(newLines.get(newLineNo));
- oldLineNo++;
- newLineNo++;
- }
- diffBlocks.add(new DiffBlock<T>(diff.operation, lines, oldLineNo-lines.size(), newLineNo-lines.size()));
- } else if (diff.operation == Operation.INSERT) {
- for (int i = 0; i < diff.text.length(); i++)
- lines.add(newLines.get(newLineNo++));
- diffBlocks.add(new DiffBlock<T>(diff.operation, lines, oldLineNo, newLineNo-lines.size()));
- } else {
- for (int i = 0; i < diff.text.length(); i++)
- lines.add(oldLines.get(oldLineNo++));
- diffBlocks.add(new DiffBlock<T>(diff.operation, lines, oldLineNo-lines.size(), newLineNo));
+ @Override
+ public T apply(T t) {
+ return t;
}
- }
-
- return diffBlocks;
+
+ });
}
/**
@@ -200,8 +121,7 @@ public class DiffUtils {
* @param insertLines
* @return
*/
- public static LinkedHashMap<Integer, LineDiff> align(
- List<Tokenized> deleteLines, List<Tokenized> insertLines, boolean forceAlign) {
+ public static LinkedHashMap<Integer, LineDiff> align(List<String> deleteLines, List<String> insertLines) {
LinkedHashMap<Integer, LineDiff> lineDiffs = new LinkedHashMap<>();
DiffMatchPatch dmp = new DiffMatchPatch();
@@ -209,40 +129,40 @@ public class DiffUtils {
long time = System.currentTimeMillis();
int nextInsert = 0;
for (int i=0; i<deleteLines.size(); i++) {
- Tokenized deleteLine = deleteLines.get(i);
- List<TextToken> deleteTokens = TokenUtils.getTextTokens(deleteLine);
+ String deleteLine = deleteLines.get(i);
+ List<String> deleteTokens = getTokens(deleteLine);
for (int j=nextInsert; j<insertLines.size(); j++) {
- Tokenized insertLine = insertLines.get(j);
- List<TextToken> insertTokens = TokenUtils.getTextTokens(insertLine);
+ String insertLine = insertLines.get(j);
+ List<String> insertTokens = getTokens(insertLine);
- TokensToCharsResult<TextToken> result = DiffUtils.tokensToChars(deleteTokens, insertTokens);
+ TokensToCharsResult<String> result = DiffUtils.tokensToChars(deleteTokens, insertTokens);
List<DiffMatchPatch.Diff> diffs = dmp.diff_main(result.chars1, result.chars2, false);
int equal = 0;
int total = 0;
for (DiffMatchPatch.Diff diff: diffs) {
for (int k=0; k<diff.text.length(); k++) {
int pos = diff.text.charAt(k);
- TextToken token = result.tokenArray.get(pos);
- if (StringUtils.isNotBlank(token.getText())) {
- total += token.getText().length();
+ String token = result.tokenArray.get(pos);
+ if (StringUtils.isNotBlank(token)) {
+ total += token.length();
if (diff.operation == Operation.EQUAL)
- equal += token.getText().length();
+ equal += token.length();
}
}
}
- if (forceAlign || equal*3 >= total) {
- List<DiffBlock<TextToken>> diffBlocks = new ArrayList<>();
+ if (equal*3 >= total) {
+ List<DiffBlock<String>> diffBlocks = new ArrayList<>();
int oldLineNo = 0;
int newLineNo = 0;
for (Diff diff : diffs) {
- List<TextToken> tokens = new ArrayList<>();
+ List<String> tokens = new ArrayList<>();
if (diff.operation == Operation.EQUAL) {
for (int k = 0; k < diff.text.length(); k++) {
tokens.add(insertTokens.get(newLineNo));
oldLineNo++;
newLineNo++;
}
- diffBlocks.add(new DiffBlock<TextToken>(
+ diffBlocks.add(new DiffBlock<String>(
diff.operation, tokens, oldLineNo-tokens.size(), newLineNo-tokens.size()));
} else if (diff.operation == Operation.INSERT) {
for (int k = 0; k < diff.text.length(); k++)
@@ -336,21 +256,11 @@ public class DiffUtils {
}
}
- public static <T> int getNewLineAround(List<T> oldLines, List<T> newLines, int oldLine) {
- Map<Integer, Integer> lineMap = mapLines(oldLines, newLines);
- for (int line=oldLine; line>=0; line--) {
- Integer newLine = lineMap.get(line);
- if (newLine != null)
- return newLine;
- }
- return 0;
- }
-
public static <T> Map<Integer, Integer> mapLines(List<DiffBlock<T>> diffBlocks) {
Map<Integer, Integer> lineMapping = new HashMap<Integer, Integer>();
for (DiffBlock<T> diffBlock: diffBlocks) {
if (diffBlock.getOperation() == Operation.EQUAL) {
- for (int i=0; i<diffBlock.getUnits().size(); i++)
+ for (int i=0; i<diffBlock.getElements().size(); i++)
lineMapping.put(i+diffBlock.getOldStart(), i+diffBlock.getNewStart());
}
}
@@ -398,151 +308,4 @@ public class DiffUtils {
}
}
- private static void appendTokenized(StringBuilder builder, Tokenized tokenized) {
- if (tokenized.getTokens().length == 0) {
- builder.append("&nbsp;");
- } else {
- for (long token: tokenized.getTokens()) {
- builder.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));
- }
- }
- }
-
- private static void appendDeletesAndInserts(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,
- DiffBlock<Tokenized> 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 static void appendInsert(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<div style='").append(getLineOperationStyle(Operation.INSERT)).append("'>+");
- if (tokenDiffs != null) {
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.DELETE)
- builder.append(TokenUtils.toHtml(token, null, getTokenOperationStyle(tokenBlock.getOperation())));
- }
- }
- }
- } else {
- appendTokenized(builder, block.getUnits().get(lineIndex));
- }
- builder.append("</div>");
- }
-
- private static void appendDelete(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<div style='").append(getLineOperationStyle(Operation.DELETE)).append("'>-");
- if (tokenDiffs != null) {
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.INSERT)
- builder.append(TokenUtils.toHtml(token, null, getTokenOperationStyle(tokenBlock.getOperation())));
- }
- }
- }
- } else {
- appendTokenized(builder, block.getUnits().get(lineIndex));
- }
- builder.append("</div>");
- }
-
- private static void appendModification(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,
- DiffBlock<Tokenized> insertBlock, int deleteLineIndex, int insertLineIndex,
- List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<div>*");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits())
- builder.append(TokenUtils.toHtml(token, null, getTokenOperationStyle(tokenBlock.getOperation())));
- }
- }
- builder.append("</div>");
- }
-
- private static String getLineOperationStyle(Operation operation) {
- if (operation == Operation.INSERT)
- return "background: #C5F7C5;";
- else if (operation == Operation.DELETE)
- return "background: #FAC8C8;";
- else
- return null;
- }
-
- private static String getTokenOperationStyle(Operation operation) {
- if (operation == Operation.INSERT)
- return "background: #05AB05; color: white;";
- else if (operation == Operation.DELETE)
- return "background: #F13B3B; color: white; text-decoration: line-through;";
- else
- return null;
- }
-
- public static String diffAsHtml(List<String> oldLines, @Nullable String oldFileName,
- List<String> newLines, @Nullable String newFileName, boolean forceAlign) {
- List<DiffBlock<Tokenized>> diffBlocks = DiffUtils.diff(oldLines, oldFileName, newLines, newFileName,
- WhitespaceOption.DO_NOT_IGNORE);
- StringBuilder builder = new StringBuilder("<div style='font-family: monospace;'>");
- for (int i=0; i<diffBlocks.size(); i++) {
- DiffBlock<Tokenized> block = diffBlocks.get(i);
- if (block.getOperation() == Operation.EQUAL) {
- builder.append("<div>&nbsp;");
- for (int j=0; j<block.getUnits().size(); j++)
- appendTokenized(builder, block.getUnits().get(j));
- builder.append("</div>");
- } else if (block.getOperation() == Operation.DELETE) {
- if (i+1<diffBlocks.size()) {
- DiffBlock<Tokenized> nextBlock = diffBlocks.get(i+1);
- if (nextBlock.getOperation() == Operation.INSERT) {
- LinkedHashMap<Integer, LineDiff> lineChanges =
- DiffUtils.align(block.getUnits(), nextBlock.getUnits(), forceAlign);
- 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.getTokenDiffs());
-
- prevDeleteLineIndex = deleteLineIndex+1;
- prevInsertLineIndex = insertLineIndex+1;
- }
- appendDeletesAndInserts(builder, block, nextBlock,
- prevDeleteLineIndex, block.getUnits().size(),
- prevInsertLineIndex, nextBlock.getUnits().size());
- i++;
- } else {
- for (int j=0; j<block.getUnits().size(); j++)
- appendDelete(builder, block, j, null);
- }
- } else {
- for (int j=0; j<block.getUnits().size(); j++)
- appendDelete(builder, block, j, null);
- }
- } else {
- for (int j=0; j<block.getUnits().size(); j++)
- appendInsert(builder, block, j, null);
- }
- }
- builder.append("</div>");
- return builder.toString();
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/LineDiff.java b/server-core/src/main/java/io/onedev/server/util/diff/LineDiff.java
index a8a567b034..7f035ec4eb 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/LineDiff.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/LineDiff.java
@@ -3,27 +3,25 @@ package io.onedev.server.util.diff;
import java.io.Serializable;
import java.util.List;
-import io.onedev.commons.jsyntax.TextToken;
-
public class LineDiff implements Serializable {
private static final long serialVersionUID = 1L;
private final int compareLine;
- private final List<DiffBlock<TextToken>> tokenDiffs;
+ private final List<DiffBlock<String>> diffBlocks;
- public LineDiff(int compareLine, List<DiffBlock<TextToken>> tokenDiffs) {
+ public LineDiff(int compareLine, List<DiffBlock<String>> diffBlocks) {
this.compareLine = compareLine;
- this.tokenDiffs = tokenDiffs;
+ this.diffBlocks = diffBlocks;
}
public int getCompareLine() {
return compareLine;
}
- public List<DiffBlock<TextToken>> getTokenDiffs() {
- return tokenDiffs;
+ public List<DiffBlock<String>> getDiffBlocks() {
+ return diffBlocks;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java b/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java
index a672991347..2172fbc0ac 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java
@@ -1,17 +1,18 @@
package io.onedev.server.util.diff;
+import java.util.function.Function;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
-public enum WhitespaceOption {
+public enum WhitespaceOption implements Function<String, String> {
DEFAULT() {
@Override
- public String process(String line) {
+ public String apply(String line) {
return StringUtils.stripEnd(line, " \t\r\n");
}
@@ -24,7 +25,7 @@ public enum WhitespaceOption {
IGNORE_LEADING() {
@Override
- public String process(String line) {
+ public String apply(String line) {
return StringUtils.stripStart(line, " \t\r\n");
}
@@ -37,7 +38,7 @@ public enum WhitespaceOption {
IGNORE_CHANGE() {
@Override
- public String process(String line) {
+ public String apply(String line) {
return WHITESPACE_PATTERN.matcher(line.trim()).replaceAll(" ");
}
@@ -50,7 +51,7 @@ public enum WhitespaceOption {
IGNORE_ALL() {
@Override
- public String process(String line) {
+ public String apply(String line) {
return WHITESPACE_PATTERN.matcher(line.trim()).replaceAll("");
}
@@ -63,7 +64,7 @@ public enum WhitespaceOption {
DO_NOT_IGNORE() {
@Override
- public String process(String line) {
+ public String apply(String line) {
return line;
}
@@ -78,8 +79,6 @@ public enum WhitespaceOption {
public abstract String getDescription();
- public abstract String process(String line);
-
public static WhitespaceOption ofName(@Nullable String name) {
if (name != null)
return valueOf(name.toUpperCase());
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java
index 8fc46686bf..a1d7656889 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java
@@ -25,46 +25,81 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReference
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "lib/codemirror.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/mode/overlay.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/mode/simple.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/mode/multiplex.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/edit/matchbrackets.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/dialog/dialog.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/fold/foldcode.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/fold/foldgutter.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/fold/brace-fold.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/fold/xml-fold.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/fold/markdown-fold.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/fold/comment-fold.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/search/searchcursor.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/search/search.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/search/matchesonscrollbar.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "matchesonscrollbar2.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/selection/active-line.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/scroll/annotatescrollbar.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/display/fullscreen.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/selection/mark-selection.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "addon/hint/show-hint.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "annotatescrollbar2.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "simplescrollbars.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "gotoline.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "identifier-highlighter.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "loadmode.js")));
- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(CodeMirrorResourceReference.class, "mode/meta.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "lib/codemirror.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/mode/overlay.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/mode/simple.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/mode/multiplex.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/edit/matchbrackets.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/dialog/dialog.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/fold/foldcode.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/fold/foldgutter.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/fold/brace-fold.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/fold/xml-fold.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/fold/markdown-fold.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/fold/comment-fold.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/search/searchcursor.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/search/search.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/search/matchesonscrollbar.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ CodeMirrorResourceReference.class, "matchesonscrollbar2.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/selection/active-line.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/scroll/annotatescrollbar.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/display/fullscreen.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/selection/mark-selection.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "addon/hint/show-hint.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ CodeMirrorResourceReference.class, "annotatescrollbar2.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ CodeMirrorResourceReference.class, "simplescrollbars.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ CodeMirrorResourceReference.class, "gotoline.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ CodeMirrorResourceReference.class, "identifier-highlighter.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ CodeMirrorResourceReference.class, "addon/mode/loadmode.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ CodeMirrorResourceReference.class, "mode/meta.js")));
dependencies.add(JavaScriptHeaderItem.forReference(new ModeUrlResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "lib/codemirror.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "lib/codemirror.css")));
dependencies.add(CssHeaderItem.forReference(new CodeThemeCssResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/dialog/dialog.css")));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/fold/foldgutter.css")));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/scroll/simplescrollbars.css")));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/search/matchesonscrollbar.css")));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/display/fullscreen.css")));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CodeMirrorResourceReference.class, "addon/hint/show-hint.css")));
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CodeMirrorResourceReference.class, "codemirror-custom.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "addon/dialog/dialog.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "addon/fold/foldgutter.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "addon/scroll/simplescrollbars.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "addon/search/matchesonscrollbar.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "addon/display/fullscreen.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "addon/hint/show-hint.css")));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ CodeMirrorResourceReference.class, "codemirror-custom.css")));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeThemeCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeThemeCssResourceReference.java
index d7ced88590..317ff2a4a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeThemeCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeThemeCssResourceReference.java
@@ -17,6 +17,8 @@ public class CodeThemeCssResourceReference extends CssResourceReference {
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ CodeMirrorResourceReference.class, "lib/codemirror.css")));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
CodeThemeCssResourceReference.class, "theme/eclipse.css")));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java
index e2f0508932..9c002e3f40 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java
@@ -30,8 +30,10 @@ public class ModeUrlResourceReference extends JavaScriptResourceReference {
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- JavaScriptResourceReference metaReference = new JavaScriptResourceReference(ModeUrlResourceReference.class, "mode/meta.js");
- String modeBase = StringUtils.substringBeforeLast(RequestCycle.get().urlFor(metaReference, new PageParameters()).toString(), "/");
+ JavaScriptResourceReference metaReference = new JavaScriptResourceReference(
+ ModeUrlResourceReference.class, "mode/meta.js");
+ String modeBase = StringUtils.substringBeforeLast(RequestCycle.get()
+ .urlFor(metaReference, new PageParameters()).toString(), "/");
dependencies.add(OnDomReadyHeaderItem.forScript("CodeMirror.modeURL = '" + modeBase + "/%N/%N.js';"));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/SyntaxHighlightResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/SyntaxHighlightResourceReference.java
new file mode 100644
index 0000000000..ef4f864f6b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/SyntaxHighlightResourceReference.java
@@ -0,0 +1,45 @@
+package io.onedev.server.web.asset.codemirror;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+import io.onedev.server.web.resourcebundle.ResourceBundle;
+
+@ResourceBundle
+public class SyntaxHighlightResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public SyntaxHighlightResourceReference() {
+ super(SyntaxHighlightResourceReference.class, "codemirror-integration.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ SyntaxHighlightResourceReference.class, "lib/codemirror.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ SyntaxHighlightResourceReference.class, "addon/runmode/runmode.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(
+ SyntaxHighlightResourceReference.class, "addon/mode/loadmode.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ SyntaxHighlightResourceReference.class, "mode/meta.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ SyntaxHighlightResourceReference.class, "addon/mode/simple.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ SyntaxHighlightResourceReference.class, "addon/mode/overlay.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
+ SyntaxHighlightResourceReference.class, "addon/mode/multiplex.js")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new ModeUrlResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new CodeThemeCssResourceReference()));
+
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
index 45c33c8585..d97a3f3cd2 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
@@ -28,6 +28,36 @@ onedev.server.codemirror = {
var top = cm.charCoords({line: range.fromRow, ch: 0}, "local").top;
cm.scrollTo(null, top - 50);
},
+ highlightSyntax: function(text, modeInfo, highlighted, startCallback, stopCallback) {
+ var modeMime = onedev.server.codemirror.getModeMime(modeInfo);
+ if (!CodeMirror.modes.hasOwnProperty(modeInfo.mode)) {
+ CodeMirror.requireMode(modeInfo.mode, function() {
+ if (startCallback)
+ startCallback();
+ CodeMirror.runMode(text, modeMime, highlighted);
+ if (stopCallback)
+ stopCallback();
+ });
+ } else {
+ if (startCallback)
+ startCallback();
+ CodeMirror.runMode(text, modeMime, highlighted);
+ if (stopCallback)
+ stopCallback();
+ }
+ },
+ findModeByFileName: function(fileName) {
+ if (fileName.endsWith(".cbl") || fileName.endsWith(".pco"))
+ return CodeMirror.findModeByName("cobol");
+ else if (fileName.endsWith(".js"))
+ return CodeMirror.findModeByName(cm, "jsx");
+ else if (fileName.endsWith(".ld") || fileName.endsWith(".asm"))
+ return CodeMirror.findModeByName(cm, "gas");
+ else if (fileName == ".onedev-buildspec")
+ return CodeMirror.findModeByName(cm, "xml");
+ else
+ return CodeMirror.findModeByFileName(fileName);
+ },
scrollIntoView: function(cm, range) {
cm.scrollIntoView({line: range.fromRow, ch: 0}, 8);
},
@@ -37,27 +67,25 @@ onedev.server.codemirror = {
onedev.server.codemirror.setMode(cm, modeInfo);
},
setModeByFileName: function(cm, fileName) {
- if (fileName.endsWith(".cbl") || fileName.endsWith(".pco")) {
- onedev.server.codemirror.setModeByName(cm, "cobol");
- } else if (fileName.endsWith(".js")) {
- onedev.server.codemirror.setModeByName(cm, "jsx");
- } else if (fileName.endsWith(".ld") || fileName.endsWith(".asm")) {
- onedev.server.codemirror.setModeByName(cm, "gas");
- } else if (fileName == ".onedev-buildspec") {
- onedev.server.codemirror.setModeByName(cm, "xml");
- } else {
- var modeInfo = CodeMirror.findModeByFileName(fileName);
- if (modeInfo)
- onedev.server.codemirror.setMode(cm, modeInfo);
- }
+ var modeInfo = onedev.server.codemirror.findModeByFileName(fileName);
+ if (modeInfo)
+ onedev.server.codemirror.setMode(cm, modeInfo);
},
- setMode: function(cm, modeInfo) {
- // specify mode via mime does not work for gfm (github flavored markdown)
+ getModeMime: function(modeInfo) {
if (modeInfo.mode === "gfm")
- cm.setOption("mode", "gfm");
+ return "gfm";
else
- cm.setOption("mode", modeInfo.mime);
- CodeMirror.autoLoadMode(cm, modeInfo.mode);
+ return modeInfo.mime;
+ },
+ setMode: function(cm, modeInfo) {
+ var modeMime = onedev.server.codemirror.getModeMime(modeInfo);
+ if (!CodeMirror.modes.hasOwnProperty(modeInfo.mode)) {
+ CodeMirror.requireMode(modeInfo.mode, function() {
+ cm.setOption("mode", modeMime);
+ });
+ } else {
+ cm.setOption("mode", modeMime);
+ }
},
getViewState: function(cm) {
var cursor = cm.getCursor();
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/loadmode.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/loadmode.js
deleted file mode 100644
index ca46844b44..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/loadmode.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"), "cjs");
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });
- else // Plain browser env
- mod(CodeMirror, "plain");
-})(function(CodeMirror, env) {
- if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
-
- var loading = {};
- function splitCallback(cont, n) {
- var countDown = n;
- return function() { if (--countDown == 0) cont(); };
- }
- function ensureDeps(mode, cont) {
- var deps = CodeMirror.modes[mode].dependencies;
- if (!deps) return cont();
- var missing = [];
- for (var i = 0; i < deps.length; ++i) {
- if (!CodeMirror.modes.hasOwnProperty(deps[i]))
- missing.push(deps[i]);
- }
- if (!missing.length) return cont();
- var split = splitCallback(cont, missing.length);
- for (var i = 0; i < missing.length; ++i)
- CodeMirror.requireMode(missing[i], split);
- }
-
- CodeMirror.requireMode = function(mode, cont) {
- if (typeof mode != "string") mode = mode.name;
- if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
- if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
-
- var file = CodeMirror.modeURL.replace(/%N/g, mode);
- if (env == "plain") {
- var script = document.createElement("script");
- script.src = file;
- var others = document.getElementsByTagName("script")[0];
- var list = loading[mode] = [cont];
- CodeMirror.on(script, "load", function() {
- ensureDeps(mode, function() {
- for (var i = 0; i < list.length; ++i) list[i]();
- });
- });
- others.parentNode.insertBefore(script, others);
- } else if (env == "cjs") {
- require(file);
- cont();
- } else if (env == "amd") {
- requirejs([file], cont);
- }
- };
-
- CodeMirror.autoLoadMode = function(instance, mode) {
- if (!CodeMirror.modes.hasOwnProperty(mode))
- CodeMirror.requireMode(mode, function() {
- instance.setOption("mode", instance.getOption("mode"));
- instance = null;
- });
- };
-});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index d433cdfe54..9b44d3c81c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -38,9 +38,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import io.onedev.commons.jsyntax.TextToken;
-import io.onedev.commons.jsyntax.TokenUtils;
-import io.onedev.commons.jsyntax.Tokenized;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
@@ -473,17 +470,17 @@ public class TextDiffPanel extends Panel {
}
private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {
- DiffBlock<Tokenized> block = change.getDiffBlocks().get(index);
+ DiffBlock<String> block = change.getDiffBlocks().get(index);
if (index == 0) {
- int start = block.getUnits().size()-contextSize;
+ int start = block.getElements().size()-contextSize;
if (start < 0)
start=0;
else if (start > 0)
appendExpander(builder, index, start);
- for (int j=start; j<block.getUnits().size()-lastContextSize; j++)
+ for (int j=start; j<block.getElements().size()-lastContextSize; j++)
appendEqual(builder, block, j, lastContextSize);
} else if (index == change.getDiffBlocks().size()-1) {
- int end = block.getUnits().size();
+ int end = block.getElements().size();
int skipped = 0;
if (end > contextSize) {
skipped = end-contextSize;
@@ -493,14 +490,14 @@ public class TextDiffPanel extends Panel {
appendEqual(builder, block, j, lastContextSize);
if (skipped != 0)
appendExpander(builder, index, skipped);
- } else if (2*contextSize < block.getUnits().size()) {
+ } else if (2*contextSize < block.getElements().size()) {
for (int j=lastContextSize; j<contextSize; j++)
appendEqual(builder, block, j, lastContextSize);
- appendExpander(builder, index, block.getUnits().size() - 2*contextSize);
- for (int j=block.getUnits().size()-contextSize; j<block.getUnits().size()-lastContextSize; j++)
+ appendExpander(builder, index, block.getElements().size() - 2*contextSize);
+ for (int j=block.getElements().size()-contextSize; j<block.getElements().size()-lastContextSize; j++)
appendEqual(builder, block, j, lastContextSize);
} else {
- for (int j=lastContextSize; j<block.getUnits().size()-lastContextSize; j++)
+ for (int j=lastContextSize; j<block.getElements().size()-lastContextSize; j++)
appendEqual(builder, block, j, lastContextSize);
}
}
@@ -543,11 +540,13 @@ public class TextDiffPanel extends Panel {
response.render(OnDomReadyHeaderItem.forScript(script));
- if (markRange != null && RequestCycle.get().find(AjaxRequestTarget.class) == null) {
- script = String.format("onedev.server.textDiff.onWindowLoad('%s', %s);",
- getMarkupId(), convertToJson(markRange));
- response.render(OnLoadHeaderItem.forScript(script));
- }
+ String jsonOfMarkRange;
+ if (RequestCycle.get().find(AjaxRequestTarget.class) == null && markRange != null)
+ jsonOfMarkRange = convertToJson(markRange);
+ else
+ jsonOfMarkRange = "undefined";
+ script = String.format("onedev.server.textDiff.onWindowLoad('%s', %s);", getMarkupId(), jsonOfMarkRange);
+ response.render(OnLoadHeaderItem.forScript(script));
}
private String renderDiffs() {
@@ -606,7 +605,7 @@ public class TextDiffPanel extends Panel {
baseLineNumColumnWidth+newProblemsWidth, operationColumnWidth));
}
for (int i=0; i<change.getDiffBlocks().size(); i++) {
- DiffBlock<Tokenized> block = change.getDiffBlocks().get(i);
+ DiffBlock<String> block = change.getDiffBlocks().get(i);
if (block.getOperation() == Operation.EQUAL) {
Integer lastContextSize = contextSizes.get(i);
if (lastContextSize == null)
@@ -614,15 +613,15 @@ public class TextDiffPanel extends Panel {
appendEquals(builder, i, 0, lastContextSize);
} else if (block.getOperation() == Operation.DELETE) {
if (i+1<change.getDiffBlocks().size()) {
- DiffBlock<Tokenized> nextBlock = change.getDiffBlocks().get(i+1);
+ DiffBlock<String> nextBlock = change.getDiffBlocks().get(i+1);
if (nextBlock.getOperation() == Operation.INSERT) {
LinkedHashMap<Integer, LineDiff> lineChanges =
- DiffUtils.align(block.getUnits(), nextBlock.getUnits(), false);
+ DiffUtils.align(block.getElements(), nextBlock.getElements());
if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {
- for (int j=0; j<block.getUnits().size(); j++) {
+ for (int j=0; j<block.getElements().size(); j++) {
LineDiff lineDiff = lineChanges.get(j);
if (lineDiff != null) {
- appendDelete(builder, block, j, lineDiff.getTokenDiffs());
+ appendDelete(builder, block, j, lineDiff.getDiffBlocks());
} else {
appendDelete(builder, block, j, null);
}
@@ -631,10 +630,10 @@ public class TextDiffPanel extends Panel {
for (LineDiff diff: lineChanges.values()) {
lineChangesByInsert.put(diff.getCompareLine(), diff);
}
- for (int j=0; j<nextBlock.getUnits().size(); j++) {
+ for (int j=0; j<nextBlock.getElements().size(); j++) {
LineDiff lineDiff = lineChangesByInsert.get(j);
if (lineDiff != null) {
- appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());
+ appendInsert(builder, nextBlock, j, lineDiff.getDiffBlocks());
} else {
appendInsert(builder, nextBlock, j, null);
}
@@ -651,34 +650,34 @@ public class TextDiffPanel extends Panel {
prevInsertLineIndex, insertLineIndex);
appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,
- lineChange.getTokenDiffs());
+ lineChange.getDiffBlocks());
prevDeleteLineIndex = deleteLineIndex+1;
prevInsertLineIndex = insertLineIndex+1;
}
appendDeletesAndInserts(builder, block, nextBlock,
- prevDeleteLineIndex, block.getUnits().size(),
- prevInsertLineIndex, nextBlock.getUnits().size());
+ prevDeleteLineIndex, block.getElements().size(),
+ prevInsertLineIndex, nextBlock.getElements().size());
}
i++;
} else {
- for (int j=0; j<block.getUnits().size(); j++)
+ for (int j=0; j<block.getElements().size(); j++)
appendDelete(builder, block, j, null);
}
} else {
- for (int j=0; j<block.getUnits().size(); j++)
+ for (int j=0; j<block.getElements().size(); j++)
appendDelete(builder, block, j, null);
}
} else {
- for (int j=0; j<block.getUnits().size(); j++)
+ for (int j=0; j<block.getElements().size(); j++)
appendInsert(builder, block, j, null);
}
}
return builder.toString();
}
- private void appendDeletesAndInserts(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,
- DiffBlock<Tokenized> insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,
+ private void appendDeletesAndInserts(StringBuilder builder, DiffBlock<String> deleteBlock,
+ DiffBlock<String> insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,
int fromInsertLineIndex, int toInsertLineIndex) {
if (diffMode == DiffViewMode.UNIFIED) {
for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
@@ -748,17 +747,14 @@ public class TextDiffPanel extends Panel {
return null;
}
- private void appendTokenized(StringBuilder builder, Tokenized tokenized) {
- if (tokenized.getTokens().length == 0) {
+ private void appendLine(StringBuilder builder, String line) {
+ if (line.length() == 0)
builder.append("&nbsp;");
- } else {
- for (long token: tokenized.getTokens()) {
- builder.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));
- }
- }
+ else
+ builder.append(toHtml(line, null));
}
- private void appendEqual(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex, int lastContextSize) {
+ private void appendEqual(StringBuilder builder, DiffBlock<String> block, int lineIndex, int lastContextSize) {
if (lastContextSize != 0)
builder.append("<tr class='code expanded'>");
else
@@ -774,8 +770,8 @@ public class TextDiffPanel extends Panel {
builder.append("<td class='number noselect'>").append(oldLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='number noselect'>").append(newLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getUnits().get(lineIndex));
+ builder.append("<td class='content equal' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendLine(builder, block.getElements().get(lineIndex));
builder.append("</td>");
} else {
if (blameInfo != null) {
@@ -783,23 +779,23 @@ public class TextDiffPanel extends Panel {
}
builder.append("<td class='number noselect'>").append(oldLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getUnits().get(lineIndex));
+ builder.append("<td class='content equal left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendLine(builder, block.getElements().get(lineIndex));
builder.append("</td>");
if (blameInfo != null) {
appendBlame(builder, -1, newLineNo);
}
builder.append("<td class='number noselect'>").append(newLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getUnits().get(lineIndex));
+ builder.append("<td class='content equal right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendLine(builder, block.getElements().get(lineIndex));
builder.append("</td>");
}
builder.append("</tr>");
}
- private void appendInsert(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
+ private void appendInsert(StringBuilder builder, DiffBlock<String> block, int lineIndex,
+ @Nullable List<DiffBlock<String>> tokenDiffs) {
builder.append("<tr class='code original'>");
int newLineNo = block.getNewStart() + lineIndex;
@@ -815,15 +811,15 @@ public class TextDiffPanel extends Panel {
if (tokenDiffs.isEmpty()) {
builder.append("&nbsp;");
} else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
+ for (DiffBlock<String> tokenBlock: tokenDiffs) {
+ for (String token: tokenBlock.getElements()) {
if (tokenBlock.getOperation() != Operation.DELETE)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ builder.append(toHtml(token, getOperationClass(tokenBlock.getOperation())));
}
}
}
} else {
- appendTokenized(builder, block.getUnits().get(lineIndex));
+ appendLine(builder, block.getElements().get(lineIndex));
}
builder.append("</td>");
} else {
@@ -832,21 +828,45 @@ public class TextDiffPanel extends Panel {
}
builder.append("<td class='number noselect'><a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect'></td>");
- builder.append("<td class='content left'>&nbsp;</td>");
+ builder.append("<td class='content left none'>&nbsp;</td>");
if (blameInfo != null) {
appendBlame(builder, -1, newLineNo);
}
builder.append("<td class='number noselect new'>").append(newLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect new'>+</td>");
builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getUnits().get(lineIndex));
+ appendLine(builder, block.getElements().get(lineIndex));
builder.append("</td>");
}
builder.append("</tr>");
}
- private void appendDelete(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
+ private static String toHtml(String text, @Nullable String cssClasses) {
+ String escapedText;
+ if (text.equals("\r")) {
+ escapedText = " ";
+ } else {
+ escapedText = "";
+ for (int i=0; i<text.length(); i++) {
+ char ch = text.charAt(i);
+ if (ch == ' ' || ch == '\t' || !Character.isWhitespace(ch))
+ escapedText += ch;
+ }
+ escapedText = HtmlEscape.escapeHtml5(escapedText);
+ }
+
+ if (cssClasses != null) {
+ StringBuilder htmlBuilder = new StringBuilder("<span ");
+ htmlBuilder.append("class='").append(cssClasses).append("'");
+ htmlBuilder.append(">").append(escapedText).append("</span>");
+ return htmlBuilder.toString();
+ } else {
+ return escapedText;
+ }
+ }
+
+ private void appendDelete(StringBuilder builder, DiffBlock<String> block, int lineIndex,
+ @Nullable List<DiffBlock<String>> tokenDiffs) {
builder.append("<tr class='code original'>");
int oldLineNo = block.getOldStart() + lineIndex;
@@ -862,15 +882,15 @@ public class TextDiffPanel extends Panel {
if (tokenDiffs.isEmpty()) {
builder.append("&nbsp;");
} else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
+ for (DiffBlock<String> tokenBlock: tokenDiffs) {
+ for (String token: tokenBlock.getElements()) {
if (tokenBlock.getOperation() != Operation.INSERT)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ builder.append(toHtml(token, getOperationClass(tokenBlock.getOperation())));
}
}
}
} else {
- appendTokenized(builder, block.getUnits().get(lineIndex));
+ appendLine(builder, block.getElements().get(lineIndex));
}
builder.append("</td>");
} else {
@@ -880,20 +900,20 @@ public class TextDiffPanel extends Panel {
builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect old'>-</td>");
builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- appendTokenized(builder, block.getUnits().get(lineIndex));
+ appendLine(builder, block.getElements().get(lineIndex));
builder.append("</td>");
if (blameInfo != null) {
builder.append("<td class='blame noselect'>&nbsp;</td>");
}
builder.append("<td class='number noselect'><a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content right'>&nbsp;</td>");
+ builder.append("<td class='content right none'>&nbsp;</td>");
}
builder.append("</tr>");
}
- private void appendSideBySide(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,
- DiffBlock<Tokenized> insertBlock, int deleteLineIndex, int insertLineIndex) {
+ private void appendSideBySide(StringBuilder builder, DiffBlock<String> deleteBlock,
+ DiffBlock<String> insertBlock, int deleteLineIndex, int insertLineIndex) {
builder.append("<tr class='code original'>");
int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;
@@ -903,7 +923,7 @@ public class TextDiffPanel extends Panel {
builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect old'>-</td>");
builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- appendTokenized(builder, deleteBlock.getUnits().get(deleteLineIndex));
+ appendLine(builder, deleteBlock.getElements().get(deleteLineIndex));
builder.append("</td>");
int newLineNo = insertBlock.getNewStart()+insertLineIndex;
@@ -913,15 +933,15 @@ public class TextDiffPanel extends Panel {
builder.append("<td class='number noselect new'>").append(newLineNo+1).append("<a class='coverage'>&nbsp;</a></td>");
builder.append("<td class='operation noselect new'>+</td>");
builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, insertBlock.getUnits().get(insertLineIndex));
+ appendLine(builder, insertBlock.getElements().get(insertLineIndex));
builder.append("</td>");
builder.append("</tr>");
}
- private void appendModification(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,
- DiffBlock<Tokenized> insertBlock, int deleteLineIndex, int insertLineIndex,
- List<DiffBlock<TextToken>> tokenDiffs) {
+ 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;
@@ -937,9 +957,9 @@ public class TextDiffPanel extends Panel {
if (tokenDiffs.isEmpty()) {
builder.append("&nbsp;");
} else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits())
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ for (DiffBlock<String> tokenBlock: tokenDiffs) {
+ for (String token: tokenBlock.getElements())
+ builder.append(toHtml(token, getOperationClass(tokenBlock.getOperation())));
}
}
builder.append("</td>");
@@ -953,10 +973,10 @@ public class TextDiffPanel extends Panel {
if (tokenDiffs.isEmpty()) {
builder.append("&nbsp;");
} else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
+ for (DiffBlock<String> tokenBlock: tokenDiffs) {
+ for (String token: tokenBlock.getElements()) {
if (tokenBlock.getOperation() != Operation.INSERT)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ builder.append(toHtml(token, getOperationClass(tokenBlock.getOperation())));
}
}
}
@@ -971,10 +991,10 @@ public class TextDiffPanel extends Panel {
if (tokenDiffs.isEmpty()) {
builder.append("&nbsp;");
} else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
+ for (DiffBlock<String> tokenBlock: tokenDiffs) {
+ for (String token: tokenBlock.getElements()) {
if (tokenBlock.getOperation() != Operation.DELETE)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ builder.append(toHtml(token, getOperationClass(tokenBlock.getOperation())));
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java
index c08acffc7f..812b08abfe 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java
@@ -8,9 +8,10 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;
-import io.onedev.server.web.asset.codemirror.CodeThemeCssResourceReference;
+import io.onedev.server.web.asset.codemirror.SyntaxHighlightResourceReference;
import io.onedev.server.web.asset.codeproblem.CodeProblemResourceReference;
import io.onedev.server.web.asset.commentindicator.CommentIndicatorCssResourceReference;
+import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;
import io.onedev.server.web.asset.hover.HoverResourceReference;
import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;
@@ -27,13 +28,15 @@ public class TextDiffResourceReference extends BaseDependentResourceReference {
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new SyntaxHighlightResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CodeProblemResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new CodeThemeCssResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(TextDiffPanel.class, "text-diff.css")));
+ dependencies.add(CssHeaderItem.forReference(
+ new CssResourceReference(TextDiffPanel.class, "text-diff.css")));
dependencies.add(CssHeaderItem.forReference(new CommentIndicatorCssResourceReference()));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
index 6f17329d7a..fd1542d216 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
@@ -35,8 +35,6 @@ onedev.server.textDiff = {
}
}
});
- var $symbols = $container.find(onedev.server.textDiff.symbolClasses);
- $symbols.mouseover($container.data("symbolHover"));
$container.find("td.content").mouseover($container.data("onMouseOverContent"));
onedev.server.textDiff.initBlameTooltip(containerId, $container.find("td.blame>a.hash"));
@@ -477,8 +475,274 @@ onedev.server.textDiff = {
},
onWindowLoad: function(containerId, markRange) {
var $container = $("#" + containerId);
- if (onedev.server.viewState.getFromHistory() === undefined)
+ if (markRange && onedev.server.viewState.getFromHistory() === undefined)
onedev.server.textDiff.scrollTo($container, markRange);
+
+ var $scrollParent = $container.scrollParent();
+ if (!$scrollParent.data("onTextDiffScrollInstalled")) {
+ $scrollParent.data("onTextDiffScrollInstalled", true);
+ $scrollParent.doneEvents("scroll", function() {
+ $(".text-diff").each(function() {
+ onedev.server.textDiff.highlightSyntax($(this).parent());
+ }, 100);
+ });
+ }
+
+ onedev.server.textDiff.highlightSyntax($container);
+ },
+ highlightSyntax($container) {
+ var oldBlobPath = $container.find(".diff-title>span:first-child").text();
+ var newBlobPath = $container.find(".diff-title>span:last-child").text();
+
+ $container.find("tbody, tr.expander").each(function() {
+ var $this = $(this);
+ var $firstCodeTr;
+ if ($this.is("tbody")) {
+ if ($this.children().first().hasClass("code"))
+ $firstCodeTr = $this.children().first();
+ else
+ return;
+ } else if ($this.next().length != 0){
+ $firstCodeTr = $this.next();
+ } else {
+ return;
+ }
+ var $lastCodeTr;
+ var $nextExpanderTr = $firstCodeTr.nextAll(".expander").first();
+ if ($nextExpanderTr.length != 0)
+ $lastCodeTr = $nextExpanderTr.prev();
+ else
+ $lastCodeTr = $container.find("tbody>tr:last-child");
+
+ var $codeTrs = $firstCodeTr.nextUntil($lastCodeTr).add($firstCodeTr).add($lastCodeTr);
+ if ($codeTrs.not(".syntaxHighlighted").length == 0)
+ return;
+
+ var $scrollParent = $container.scrollParent();
+ if ($firstCodeTr.offset().top - $scrollParent.offset().top > $scrollParent.height()
+ || $lastCodeTr.offset().top + $lastCodeTr.outerHeight() - $scrollParent.offset().top < 0) {
+ return;
+ }
+
+ var oldLines = [], newLines = [];
+
+ $codeTrs.each(function() {
+ var $codeTr = $(this);
+ var $content = $codeTr.children(".content");
+ if ($content.length == 2) {
+ var $old = $content.first();
+ if (!$old.hasClass("none"))
+ oldLines.push($old.text());
+
+ var $new = $content.last();
+ if (!$new.hasClass("none"))
+ newLines.push($new.text());
+ } else if ($content.hasClass("old") && $content.hasClass("new")) {
+ var oldPartials = [];
+ var newPartials = [];
+
+ $content.contents().each(function() {
+ var $this = $(this);
+ var text = $this.text();
+ if ($this.hasClass("delete")) {
+ oldPartials.push(text);
+ } else if ($this.hasClass("insert")) {
+ newPartials.push(text);
+ } else {
+ oldPartials.push(text);
+ newPartials.push(text);
+ }
+ });
+ oldLines.push(oldPartials.join(""));
+ newLines.push(newPartials.join(""));
+ } else if ($content.hasClass("old")) {
+ oldLines.push($content.text());
+ } else if ($content.hasClass("new")) {
+ newLines.push($content.text());
+ } else {
+ oldLines.push($content.text());
+ newLines.push($content.text());
+ }
+ });
+
+ function saveSyntaxes(syntaxes, text, style, lineIndex, beginPos) {
+ if (lineIndex != undefined && beginPos != undefined && style != null) {
+ var classNames = "cm-" + style.replace(/ +/g, " cm-");
+ var lineSyntaxes = syntaxes[lineIndex];
+ if (lineSyntaxes == undefined) {
+ lineSyntaxes = [];
+ syntaxes[lineIndex] = lineSyntaxes;
+ }
+ for (var i=0; i<text.length; i++)
+ lineSyntaxes[i+beginPos] = classNames;
+ }
+ }
+
+ var oldSyntaxes = [];
+ var oldProcessed = false;
+ var newSyntaxes = [];
+ var newProcessed = false;
+
+ function doneHighlight() {
+ if (oldProcessed && newProcessed) {
+ var $codeTr = $firstCodeTr;
+ var oldLineIndex = 0;
+ var newLineIndex = 0;
+ while (true) {
+ var oldLineSyntaxes = oldSyntaxes[oldLineIndex];
+ var newLineSyntaxes = newSyntaxes[newLineIndex];
+ $codeTr.children("td.content:not(.none)").each(function() {
+ var $td = $(this);
+
+ var $highlighted = $("<div></div>");
+
+ var partial = [];
+ var classNames = "";
+ function appendPartial() {
+ if (partial.length != 0) {
+ var $span = $("<span></span>");
+ $span.text(partial.join(""));
+ $span.attr("class", classNames);
+ $highlighted.append($span);
+ }
+ }
+
+ var oldPos = newPos = 0;
+ $td.contents().each(function() {
+ var $content = $(this);
+ var text = $content.text();
+ var lineSyntaxes;
+ var pos;
+ if ($td.hasClass("old") && $td.hasClass("new")) {
+ if ($content.hasClass("insert")) {
+ lineSyntaxes = newLineSyntaxes;
+ pos = newPos;
+ newPos += text.length;
+ } else if ($content.hasClass("delete")) {
+ lineSyntaxes = oldLineSyntaxes;
+ pos = oldPos;
+ oldPos += text.length;
+ } else {
+ lineSyntaxes = oldLineSyntaxes;
+ pos = oldPos;
+ oldPos += text.length;
+ newPos += text.length;
+ }
+ } else if ($td.hasClass("new")) {
+ lineSyntaxes = newLineSyntaxes;
+ pos = newPos;
+ newPos += text.length;
+ } else if ($td.hasClass("old")) {
+ lineSyntaxes = oldLineSyntaxes;
+ pos = oldPos;
+ oldPos += text.length;
+ } else if ($td.hasClass("right")) {
+ lineSyntaxes = newLineSyntaxes;
+ pos = newPos;
+ oldPos += text.length;
+ newPos += text.length;
+ } else {
+ lineSyntaxes = oldLineSyntaxes;
+ pos = oldPos;
+ oldPos += text.length;
+ newPos += text.length;
+ }
+
+ for (var i=0; i<text.length; i++) {
+ var currentClassNames = "";
+ function appendCurrentClassName(className) {
+ if (currentClassNames.length != 0)
+ currentClassNames += " ";
+ currentClassNames += className;
+ }
+
+ if ($content.hasClass("insert"))
+ appendCurrentClassName("insert");
+ if ($content.hasClass("delete"))
+ appendCurrentClassName("delete");
+ if ($content.hasClass("content-mark"))
+ appendCurrentClassName("content-mark");
+
+ if (lineSyntaxes) {
+ var syntaxClassNames = lineSyntaxes[pos+i];
+ if (syntaxClassNames != undefined && syntaxClassNames.length != 0)
+ appendCurrentClassName(syntaxClassNames);
+ }
+ if (currentClassNames != classNames) {
+ appendPartial();
+ partial = [];
+ classNames = currentClassNames;
+ }
+ partial.push(text.charAt(i));
+ }
+ })
+ appendPartial();
+ $td.html($highlighted.html());
+ });
+
+ var $contents = $codeTr.children("td.content");
+ if ($contents.length == 2) {
+ if (!$contents.first().hasClass("none"))
+ oldLineIndex++;
+ if (!$contents.last().hasClass("none"))
+ newLineIndex++;
+ } else {
+ if ($contents.hasClass("old") || $contents.hasClass("equal"))
+ oldLineIndex++;
+ if ($contents.hasClass("new") || $contents.hasClass("equal"))
+ newLineIndex++;
+ }
+
+ $codeTr.find(onedev.server.textDiff.symbolClasses).mouseover($container.data("symbolHover"));
+ if ($codeTr.is($lastCodeTr))
+ break;
+ $codeTr = $codeTr.next();
+ }
+
+ $codeTrs.addClass("syntaxHighlighted");
+ }
+ }
+
+ var oldModeInfo = onedev.server.codemirror.findModeByFileName(oldBlobPath);
+ if (oldModeInfo) {
+ onedev.server.codemirror.highlightSyntax(
+ oldLines.join("\n"),
+ oldModeInfo,
+ function(text, style, lineIndex, beginPos) {
+ saveSyntaxes(oldSyntaxes, text, style, lineIndex, beginPos);
+ },
+ undefined,
+ function() {
+ oldProcessed = true;
+ doneHighlight();
+ }
+ );
+ } else {
+ oldProcessed = true;
+ doneHighlight();
+ }
+
+ var newModeInfo = onedev.server.codemirror.findModeByFileName(newBlobPath);
+ if (newModeInfo) {
+ onedev.server.codemirror.highlightSyntax(
+ newLines.join("\n"),
+ newModeInfo,
+ function(text, style, lineIndex, beginPos) {
+ saveSyntaxes(newSyntaxes, text, style, lineIndex, beginPos);
+ },
+ undefined,
+ function() {
+ newProcessed = true;
+ doneHighlight();
+ }
+ );
+ } else {
+ newProcessed = true;
+ doneHighlight();
+ }
+ });
+
+
},
initBlameTooltip: function(containerId, $hashLink) {
var $container = $("#" + containerId);
@@ -558,8 +822,6 @@ onedev.server.textDiff = {
} else {
$expandedTrs = $nextTr.prevAll();
}
- var $symbols = $expandedTrs.find(onedev.server.textDiff.symbolClasses);
- $symbols.mouseover($container.data("symbolHover"));
$expandedTrs.find("td.content").mouseover($container.data("onMouseOverContent"));
var $firstExpandedTr = $expandedTrs.first();
@@ -603,6 +865,7 @@ onedev.server.textDiff = {
}
onedev.server.textDiff.initBlameTooltip(containerId, $expandedTrs.find(">td.blame>a.hash"));
+ onedev.server.textDiff.highlightSyntax($container);
},
getMarkInfo: function($container, markRange) {
var oldOrNew = markRange.leftSide?"old":"new";
@@ -679,7 +942,6 @@ onedev.server.textDiff = {
var ch = 0;
if (!$td.hasClass("content-mark")) {
$td.addClass("content-mark");
- $td.data("beforemark", $td.html());
}
$td.contents().each(function() {
var $this = $(this);
@@ -785,11 +1047,8 @@ onedev.server.textDiff = {
clearMark: function($container) {
$container.find("td.content.content-mark").each(function() {
var $this = $(this);
- $this.html($this.data("beforemark"));
$this.removeClass("content-mark");
- $this.removeData("beforemark");
- $container = $this.closest(".text-diff").parent();
- $this.find(onedev.server.textDiff.symbolClasses).mouseover($container.data("symbolHover"));
+ $this.find("span").removeClass("content-mark");
});
},
restoreMark: function($container) {
@@ -1077,4 +1336,4 @@ $(function() {
if ($(e.target).closest(".problem-popover, .problem-trigger").length == 0)
$('.problem-popover').popover("hide");
});
-});
\ No newline at end of file
+});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java b/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java
index b85fec17a8..96fc02d099 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java
@@ -10,7 +10,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
@SuppressWarnings("serial")
public class DiffStatBar extends Panel {
- private static final int MAX_BLOCKS = 5;
+ private static final int MAX_BLOCKS = 6;
private final int additions;
@@ -72,23 +72,31 @@ public class DiffStatBar extends Panel {
private int getAdditionBlocks() {
int totals = additions + deletions;
- if (totals == 0)
+ if (totals == 0) {
return 0;
- else if (totals <= MAX_BLOCKS)
+ } else if (totals <= MAX_BLOCKS) {
return additions;
- else
- return Math.round(Float.valueOf(additions) / totals * MAX_BLOCKS);
+ } else {
+ int additionBlocks = Math.round(Float.valueOf(additions) / totals * MAX_BLOCKS);
+ if (additionBlocks <= 0 && additions != 0)
+ additionBlocks = 1;
+ return additionBlocks;
+ }
}
private int getDeletionBlocks() {
int totals = additions + deletions;
- if (totals == 0)
+ if (totals == 0) {
return 0;
- else if (totals <= MAX_BLOCKS)
+ } else if (totals <= MAX_BLOCKS) {
return deletions;
- else
- return MAX_BLOCKS - getAdditionBlocks();
+ } else {
+ int deletionBlocks = MAX_BLOCKS - getAdditionBlocks();
+ if (deletionBlocks <= 0 && deletions != 0)
+ deletionBlocks = 1;
+ return deletionBlocks;
+ }
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 5e2b814493..b0e2d0dccb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -298,7 +298,7 @@ public abstract class LayoutPage extends BasePage {
WebMarkupContainer menuLink;
if (menuItem instanceof SidebarMenuItem.Page) {
SidebarMenuItem.Page page = (SidebarMenuItem.Page) menuItem;
- menuLink = new BookmarkablePageLink<Void>("link", page.getPageClass(), page.getPageParams());
+ menuLink = new ViewStateAwarePageLink<Void>("link", page.getPageClass(), page.getPageParams());
menuLink.add(new WebMarkupContainer("arrow").setVisible(false));
item.add(new WebMarkupContainer("subMenu").setVisible(false));
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
index 2dcbedb45d..e252e9cfba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
@@ -206,15 +206,6 @@ onedev.server.sourceView = {
$body.find(".tree-content").removeClass("active");
$symbol.addClass("active");
},
- restoreMark: function() {
- var $sourceView = $(".source-view");
- var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
- var markRange = $sourceView.data("markRange");
- if (markRange)
- onedev.server.codemirror.mark(cm, markRange);
- else
- onedev.server.codemirror.clearMark(cm);
- },
addCoverageGutter: function(line, coverageStatus) {
console.log(coverageStatus);
let tooltip;
@@ -252,7 +243,7 @@ onedev.server.sourceView = {
$trigger.mouseover(function() {
onedev.server.codemirror.mark(cm, markRanges);
}).mouseout(function() {
- onedev.server.sourceView.restoreMark();
+ onedev.server.sourceView.clearMark();
});
$trigger.mousedown(function() {
@@ -274,7 +265,7 @@ onedev.server.sourceView = {
$currentPopover.find(".problem-content").mouseover(function() {
onedev.server.codemirror.mark(cm, problems[$(this).index()].range);
}).mouseout(function() {
- onedev.server.sourceView.restoreMark();
+ onedev.server.sourceView.clearMark();
}).each(function() {
var problem = problems[$(this).index()];
$(this).children(".add-comment").click(function() {
@@ -346,7 +337,7 @@ onedev.server.sourceView = {
onedev.server.codemirror.mark(cm, comment.range);
});
$(this).mouseout(function() {
- onedev.server.sourceView.restoreMark();
+ onedev.server.sourceView.clearMark();
});
$(this).click(function() {
if (!$(this).hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges()) {
@@ -370,7 +361,7 @@ onedev.server.sourceView = {
$indicator.mouseover(function() {
onedev.server.codemirror.mark(cm, comment.range);
}).mouseout(function() {
- onedev.server.sourceView.restoreMark();
+ onedev.server.sourceView.clearMark();
});
$indicator.click(function() {
if (!$indicator.hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges()) {