Skip to content

The Unified and Autonomous Development Platform

Lazy load comment/problem/coverage info in source view to show file quickly

Robin Shen27e5c75bc80e
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java
index 4c403e3bed..d7ccc1a18c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java
@@ -2,11 +2,13 @@ package io.onedev.server.entitymanager;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -20,7 +22,7 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {
Collection<CodeComment> query(Project project, ObjectId...commitIds);
- Collection<CodeComment> queryInHistory(Project project, ObjectId commitId, String path);
+ Map<CodeComment, PlanarRange> queryInHistory(Project project, ObjectId commitId, String path);
List<CodeComment> query(Project project, @Nullable PullRequest request,
EntityQuery<CodeComment> commentQuery, int firstResult, int maxResults);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 6aa397f8d8..ab5c664f34 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -147,8 +147,8 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
}
@Override
- public Collection<CodeComment> queryInHistory(Project project, ObjectId commitId, String path) {
- Collection<CodeComment> comments = new ArrayList<>();
+ public Map<CodeComment, PlanarRange> queryInHistory(Project project, ObjectId commitId, String path) {
+ Map<CodeComment, PlanarRange> comments = new HashMap<>();
Map<String, Map<String, List<CodeComment>>> possibleComments = new HashMap<>();
Collection<String> possiblePaths = Sets.newHashSet(path);
@@ -161,7 +161,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
for (CodeComment comment: query(criteria)) {
String possiblePath = comment.getMark().getPath();
if (comment.getMark().getCommitHash().equals(commitId.name()) && possiblePath.equals(path)) {
- comments.add(comment);
+ comments.put(comment, comment.getMark().getRange());
} else {
Map<String, List<CodeComment>> commentsOnCommit =
possibleComments.get(comment.getMark().getCommitHash());
@@ -226,7 +226,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
for (CodeComment comment: pathEntry.getValue()) {
PlanarRange newRange = DiffUtils.mapRange(lineMapping, comment.getMark().getRange());
if (newRange != null)
- comments.add(comment);
+ comments.put(comment, newRange);
}
if (++checkedHistoryFiles == MAX_HISTORY_FILES_TO_CHECK) {
return comments;
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 1e0db48a34..013d6e5767 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -26,18 +26,15 @@ import javax.persistence.Table;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.LastUpdate;
@@ -261,22 +258,6 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
}
}
- @Nullable
- public PlanarRange mapRange(BlobIdent blobIdent) {
- RevCommit commit = project.getRevCommit(blobIdent.revision, true);
- if (commit.name().equals(getMark().getCommitHash())) {
- return getMark().getRange();
- } else {
- List<String> newLines = Preconditions.checkNotNull(
- GitUtils.readLines(getProject().getRepository(), commit, blobIdent.path, WhitespaceOption.DEFAULT));
-
- RevCommit commitOfComment = project.getRevCommit(getMark().getCommitHash(), true);
- List<String> oldLines = Preconditions.checkNotNull(
- GitUtils.readLines(getProject().getRepository(), commitOfComment, getMark().getPath(), WhitespaceOption.DEFAULT));
- return DiffUtils.mapRange(DiffUtils.mapLines(oldLines, newLines), getMark().getRange());
- }
- }
-
public boolean isContextChanged(PullRequest request) {
if (contextChanged == null) {
if (request.getLatestUpdate().getHeadCommitHash().equals(mark.getCommitHash())) {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
index d57ad8449c..6da1d6e161 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
@@ -8,10 +8,10 @@
background: #8950FC;
}
.cm-identifierhighlight.CodeMirror-mark {
- background: #ad91ee;
+ background: var(--dark);
}
.cm-searching.CodeMirror-mark {
- background: #c4a7d3;
+ background: var(--warning);
}
.cm-searching.cm-identifierhighlight {
background: #e8e9c5;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
index 2f7f770ba7..bc70e3fefa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
@@ -24,12 +24,11 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.diff.DiffRenderer;
import io.onedev.server.web.component.diff.blob.text.TextDiffPanel;
import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;
-import io.onedev.server.web.component.diff.revision.BlobCommentSupport;
import io.onedev.server.web.component.diff.revision.DiffViewMode;
import io.onedev.server.web.component.svg.SpriteImage;
@SuppressWarnings("serial")
-public class BlobDiffPanel extends Panel implements SourceAware {
+public class BlobDiffPanel extends Panel {
private static final String CONTENT_ID = "content";
@@ -43,11 +42,11 @@ public class BlobDiffPanel extends Panel implements SourceAware {
private final DiffViewMode diffMode;
- private final BlobCommentSupport commentSupport;
+ private final TextDiffPanel.AnnotationSupport commentSupport;
public BlobDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,
BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,
- @Nullable BlobCommentSupport commentSupport) {
+ @Nullable TextDiffPanel.AnnotationSupport commentSupport) {
super(id);
this.projectModel = projectModel;
@@ -154,57 +153,51 @@ public class BlobDiffPanel extends Panel implements SourceAware {
super.onDetach();
}
- @Override
public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
Component content = get(CONTENT_ID);
- if (content instanceof SourceAware) {
- SourceAware sourceAware = (SourceAware) content;
- sourceAware.onCommentDeleted(target, comment);
+ if (content instanceof TextDiffPanel) {
+ TextDiffPanel textDiffPanel = (TextDiffPanel) content;
+ textDiffPanel.onCommentDeleted(target, comment);
}
}
- @Override
public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {
Component content = get(CONTENT_ID);
- if (content instanceof SourceAware) {
- SourceAware sourceAware = (SourceAware) content;
- sourceAware.onCommentClosed(target, comment);
+ if (content instanceof TextDiffPanel) {
+ TextDiffPanel textDiffPanel = (TextDiffPanel) content;
+ textDiffPanel.onCommentClosed(target, comment);
}
}
- @Override
public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {
Component content = get(CONTENT_ID);
- if (content instanceof SourceAware) {
- SourceAware sourceAware = (SourceAware) content;
- sourceAware.onCommentAdded(target, comment);
+ if (content instanceof TextDiffPanel) {
+ TextDiffPanel textDiffPanel = (TextDiffPanel) content;
+ textDiffPanel.onCommentAdded(target, comment);
}
}
- @Override
public void mark(AjaxRequestTarget target, Mark mark) {
Component content = get(CONTENT_ID);
- if (content instanceof SourceAware) {
- SourceAware sourceAware = (SourceAware) content;
- sourceAware.mark(target, mark);
+ if (content instanceof TextDiffPanel) {
+ TextDiffPanel textDiffPanel = (TextDiffPanel) content;
+ textDiffPanel.mark(target, mark);
}
}
- @Override
public void unmark(AjaxRequestTarget target) {
Component content = get(CONTENT_ID);
- if (content instanceof SourceAware) {
- SourceAware sourceAware = (SourceAware) content;
- sourceAware.unmark(target);
+ if (content instanceof TextDiffPanel) {
+ TextDiffPanel textDiffPanel = (TextDiffPanel) content;
+ textDiffPanel.unmark(target);
}
}
- @Override
public void onUnblame(AjaxRequestTarget target) {
Component content = get(CONTENT_ID);
- if (content instanceof SourceAware) {
- SourceAware sourceAware = (SourceAware) content;
- sourceAware.onUnblame(target);
+ if (content instanceof TextDiffPanel) {
+ TextDiffPanel textDiffPanel = (TextDiffPanel) content;
+ textDiffPanel.onUnblame(target);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/SourceAware.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/SourceAware.java
deleted file mode 100644
index 03b9440e34..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/SourceAware.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.onedev.server.web.component.diff.blob;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.support.Mark;
-
-public interface SourceAware {
-
- void onCommentDeleted(AjaxRequestTarget target, CodeComment comment);
-
- void onCommentClosed(AjaxRequestTarget target, CodeComment comment);
-
- void onCommentAdded(AjaxRequestTarget target, CodeComment comment);
-
- void mark(AjaxRequestTarget target, Mark mark);
-
- void unmark(AjaxRequestTarget target);
-
- void onUnblame(AjaxRequestTarget target);
-}
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 850a7578e8..86f55e852b 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
@@ -4,6 +4,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -69,11 +70,9 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
-import io.onedev.server.web.component.diff.blob.SourceAware;
import io.onedev.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type;
import io.onedev.server.web.component.diff.diffstat.DiffStatBar;
import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;
-import io.onedev.server.web.component.diff.revision.BlobCommentSupport;
import io.onedev.server.web.component.diff.revision.DiffViewMode;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.svg.SpriteImage;
@@ -87,7 +86,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergeP
import io.onedev.server.web.util.EditParamsAware;
@SuppressWarnings("serial")
-public class TextDiffPanel extends Panel implements SourceAware {
+public class TextDiffPanel extends Panel {
private final IModel<Project> projectModel;
@@ -101,7 +100,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
private final IModel<Boolean> blameModel;
- private final BlobCommentSupport commentSupport;
+ private final AnnotationSupport commentSupport;
private final List<Mark> initialMarks;
@@ -117,7 +116,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
public TextDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,
BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,
- @Nullable BlobCommentSupport commentSupport) {
+ @Nullable AnnotationSupport commentSupport) {
super(id);
this.projectModel = projectModel;
@@ -579,7 +578,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
} else {
jsonOfCommentInfo = "undefined";
}
- dirtyContainerId = "'" + commentSupport.getDirtyContainer().getMarkupId() + "'";
+ dirtyContainerId = "'" + commentSupport.getCommentContainer().getMarkupId() + "'";
} else {
jsonOfMark = "undefined";
jsonOfCommentInfo = "undefined";
@@ -1174,7 +1173,6 @@ public class TextDiffPanel extends Panel implements SourceAware {
return jsonOfCommentInfo;
}
- @Override
public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'), %s);",
getMarkupId(), getJsonOfComment(comment));
@@ -1182,21 +1180,18 @@ public class TextDiffPanel extends Panel implements SourceAware {
unmark(target);
}
- @Override
public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {
String script = String.format("onedev.server.textDiff.onCloseComment($('#%s'));", getMarkupId());
target.appendJavaScript(script);
unmark(target);
}
- @Override
public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {
String script = String.format("onedev.server.textDiff.onCommentAdded($('#%s'), %s);",
getMarkupId(), getJsonOfComment(comment));
target.appendJavaScript(script);
}
- @Override
public void mark(AjaxRequestTarget target, Mark mark) {
String script = String.format(""
+ "var $container = $('#%s');"
@@ -1207,7 +1202,6 @@ public class TextDiffPanel extends Panel implements SourceAware {
target.appendJavaScript(script);
}
- @Override
public void unmark(AjaxRequestTarget target) {
String script = String.format(""
+ "var $container = $('#%s');"
@@ -1217,7 +1211,6 @@ public class TextDiffPanel extends Panel implements SourceAware {
target.appendJavaScript(script);
}
- @Override
public void onUnblame(AjaxRequestTarget target) {
blameInfo = null;
target.add(this);
@@ -1271,4 +1264,22 @@ public class TextDiffPanel extends Panel implements SourceAware {
}
+ public static interface AnnotationSupport extends Serializable {
+
+ @Nullable Mark getMark();
+
+ String getMarkUrl(Mark mark);
+
+ Collection<CodeComment> getComments();
+
+ @Nullable CodeComment getOpenComment();
+
+ void onOpenComment(AjaxRequestTarget target, CodeComment comment);
+
+ void onAddComment(AjaxRequestTarget target, Mark mark);
+
+ Component getCommentContainer();
+
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/BlobCommentSupport.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/BlobCommentSupport.java
deleted file mode 100644
index ea73f97d81..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/BlobCommentSupport.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.web.component.diff.revision;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.support.Mark;
-
-public interface BlobCommentSupport extends Serializable {
-
- @Nullable Mark getMark();
-
- String getMarkUrl(Mark mark);
-
- Collection<CodeComment> getComments();
-
- @Nullable CodeComment getOpenComment();
-
- void onOpenComment(AjaxRequestTarget target, CodeComment comment);
-
- void onAddComment(AjaxRequestTarget target, Mark mark);
-
- Component getDirtyContainer();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/CommentSupport.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/CommentSupport.java
deleted file mode 100644
index 9e6610b060..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/CommentSupport.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.web.component.diff.revision;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentReply;
-import io.onedev.server.model.support.Mark;
-
-public interface CommentSupport extends Serializable {
-
- @Nullable Mark getMark();
-
- @Nullable
- String getMarkUrl(Mark mark);
-
- void onMark(AjaxRequestTarget target, Mark mark);
-
- void onUnmark(AjaxRequestTarget target);
-
- @Nullable CodeComment getOpenComment();
-
- void onCommentOpened(AjaxRequestTarget target, CodeComment comment);
-
- void onCommentClosed(AjaxRequestTarget target);
-
- void onAddComment(AjaxRequestTarget target, Mark mark);
-
- Collection<CodeComment> getComments();
-
- void onSaveComment(CodeComment comment);
-
- void onSaveCommentReply(CodeCommentReply reply);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 3831c89e1d..0d37d99e50 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.diff.revision;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -92,7 +93,7 @@ import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
import io.onedev.server.web.component.diff.blob.BlobDiffPanel;
-import io.onedev.server.web.component.diff.blob.SourceAware;
+import io.onedev.server.web.component.diff.blob.text.TextDiffPanel;
import io.onedev.server.web.component.diff.diffstat.DiffStatBar;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
@@ -131,7 +132,7 @@ public class RevisionDiffPanel extends Panel {
private final IModel<String> blameModel;
- private final CommentSupport commentSupport;
+ private final AnnotationSupport commentSupport;
private final IModel<String> pathFilterModel;
@@ -352,7 +353,7 @@ public class RevisionDiffPanel extends Panel {
public RevisionDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,
String oldRev, String newRev, IModel<String> pathFilterModel, IModel<WhitespaceOption> whitespaceOptionModel,
- @Nullable IModel<String> blameModel, @Nullable CommentSupport commentSupport) {
+ @Nullable IModel<String> blameModel, @Nullable AnnotationSupport commentSupport) {
super(id);
this.projectModel = projectModel;
@@ -378,8 +379,8 @@ public class RevisionDiffPanel extends Panel {
String prevBlameFile = blameModel.getObject();
blameModel.setObject(object);
if (prevBlameFile != null && object != null && !prevBlameFile.equals(object)) {
- SourceAware sourceAware = getSourceAware(prevBlameFile);
- sourceAware.onUnblame(target);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevBlameFile);
+ blobDiffPanel.onUnblame(target);
}
}
@@ -725,7 +726,7 @@ public class RevisionDiffPanel extends Panel {
item.setMarkupId("diff-" + encodePath(change.getPath()));
if (commentSupport != null) {
item.add(new BlobDiffPanel(DIFF_ID, projectModel, requestModel, change, diffMode,
- getBlobBlameModel(change), new BlobCommentSupport() {
+ getBlobBlameModel(change), new TextDiffPanel.AnnotationSupport() {
@Override
public Mark getMark() {
@@ -818,10 +819,10 @@ public class RevisionDiffPanel extends Panel {
clearComment(target);
Mark mark = getMark();
if (mark != null) {
- SourceAware sourceAware = getSourceAware(mark.getPath());
- if (sourceAware != null)
- sourceAware.unmark(target);
- ((CommentSupport)commentSupport).onUnmark(target);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(mark.getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.unmark(target);
+ ((AnnotationSupport)commentSupport).onUnmark(target);
}
}
@@ -880,11 +881,11 @@ public class RevisionDiffPanel extends Panel {
commentContainer.replace(commentPanel);
target.add(commentContainer);
- SourceAware sourceAware = getSourceAware(comment.getMark().getPath());
- if (sourceAware != null)
- sourceAware.onCommentAdded(target, comment);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.onCommentAdded(target, comment);
- ((CommentSupport)commentSupport).onCommentOpened(target, comment);
+ ((AnnotationSupport)commentSupport).onCommentOpened(target, comment);
}
});
@@ -896,18 +897,18 @@ public class RevisionDiffPanel extends Panel {
Mark prevMark = RevisionDiffPanel.this.getMark();
if (prevMark != null) {
- SourceAware sourceAware = getSourceAware(prevMark.getPath());
- if (sourceAware != null)
- sourceAware.unmark(target);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevMark.getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.unmark(target);
}
CodeComment prevComment = RevisionDiffPanel.this.getOpenComment();
if (prevComment != null) {
- SourceAware sourceAware = getSourceAware(prevComment.getMark().getPath());
- if (sourceAware != null)
- sourceAware.onCommentClosed(target, prevComment);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevComment.getMark().getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.onCommentClosed(target, prevComment);
}
- ((CommentSupport)commentSupport).onAddComment(target, mark);
+ ((AnnotationSupport)commentSupport).onAddComment(target, mark);
String script = String.format(""
+ "setTimeout(function() {"
+ " var $textarea = $('#%s textarea');"
@@ -924,7 +925,7 @@ public class RevisionDiffPanel extends Panel {
}
@Override
- public Component getDirtyContainer() {
+ public Component getCommentContainer() {
return commentContainer;
}
@@ -1007,16 +1008,16 @@ public class RevisionDiffPanel extends Panel {
CodeComment prevComment = RevisionDiffPanel.this.getOpenComment();
if (prevComment != null) {
- SourceAware sourceAware = getSourceAware(prevComment.getMark().getPath());
- if (sourceAware != null)
- sourceAware.onCommentClosed(target, prevComment);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevComment.getMark().getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.onCommentClosed(target, prevComment);
}
Mark prevMark = RevisionDiffPanel.this.getMark();
if (prevMark != null) {
- SourceAware sourceAware = getSourceAware(prevMark.getPath());
- if (sourceAware != null)
- sourceAware.unmark(target);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevMark.getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.unmark(target);
}
commentSupport.onCommentOpened(target, comment);
}
@@ -1129,10 +1130,10 @@ public class RevisionDiffPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
Mark mark = getMark();
- SourceAware sourceAware = getSourceAware(mark.getPath());
- if (sourceAware != null)
- sourceAware.mark(target, mark);
- ((CommentSupport)commentSupport).onMark(target, mark);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(mark.getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.mark(target, mark);
+ ((AnnotationSupport)commentSupport).onMark(target, mark);
target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
}
@@ -1151,9 +1152,9 @@ public class RevisionDiffPanel extends Panel {
CodeComment comment = getOpenComment();
clearComment(target);
if (comment != null) {
- SourceAware sourceAware = getSourceAware(comment.getMark().getPath());
- if (sourceAware != null)
- sourceAware.onCommentClosed(target, comment);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.onCommentClosed(target, comment);
commentSupport.onCommentClosed(target);
}
}
@@ -1225,7 +1226,7 @@ public class RevisionDiffPanel extends Panel {
@Nullable
private CodeComment getOpenComment() {
if (commentSupport != null) {
- CodeComment comment = ((CommentSupport)commentSupport).getOpenComment();
+ CodeComment comment = ((AnnotationSupport)commentSupport).getOpenComment();
if (comment != null) {
PullRequest request = requestModel.getObject();
String commitHash = comment.getMark().getCommitHash();
@@ -1266,16 +1267,16 @@ public class RevisionDiffPanel extends Panel {
}
@Nullable
- private SourceAware getSourceAware(String path) {
- return diffsView.visitChildren(new IVisitor<Component, SourceAware>() {
+ private BlobDiffPanel getBlobDiffPanel(String blobPath) {
+ return diffsView.visitChildren(new IVisitor<Component, BlobDiffPanel>() {
@SuppressWarnings("unchecked")
@Override
- public void component(Component object, IVisit<SourceAware> visit) {
+ public void component(Component object, IVisit<BlobDiffPanel> visit) {
if (object instanceof ListItem) {
ListItem<BlobChange> item = (ListItem<BlobChange>) object;
- if (item.getModelObject().getPaths().contains(path)) {
- visit.stop((SourceAware) item.get(DIFF_ID));
+ if (item.getModelObject().getPaths().contains(blobPath)) {
+ visit.stop((BlobDiffPanel) item.get(DIFF_ID));
} else {
visit.dontGoDeeper();
}
@@ -1287,15 +1288,15 @@ public class RevisionDiffPanel extends Panel {
private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
clearComment(target);
- SourceAware sourceAware = getSourceAware(comment.getMark().getPath());
- if (sourceAware != null)
- sourceAware.onCommentDeleted(target, comment);
- ((CommentSupport)commentSupport).onCommentClosed(target);
+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.onCommentDeleted(target, comment);
+ ((AnnotationSupport)commentSupport).onCommentClosed(target);
Mark mark = getMark();
if (mark != null) {
- sourceAware = getSourceAware(mark.getPath());
- if (sourceAware != null)
- sourceAware.mark(target, mark);
+ blobDiffPanel = getBlobDiffPanel(mark.getPath());
+ if (blobDiffPanel != null)
+ blobDiffPanel.mark(target, mark);
}
}
@@ -1368,4 +1369,33 @@ public class RevisionDiffPanel extends Panel {
}
+ public static interface AnnotationSupport extends Serializable {
+
+ @Nullable
+ Mark getMark();
+
+ @Nullable
+ String getMarkUrl(Mark mark);
+
+ void onMark(AjaxRequestTarget target, Mark mark);
+
+ void onUnmark(AjaxRequestTarget target);
+
+ @Nullable
+ CodeComment getOpenComment();
+
+ void onCommentOpened(AjaxRequestTarget target, CodeComment comment);
+
+ void onCommentClosed(AjaxRequestTarget target);
+
+ void onAddComment(AjaxRequestTarget target, Mark mark);
+
+ Collection<CodeComment> getComments();
+
+ void onSaveComment(CodeComment comment);
+
+ void onSaveCommentReply(CodeCommentReply reply);
+
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index e1603da662..641f4e9620 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -1137,9 +1137,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
}
@Override
- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {
+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment, PlanarRange range) {
state.commentId = comment.getId();
- state.position = SourceRendererProvider.getPosition(Preconditions.checkNotNull(comment.mapRange(state.blobIdent)));
+ state.position = SourceRendererProvider.getPosition(range);
pushState(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
index 0f29886ec0..51bb465dd6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
@@ -89,7 +89,7 @@ public interface BlobRenderContext extends Serializable {
void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated, @Nullable String position);
- void onCommentOpened(AjaxRequestTarget target, CodeComment comment);
+ void onCommentOpened(AjaxRequestTarget target, CodeComment comment, PlanarRange range);
void onCommentClosed(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
index f702083f49..791bc1e854 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
@@ -36,7 +36,7 @@ class LastCommitsResource extends AbstractResource {
private static final long serialVersionUID = 1L;
- private static final String PARAM_REPO = "repo";
+ private static final String PARAM_PROJECT = "project";
private static final String PARAM_REVISION = "revision";
@@ -45,7 +45,7 @@ class LastCommitsResource extends AbstractResource {
@Override
protected ResourceResponse newResourceResponse(Attributes attributes) {
PageParameters params = attributes.getParameters();
- final Long projectId = params.get(PARAM_REPO).toLong();
+ final Long projectId = params.get(PARAM_PROJECT).toLong();
final String revision = params.get(PARAM_REVISION).toString();
final String path = params.get(PARAM_PATH).toOptionalString();
@@ -98,7 +98,7 @@ class LastCommitsResource extends AbstractResource {
public static PageParameters paramsOf(Project project, String revision, @Nullable String path) {
PageParameters params = new PageParameters();
- params.set(PARAM_REPO, project.getId());
+ params.set(PARAM_PROJECT, project.getId());
params.set(PARAM_REVISION, revision);
if (path != null)
params.set(PARAM_PATH, path);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
index 33962568bd..d7c462b392 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
@@ -1,7 +1,6 @@
onedev.server.folderView = {
onDomReady: function(containerId, lastCommitsUrl, userCardCallback) {
var $container = $("#" + containerId);
- var $folderView = $container.find(">.folder-view");
$.ajax({
url: lastCommitsUrl,
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfo.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfo.java
new file mode 100644
index 0000000000..7900c679b2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfo.java
@@ -0,0 +1,17 @@
+package io.onedev.server.web.page.project.blob.render.renderers.source;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.onedev.server.code.CodeProblem;
+
+class AnnotationInfo {
+
+ Map<Integer, List<CommentInfo>> comments = new HashMap<>();
+
+ Map<Integer, List<CodeProblem>> problems = new HashMap<>();
+
+ Map<Integer, Integer> coverages = new HashMap<>();
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResource.java
new file mode 100644
index 0000000000..781b7bb2f2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResource.java
@@ -0,0 +1,133 @@
+package io.onedev.server.web.page.project.blob.render.renderers.source;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.AbstractResource;
+import org.eclipse.jgit.lib.ObjectId;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.commons.utils.PlanarRange;
+import io.onedev.server.OneDev;
+import io.onedev.server.code.CodeProblem;
+import io.onedev.server.code.CodeProblemContribution;
+import io.onedev.server.code.LineCoverage;
+import io.onedev.server.code.LineCoverageContribution;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.security.SecurityUtils;
+
+class AnnotationInfoResource extends AbstractResource {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String PARAM_PROJECT = "project";
+
+ private static final String PARAM_COMMIT = "commit";
+
+ private static final String PARAM_PATH = "path";
+
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes) {
+ PageParameters params = attributes.getParameters();
+ final Long projectId = params.get(PARAM_PROJECT).toLong();
+ final ObjectId commitId = ObjectId.fromString(params.get(PARAM_COMMIT).toString());
+ final String path = params.get(PARAM_PATH).toString();
+
+ ResourceResponse response = new ResourceResponse();
+ response.setContentType("application/json");
+ response.setWriteCallback(new WriteCallback() {
+
+ @Override
+ public void writeData(Attributes attributes) throws IOException {
+ Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);
+
+ if (!SecurityUtils.canReadCode(project))
+ throw new UnauthorizedException();
+
+ AnnotationInfo annotationInfo = new AnnotationInfo();
+
+ CodeCommentManager codeCommentManager = OneDev.getInstance(CodeCommentManager.class);
+ for (Map.Entry<CodeComment, PlanarRange> entry: codeCommentManager
+ .queryInHistory(project, commitId, path).entrySet()) {
+ CodeComment comment = entry.getKey();
+ PlanarRange position = entry.getValue();
+ int line = position.getFromRow();
+ List<CommentInfo> commentsAtLine = annotationInfo.comments.get(line);
+ if (commentsAtLine == null) {
+ commentsAtLine = new ArrayList<>();
+ annotationInfo.comments.put(line, commentsAtLine);
+ }
+ CommentInfo commentInfo = new CommentInfo(comment, position);
+ commentsAtLine.add(commentInfo);
+ }
+ for (List<CommentInfo> value: annotationInfo.comments.values()) {
+ value.sort((o1, o2)->(int)(o1.id-o2.id));
+ }
+
+ Set<CodeProblem> problemDuplicationCheck = new HashSet<>();
+
+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);
+ for (Build build: buildManager.query(project, commitId, null, null, null, new HashMap<>())) {
+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {
+ for (CodeProblem problem: contribution.getCodeProblems(build, path)) {
+ if (problemDuplicationCheck.add(problem)) {
+ PlanarRange position = problem.getPosition();
+ int line = position.getFromRow();
+ List<CodeProblem> problemsAtLine = annotationInfo.problems.get(line);
+ if (problemsAtLine == null) {
+ problemsAtLine = new ArrayList<>();
+ annotationInfo.problems.put(line, problemsAtLine);
+ }
+ problemsAtLine.add(problem);
+ }
+ }
+ }
+
+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
+ for (LineCoverage coverage: contribution.getLineCoverages(build, path)) {
+ for (int line = coverage.getFromLine(); line <= coverage.getToLine(); line++) {
+ Integer testCount = annotationInfo.coverages.get(line);
+ if (testCount != null)
+ annotationInfo.coverages.put(line, testCount + coverage.getTestCount());
+ else
+ annotationInfo.coverages.put(line, coverage.getTestCount());
+ }
+ }
+ }
+ }
+ for (List<CodeProblem> value: annotationInfo.problems.values()) {
+ value.sort((o1, o2)->(int)(o1.getSeverity().ordinal()-o2.getSeverity().ordinal()));
+ }
+
+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
+ attributes.getResponse().write(mapper.writeValueAsString(annotationInfo));
+ }
+
+ });
+
+ return response;
+ }
+
+ public static PageParameters paramsOf(Project project, String commitHash, String path) {
+ PageParameters params = new PageParameters();
+ params.set(PARAM_PROJECT, project.getId());
+ params.set(PARAM_COMMIT, commitHash);
+ params.set(PARAM_PATH, path);
+
+ return params;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResourceReference.java
new file mode 100644
index 0000000000..0df1d1e621
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/AnnotationInfoResourceReference.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.page.project.blob.render.renderers.source;
+
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
+
+class AnnotationInfoResourceReference extends ResourceReference {
+
+ public static final String NAME = "annotationInfo";
+
+ public AnnotationInfoResourceReference() {
+ super(NAME);
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IResource getResource() {
+ return new AnnotationInfoResource();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/CommentInfo.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/CommentInfo.java
new file mode 100644
index 0000000000..a718403d79
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/CommentInfo.java
@@ -0,0 +1,20 @@
+package io.onedev.server.web.page.project.blob.render.renderers.source;
+
+import io.onedev.commons.utils.PlanarRange;
+import io.onedev.server.model.CodeComment;
+
+class CommentInfo {
+
+ CommentInfo(CodeComment comment, PlanarRange range) {
+ id = comment.getId();
+ updated = !comment.isVisitedAfter(comment.getLastUpdate().getDate());
+ this.range = range;
+ }
+
+ long id;
+
+ PlanarRange range;
+
+ boolean updated;
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
index 707409a7d4..cd7031f0a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
@@ -3,9 +3,8 @@
<div wicket:id="comment" class="comment need-width d-flex overflow-hidden flex-shrink-0">
<div class="content flex-grow-1 overflow-hidden d-flex flex-column">
<div wicket:id="head" class="head d-flex align-items-center px-3 py-2 flex-shrink-0 border-bottom">
- <a wicket:id="context" class="context btn btn-light btn-icon btn-xs btn-hover-primary mr-2" title="Compare with another revision"><wicket:svg href="diff" class="icon"></wicket:svg></a>
- <a wicket:id="locate" class="locate btn btn-light btn-icon btn-xs btn-hover-primary mr-auto" title="Locate marked text of this comment"><wicket:svg href="hand" class="icon"></wicket:svg></a>
- <a wicket:id="close" class="ml-3" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ <a wicket:id="locate" class="locate btn btn-light btn-icon btn-xs btn-hover-primary mr-auto" title="Show commented code"><wicket:svg href="hand" class="icon"></wicket:svg></a>
+ <a wicket:id="close" class="ml-2 text-muted text-hover-primary" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a>
</div>
<div wicket:id="body" class="body overflow-auto flex-grow-1 p-3"></div>
</div>
@@ -15,9 +14,9 @@
<div wicket:id="outline" class="outline need-width d-flex overflow-hidden flex-shrink-0">
<div class="ui-resizable-handle ui-resizable-w flex-shrink-0"></div>
<div class="content flex-grow-1 overflow-hidden d-flex flex-column">
- <div class="head d-flex align-items-center justify-content-between px-3 py-2 flex-shrink-0 border-bottom">
- <h6 class="mb-0">Outline</h6>
- <a wicket:id="close" class="text-muted text-hover-primary" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>
+ <div class="head d-flex align-items-center px-3 py-2 flex-shrink-0 border-bottom">
+ <h6 class="mb-0 mr-auto">Outline</h6>
+ <a wicket:id="close" class="text-muted text-hover-primary ml-3" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>
</div>
<div wicket:id="body" class="body overflow-auto flex-grow-1"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index 260bd5dac2..501d2f90b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -3,12 +3,9 @@ package io.onedev.server.web.page.project.blob.render.renderers.source;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import java.util.UUID;
import javax.annotation.Nullable;
@@ -38,7 +35,6 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -62,11 +58,6 @@ import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.code.CodeProblem;
-import io.onedev.server.code.CodeProblemContribution;
-import io.onedev.server.code.LineCoverage;
-import io.onedev.server.code.LineCoverageContribution;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.git.BlameBlock;
@@ -74,7 +65,6 @@ import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.BlameCommand;
-import io.onedev.server.model.Build;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Project;
@@ -86,7 +76,6 @@ import io.onedev.server.search.code.SearchManager;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.ProjectAndRevision;
import io.onedev.server.util.match.MatchScoreProvider;
import io.onedev.server.util.match.MatchScoreUtils;
import io.onedev.server.util.patternset.PatternSet;
@@ -95,13 +84,11 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.revisionpicker.RevisionSelector;
import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
@@ -111,7 +98,6 @@ import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
import io.onedev.server.web.page.project.blob.render.view.Positionable;
import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.util.WicketUtils;
@@ -132,93 +118,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
private final List<Symbol> symbols = new ArrayList<>();
- private final IModel<Map<Integer, List<CommentInfo>>> commentsModel =
- new LoadableDetachableModel<Map<Integer, List<CommentInfo>>>() {
-
- @Override
- protected Map<Integer, List<CommentInfo>> load() {
- Map<Integer, List<CommentInfo>> comments = new HashMap<>();
- CodeCommentManager codeCommentManager = OneDev.getInstance(CodeCommentManager.class);
- for (CodeComment comment: codeCommentManager.queryInHistory(
- context.getProject(), context.getCommit(), context.getBlobIdent().path)) {
- PlanarRange postion = comment.getMark().getRange();
- int line = postion.getFromRow();
- List<CommentInfo> commentsAtLine = comments.get(line);
- if (commentsAtLine == null) {
- commentsAtLine = new ArrayList<>();
- comments.put(line, commentsAtLine);
- }
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.range = postion;
- commentInfo.updated = !comment.isVisitedAfter(comment.getLastUpdate().getDate());
- commentsAtLine.add(commentInfo);
- }
- for (List<CommentInfo> value: comments.values()) {
- value.sort((o1, o2)->(int)(o1.id-o2.id));
- }
-
- return comments;
- }
-
- };
-
- private final IModel<Map<Integer, List<CodeProblem>>> problemsModel = new LoadableDetachableModel<Map<Integer, List<CodeProblem>>>() {
-
- @Override
- protected Map<Integer, List<CodeProblem>> load() {
- Set<CodeProblem> duplicationCheck = new HashSet<>();
- Map<Integer, List<CodeProblem>> problems = new HashMap<>();
- BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- for (Build build: buildManager.query(context.getProject(), context.getCommit(), null, null, null, new HashMap<>())) {
- for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {
- for (CodeProblem problem: contribution.getCodeProblems(build, context.getBlobIdent().path)) {
- if (duplicationCheck.add(problem)) {
- PlanarRange position = problem.getPosition();
- int line = position.getFromRow();
- List<CodeProblem> problemsAtLine = problems.get(line);
- if (problemsAtLine == null) {
- problemsAtLine = new ArrayList<>();
- problems.put(line, problemsAtLine);
- }
- problemsAtLine.add(problem);
- }
- }
- }
- }
- for (List<CodeProblem> value: problems.values()) {
- value.sort((o1, o2)->(int)(o1.getSeverity().ordinal()-o2.getSeverity().ordinal()));
- }
-
- return problems;
- }
-
- };
-
- private final IModel<Map<Integer, Integer>> coveragesModel = new LoadableDetachableModel<Map<Integer, Integer>>() {
-
- @Override
- protected Map<Integer, Integer> load() {
- Map<Integer, Integer> coverages = new HashMap<>();
- BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- for (Build build: buildManager.query(context.getProject(), context.getCommit(), null, null, null, new HashMap<>())) {
- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
- for (LineCoverage coverage: contribution.getLineCoverages(build, context.getBlobIdent().path)) {
- for (int line = coverage.getFromLine(); line <= coverage.getToLine(); line++) {
- Integer testCount = coverages.get(line);
- if (testCount != null)
- coverages.put(line, testCount + coverage.getTestCount());
- else
- coverages.put(line, coverage.getTestCount());
- }
- }
- }
- }
- return coverages;
- }
-
- };
-
private WebMarkupContainer commentContainer;
private WebMarkupContainer outline;
@@ -233,10 +132,13 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
private final boolean viewPlainMode;
+ private final PlanarRange initialRange;
+
public SourceViewPanel(String id, BlobRenderContext context, boolean viewPlainMode) {
super(id, context);
this.viewPlainMode = viewPlainMode;
+ initialRange = SourceRendererProvider.getRange(context.getPosition());
Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
@@ -343,73 +245,17 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
}
};
+ commentContainer.setDefaultModelObject(initialRange);
WebMarkupContainer head = new WebMarkupContainer("head");
head.setOutputMarkupId(true);
commentContainer.add(head);
- head.add(new DropdownLink("context") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(context.getPullRequest() == null && context.getOpenComment() != null);
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new RevisionSelector(id, new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return context.getProject();
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, String revision) {
- RevisionComparePage.State state = new RevisionComparePage.State();
- CodeComment comment = context.getOpenComment();
- state.commentId = comment.getId();
- state.mark = comment.getMark();
- state.compareWithMergeBase = false;
- state.leftSide = new ProjectAndRevision(comment.getProject(),
- comment.getMark().getCommitHash());
- state.rightSide = new ProjectAndRevision(comment.getProject(), revision);
- state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;
- state.whitespaceOption = context.getOpenComment().getCompareContext().getWhitespaceOption();
- PageParameters params = RevisionComparePage.paramsOf(comment.getProject(), state);
- setResponsePage(RevisionComparePage.class, params);
- }
-
- };
- }
-
- });
-
head.add(new AjaxLink<Void>("locate") {
@Override
public void onClick(AjaxRequestTarget target) {
- CodeComment comment = context.getOpenComment();
- PlanarRange range;
- if (comment != null) {
- range = null;
- for (List<CommentInfo> commentsAtLine: commentsModel.getObject().values()) {
- for (CommentInfo each: commentsAtLine) {
- if (each.id == comment.getId()) {
- range = each.range;
- break;
- }
- }
- }
- if (range == null)
- range = comment.getMark().getRange();
- } else {
- range = (PlanarRange) commentContainer.getDefaultModelObject();
- }
-
+ PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();
String position = SourceRendererProvider.getPosition(range);
position(target, position);
context.onPosition(target, position);
@@ -446,7 +292,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
+ SourceViewPanel.this.onCommentDeleted(target, comment, (PlanarRange) getDefaultModelObject());
}
@Override
@@ -481,18 +327,18 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
switch(params.getParameterValue("action").toString("")) {
case "openSelectionPopover":
- PlanarRange mark = getMark(params, "param1", "param2", "param3", "param4");
+ PlanarRange range = getRange(params, "param1", "param2", "param3", "param4");
- String position = SourceRendererProvider.getPosition(mark);
+ String position = SourceRendererProvider.getPosition(range);
String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s);",
- convertToJson(mark), context.getPositionUrl(position), SecurityUtils.getUser()!=null);
+ convertToJson(range), context.getPositionUrl(position), SecurityUtils.getUser()!=null);
target.appendJavaScript(script);
break;
case "addComment":
Preconditions.checkNotNull(SecurityUtils.getUser());
- mark = getMark(params, "param1", "param2", "param3", "param4");
- commentContainer.setDefaultModelObject(mark);
+ range = getRange(params, "param1", "param2", "param3", "param4");
+ commentContainer.setDefaultModelObject(range);
Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);
fragment.setOutputMarkupId(true);
@@ -510,8 +356,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
* Outside of pull request, no one will be notified of the comment. So we automatically
* mention authors of commented lines
*/
- LinearRange range = new LinearRange(mark.getFromRow(), mark.getToRow());
- for (User user: context.getProject().getAuthors(context.getBlobIdent().path, context.getCommit(), range)) {
+ for (User user: context.getProject().getAuthors(context.getBlobIdent().path, context.getCommit(),
+ new LinearRange(range.getFromRow(), range.getToRow()))) {
if (user.getEmail() != null)
mentions.append("@").append(user.getName()).append(" ");
}
@@ -569,12 +415,17 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
CodeComment comment = new CodeComment();
comment.setUUID(uuid);
- comment.setMark(new Mark());
- comment.getMark().setCommitHash(context.getCommit().name());
- comment.getMark().setPath(context.getBlobIdent().path);
+
+ Mark mark = new Mark();
+ mark.setCommitHash(context.getCommit().name());
+ mark.setPath(context.getBlobIdent().path);
+
+ PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();
+ mark.setRange(range);
+
+ comment.setMark(mark);
comment.setContent(contentInput.getModelObject());
comment.setUser(SecurityUtils.getUser());
- comment.getMark().setRange(mark);
comment.setProject(context.getProject());
comment.setRequest(context.getPullRequest());
comment.setCompareContext(getCompareContext());
@@ -585,7 +436,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
+ SourceViewPanel.this.onCommentDeleted(target, comment, range);
}
@Override
@@ -608,10 +459,11 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
commentContainer.replace(commentPanel);
target.add(commentContainer);
- String script = String.format("onedev.server.sourceView.onCommentAdded(%s);", getJsonOfComment(comment));
+ String script = String.format("onedev.server.sourceView.onCommentAdded(%s);",
+ convertToJson(new CommentInfo(comment, range)));
target.appendJavaScript(script);
- context.onCommentOpened(target, comment);
+ context.onCommentOpened(target, comment, range);
}
});
@@ -619,17 +471,20 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
commentContainer.replace(fragment);
commentContainer.setVisible(true);
target.add(commentContainer);
- context.onAddComment(target, mark);
- target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", convertToJson(mark)));
+ context.onAddComment(target, range);
+ target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", convertToJson(range)));
break;
case "openComment":
Long commentId = params.getParameterValue("param1").toLong();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ range = getRange(params, "param2", "param3", "param4", "param5");
+ commentContainer.setDefaultModelObject(range);
+
CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {
@Override
protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
+ PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();
+ SourceViewPanel.this.onCommentDeleted(target, comment, range);
}
@Override
@@ -652,9 +507,12 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
commentContainer.replace(commentPanel);
commentContainer.setVisible(true);
target.add(commentContainer);
- script = String.format("onedev.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));
+
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ script = String.format("onedev.server.sourceView.onOpenComment(%s);",
+ convertToJson(new CommentInfo(comment, range)));
target.appendJavaScript(script);
- context.onCommentOpened(target, comment);
+ context.onCommentOpened(target, comment, range);
break;
case "outlineSearch":
new ModalPanel(target) {
@@ -831,25 +689,18 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
return compareContext;
}
- private PlanarRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,
+ private PlanarRange getRange(IRequestParameters params, String beginLineParam, String beginCharParam,
String endLineParam, String endCharParam) {
int beginLine = params.getParameterValue(beginLineParam).toInt();
int beginChar = params.getParameterValue(beginCharParam).toInt();
int endLine = params.getParameterValue(endLineParam).toInt();
int endChar = params.getParameterValue(endCharParam).toInt();
- PlanarRange mark = new PlanarRange();
- mark.fromRow = beginLine;
- mark.fromColumn = beginChar;
- mark.toRow = endLine;
- mark.toColumn = endChar;
- return mark;
- }
-
- private String getJsonOfComment(CodeComment comment) {
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.range = Preconditions.checkNotNull(comment.mapRange(context.getBlobIdent()));
- return convertToJson(commentInfo);
+ PlanarRange range = new PlanarRange();
+ range.fromRow = beginLine;
+ range.fromColumn = beginChar;
+ range.toRow = endLine;
+ range.toColumn = endChar;
+ return range;
}
private void clearComment(AjaxRequestTarget target) {
@@ -858,10 +709,10 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
target.add(commentContainer);
}
- private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
+ private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment, PlanarRange range) {
clearComment(target);
String script = String.format("onedev.server.sourceView.onCommentDeleted(%s);",
- getJsonOfComment(comment));
+ convertToJson(new CommentInfo(comment, range)));
target.appendJavaScript(script);
context.onCommentClosed(target);
}
@@ -923,47 +774,46 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);
- String jsonOfCommentInfos = convertToJson(commentsModel.getObject());
- String jsonOfProblems = convertToJson(problemsModel.getObject());
- String jsonOfCoverages = convertToJson(coveragesModel.getObject());
- PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());
- String jsonOfMark = mark!=null? convertToJson(mark): "undefined";
-
+ CommentInfo openCommentInfo;
+ if (context.getOpenComment() != null) {
+ if (initialRange != null)
+ openCommentInfo = new CommentInfo(context.getOpenComment(), initialRange);
+ else
+ throw new IllegalStateException("An open comment should also comes with range");
+ } else {
+ openCommentInfo = null;
+ }
+
CharSequence callback = ajaxBehavior.getCallbackFunction(
explicit("action"), explicit("param1"), explicit("param2"),
- explicit("param3"), explicit("param4"));
+ explicit("param3"), explicit("param4"), explicit("param5"));
+
+ PageParameters params = AnnotationInfoResource.paramsOf(context.getProject(),
+ context.getCommit().name(), context.getBlobIdent().path);
+
+ String jsonOfInitialRange = convertToJson(initialRange);
String script = String.format("onedev.server.sourceView.onDomReady("
- + "'%s', '%s', %s, %s, '%s', '%s', %s, %s, %s, %s, %s, %s, %s, '%s');",
+ + "'%s', '%s', %s, %s, '%s', '%s', %s, %s, %s, %s, '%s', '%s');",
JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),
JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),
- context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",
- jsonOfMark,
+ convertToJson(openCommentInfo),
+ jsonOfInitialRange,
symbolTooltip.getMarkupId(),
context.getBlobIdent().revision,
jsonOfBlameInfos,
- jsonOfCommentInfos,
- jsonOfProblems,
- jsonOfCoverages,
callback,
blameMessageBehavior.getCallback(),
sourceFormat.getTabSize(),
- sourceFormat.getLineWrapMode());
+ sourceFormat.getLineWrapMode(),
+ urlFor(new AnnotationInfoResourceReference(), params).toString());
response.render(OnDomReadyHeaderItem.forScript(script));
- script = String.format("onedev.server.sourceView.onWindowLoad(%s);", jsonOfMark);
+ script = String.format("onedev.server.sourceView.onWindowLoad(%s);", jsonOfInitialRange);
response.render(OnLoadHeaderItem.forScript(script));
}
- @Override
- protected void onDetach() {
- commentsModel.detach();
- problemsModel.detach();
- coveragesModel.detach();
- super.onDetach();
- }
-
@SuppressWarnings("unused")
private static class BlameInfo {
@@ -983,19 +833,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
private String getSymbolId(List<Symbol> symbols, Symbol symbol) {
return "outline-symbol-" + symbols.indexOf(symbol);
}
-
- @SuppressWarnings("unused")
- private static class CommentInfo {
-
- long id;
-
- String title;
-
- PlanarRange range;
-
- boolean updated;
-
- }
@Override
protected boolean isEditSupported() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
index b74465cacc..bcdff1d4de 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -1,7 +1,7 @@
onedev.server.sourceView = {
onDomReady: function(filePath, fileContent, openComment, markRange, symbolTooltipId,
- revision, blameInfos, comments, problems, coverages, callback, blameMessageCallback,
- tabSize, lineWrapMode) {
+ revision, blameInfos, callback, blameMessageCallback, tabSize, lineWrapMode,
+ annotationInfoUrl) {
var $sourceView = $(".source-view");
var $code = $sourceView.children(".code");
@@ -36,33 +36,15 @@ onedev.server.sourceView = {
var gutters = cm.getOption("gutters").slice();
- if (!onedev.server.util.isObjEmpty(problems))
- gutters.splice(0, 0, "CodeMirror-problems");
- if (!onedev.server.util.isObjEmpty(coverages))
- gutters.splice(gutters.length-1, 0, "CodeMirror-coverages");
-
+ gutters.splice(0, 0, "CodeMirror-problems");
+ gutters.splice(gutters.length-1, 0, "CodeMirror-coverages");
gutters.splice(0, 0, "CodeMirror-comments");
- cm.setOption("gutters", gutters);
-
- for (var line in comments) {
- if (comments.hasOwnProperty(line))
- onedev.server.sourceView.addCommentGutter(line, comments[line][1]);
- }
- for (var line in problems) {
- if (problems.hasOwnProperty(line))
- onedev.server.sourceView.addProblemGutter(line, problems[line][1]);
- }
+ cm.setOption("gutters", gutters);
- for (var line in coverages) {
- if (coverages.hasOwnProperty(line))
- onedev.server.sourceView.addCoverageGutter(line, coverages[line]);
- }
-
if (blameInfos) {
onedev.server.sourceView.blame(blameInfos);
}
- onedev.server.sourceView.highlightCommentTrigger();
onedev.server.codemirror.bindShortcuts(cm);
onedev.server.sourceView.checkShortcutsBinding();
@@ -125,6 +107,37 @@ onedev.server.sourceView = {
});
return false;
});
+
+ if (cm.lineCount() > 0) {
+ $.ajax({
+ url: annotationInfoUrl,
+ cache: false,
+ beforeSend: function(xhr) {
+ xhr.setRequestHeader('Wicket-Ajax', 'true');
+ xhr.setRequestHeader('Wicket-Ajax-BaseURL', Wicket.Ajax.baseUrl || '.');
+ },
+ success: function(annotationInfo) {
+ if (jQuery.contains(document, $sourceView[0])) {
+ for (var line in annotationInfo.comments) {
+ if (annotationInfo.comments.hasOwnProperty(line))
+ onedev.server.sourceView.addCommentGutter(line, annotationInfo.comments[line]);
+ }
+
+ for (var line in annotationInfo.problems) {
+ if (annotationInfo.problems.hasOwnProperty(line))
+ onedev.server.sourceView.addProblemGutter(line, annotationInfo.problems[line]);
+ }
+
+ for (var line in annotationInfo.coverages) {
+ if (annotationInfo.coverages.hasOwnProperty(line))
+ onedev.server.sourceView.addCoverageGutter(line, annotationInfo.coverages[line]);
+ }
+ $(".loading-annotations").remove();
+ onedev.server.sourceView.highlightCommentTrigger();
+ }
+ }
+ });
+ }
},
checkShortcutsBinding() {
if (!($(document).data("SourceViewShortcutsBinded"))) {
@@ -343,15 +356,19 @@ onedev.server.sourceView = {
$(".popover").not($currentPopover).popover("hide");
$currentPopover.find("a").each(function() {
$(this).mouseover(function() {
- var comment = comments[$(this).index()];
+ let comment = comments[$(this).index()];
onedev.server.codemirror.mark(cm, comment.range);
});
$(this).mouseout(function() {
onedev.server.sourceView.restoreMark();
});
$(this).click(function() {
- if (!$(this).hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges())
- callback("openComment", comments[$(this).index()].id);
+ if (!$(this).hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges()) {
+ let comment = comments[$(this).index()];
+ let range = comment.range;
+ callback("openComment", comment.id, range.fromRow, range.fromColumn,
+ range.toRow, range.toColumn);
+ }
});
});
onedev.server.sourceView.highlightCommentTrigger();
@@ -370,8 +387,11 @@ onedev.server.sourceView = {
onedev.server.sourceView.restoreMark();
});
$indicator.click(function() {
- if (!$indicator.hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges())
- callback("openComment", comment.id);
+ if (!$indicator.hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges()) {
+ let range = comment.range;
+ callback("openComment", comment.id, range.fromRow, range.fromColumn,
+ range.toRow, range.toColumn);
+ }
});
}
cm.setGutterMarker(parseInt(line), "CodeMirror-comments", $gutter[0]);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
index 40a7a0be9d..29707201c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
@@ -9,6 +9,9 @@
<span class="text-muted">|</span>
</wicket:enclosure>
<span wicket:id="size"></span>
+ <span class="loading-annotations ml-4 text-warning">
+ <wicket:svg href="loading" class="icon spin"/>
+ Loading annotations...</span>
</div>
<div class="tools d-flex align-items-center">
<div class="actions d-flex align-items-center">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 05cd3ada75..e3047aab53 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -70,7 +70,6 @@ import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.createtag.CreateTagLink;
-import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.RunJobLink;
@@ -85,7 +84,7 @@ import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
-public class CommitDetailPage extends ProjectPage implements CommentSupport {
+public class CommitDetailPage extends ProjectPage implements RevisionDiffPanel.AnnotationSupport {
private static final Logger logger = LoggerFactory.getLogger(CommitDetailPage.class);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 4d5e158f99..cdbb5c337b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -47,7 +47,6 @@ import io.onedev.server.util.ProjectAndRevision;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
import io.onedev.server.web.component.commit.list.CommitListPanel;
-import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.revisionpicker.AffinalRevisionPicker;
@@ -62,7 +61,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequ
import io.onedev.server.web.util.EditParamsAware;
@SuppressWarnings("serial")
-public class RevisionComparePage extends ProjectPage implements CommentSupport, EditParamsAware {
+public class RevisionComparePage extends ProjectPage implements RevisionDiffPanel.AnnotationSupport, EditParamsAware {
public enum TabPanel {
COMMITS,
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 070363c0b6..2eacad5a4c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -72,7 +72,6 @@ import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;
import io.onedev.server.web.component.commit.list.CommitListPanel;
-import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
@@ -92,7 +91,7 @@ import io.onedev.server.web.page.simple.security.LoginPage;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
-public class NewPullRequestPage extends ProjectPage implements CommentSupport {
+public class NewPullRequestPage extends ProjectPage implements RevisionDiffPanel.AnnotationSupport {
private static final String TABS_ID = "tabs";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index b675629bb7..d0e7bd9bb9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -58,7 +58,6 @@ import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.FloatingPanel;
@@ -68,7 +67,7 @@ import io.onedev.server.web.util.EditParamsAware;
import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
-public class PullRequestChangesPage extends PullRequestDetailPage implements CommentSupport, EditParamsAware {
+public class PullRequestChangesPage extends PullRequestDetailPage implements RevisionDiffPanel.AnnotationSupport, EditParamsAware {
public static final String PARAM_OLD_COMMIT = "old-commit";
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java
index 663f3883e5..242c57018e 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java
@@ -6,19 +6,17 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.Callable;
-import org.apache.wicket.protocol.http.WebApplication;
-
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.commons.launcher.loader.ImplementationProvider;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.buildspec.job.JobReport;
+import io.onedev.server.code.LineCoverage;
+import io.onedev.server.code.LineCoverageContribution;
import io.onedev.server.model.Build;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.WebApplicationConfigurator;
-import io.onedev.server.web.mapper.DynamicPathPageMapper;
-import io.onedev.server.web.mapper.DynamicPathResourceMapper;
import io.onedev.server.web.page.project.builds.detail.BuildTab;
import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;
@@ -71,6 +69,7 @@ public class HtmlReportModule extends AbstractPluginModule {
});
+ /*
contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {
@Override
@@ -82,7 +81,6 @@ public class HtmlReportModule extends AbstractPluginModule {
});
- /*
contribute(CodeProblemContribution.class, new CodeProblemContribution() {
@Override
@@ -97,6 +95,7 @@ public class HtmlReportModule extends AbstractPluginModule {
}
});
+ */
contribute(LineCoverageContribution.class, new LineCoverageContribution() {
@@ -106,7 +105,6 @@ public class HtmlReportModule extends AbstractPluginModule {
}
});
- */
}