Skip to content

The Unified and Autonomous Development Platform

fix: Syntax highlight and symbol navigation not work in diff (OD-2167)

Robin Shen53178b541206
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 1ee1c4fcf0..b3d32991ae 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
@@ -64,6 +64,7 @@ import java.util.*;
import static io.onedev.server.codequality.BlobTarget.groupByLine;
import static io.onedev.server.util.diff.DiffRenderer.toHtml;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
+import static org.unbescape.javascript.JavaScriptEscape.escapeJavaScript;
@SuppressWarnings("serial")
public class BlobTextDiffPanel extends Panel {
@@ -259,7 +260,7 @@ public class BlobTextDiffPanel extends Panel {
String expanded = StringUtils.replace(builder.toString(), "\n", "");
String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",
- getMarkupId(), index, JavaScriptEscape.escapeJavaScript(expanded));
+ getMarkupId(), index, escapeJavaScript(expanded));
target.appendJavaScript(script);
break;
case "openSelectionPopover":
@@ -272,7 +273,7 @@ public class BlobTextDiffPanel extends Panel {
if (getAnnotationSupport() != null) {
markUrl = getAnnotationSupport().getMarkUrl(commentRange);
if (markUrl != null)
- markUrl = "'" + JavaScriptEscape.escapeJavaScript(markUrl) + "'";
+ markUrl = "'" + escapeJavaScript(markUrl) + "'";
else
markUrl = "undefined";
} else {
@@ -280,7 +281,7 @@ public class BlobTextDiffPanel extends Panel {
}
script = String.format("onedev.server.blobTextDiff.openSelectionPopover('%s', %s, %s, %s, '%s', %s);",
getMarkupId(), jsonOfPosition, convertToJson(commentRange), markUrl,
- JavaScriptEscape.escapeJavaScript(getMarkedText(commentRange)),
+ escapeJavaScript(getMarkedText(commentRange)),
SecurityUtils.getAuthUser()!=null);
target.appendJavaScript(script);
break;
@@ -347,10 +348,12 @@ public class BlobTextDiffPanel extends Panel {
add(symbolTooltip);
add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
@Override
public String getObject() {
return blameInfo!=null? "blob-text-diff need-width": "blob-text-diff";
}
+
}));
setOutputMarkupId(true);
}
@@ -398,8 +401,12 @@ public class BlobTextDiffPanel extends Panel {
explicit("param3"), explicit("param4"), explicit("param5"),
explicit("param6"), explicit("param7"), explicit("param8"));
- String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s);", getMarkupId(), symbolTooltip.getMarkupId(),
- change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,
+ String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s);",
+ getMarkupId(), symbolTooltip.getMarkupId(),
+ change.getOldBlobIdent().revision,
+ change.getNewBlobIdent().revision,
+ change.getOldBlobIdent().path!=null? escapeJavaScript(change.getOldBlobIdent().path):"",
+ change.getNewBlobIdent().path!=null? escapeJavaScript(change.getNewBlobIdent().path):"",
callback, blameMessageBehavior.getCallback(),
convertToJson(markRange), convertToJson(openCommentInfo),
convertToJson(annotationInfoModel.getObject()),
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
index 3f35af7b00..a8f5f0e8f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
@@ -1,10 +1,13 @@
onedev.server.blobTextDiff = {
symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta, .cm-string, .cm-tag, .cm-attribute, cm-builtin, cm-qualifier",
- onDomReady: function(containerId, symbolTooltipId, oldRev, newRev, callback, blameMessageCallback,
- markRange, openComment, annotationInfo, commentContainerId) {
+ onDomReady: function(containerId, symbolTooltipId, oldRev, newRev, oldPath, newPath,
+ callback, blameMessageCallback, markRange, openComment,
+ annotationInfo, commentContainerId) {
var $container = $("#" + containerId);
$container.data("commentContainerId", commentContainerId);
$container.data("callback", callback);
+ $container.data("oldPath", oldPath);
+ $container.data("newPath", newPath);
$container.data("blameMessageCallback", blameMessageCallback);
$container.data("symbolHover", function() {
var revision;
@@ -487,8 +490,8 @@ onedev.server.blobTextDiff = {
if (!$scrollParent.data("onTextDiffScrollInstalled")) {
$scrollParent.data("onTextDiffScrollInstalled", true);
$scrollParent.doneEvents("scroll", function() {
- $(".text-diff").each(function() {
- onedev.server.blobTextDiff.highlightSyntax($(this).parent());
+ $(".blob-text-diff").each(function() {
+ onedev.server.blobTextDiff.highlightSyntax($(this));
}, 100);
});
}
@@ -496,8 +499,8 @@ onedev.server.blobTextDiff = {
onedev.server.blobTextDiff.highlightSyntax($container);
},
highlightSyntax($container) {
- var oldBlobPath = $container.find(".diff-title>span:first-child").text();
- var newBlobPath = $container.find(".diff-title>span:last-child").text();
+ var oldBlobPath = $container.data("oldPath");
+ var newBlobPath = $container.data("newPath");
$container.find("tbody, tr.expander").each(function() {
var $this = $(this);