The Unified and Autonomous Development Platform
Able to show code problem and coverage information contributed from build reports in diff view
Robin Shend0e1cefcd511
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 0cda12771d..52620e266c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -224,7 +224,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}Collection<Build> builds = buildManager.query(project, commitId, jobName,- reason.getRefName(), reason.getPullRequest(), paramMapToQuery);+ reason.getRefName(), Optional.ofNullable(reason.getPullRequest()),+ paramMapToQuery);if (builds.isEmpty()) {for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {diff --git a/server-core/src/main/java/io/onedev/server/code/CodeProblem.java b/server-core/src/main/java/io/onedev/server/code/CodeProblem.javaindex d546f7a3c9..62b42d3444 100644--- a/server-core/src/main/java/io/onedev/server/code/CodeProblem.java+++ b/server-core/src/main/java/io/onedev/server/code/CodeProblem.java@@ -18,20 +18,20 @@ public class CodeProblem implements Serializable {public static enum Severity {ERROR, WARNING};- private final PlanarRange position;+ private final PlanarRange range;private final String content;private final Severity severity;- public CodeProblem(PlanarRange position, String content, Severity severity) {- this.position = position;+ public CodeProblem(PlanarRange range, String content, Severity severity) {+ this.range = range;this.content = content;this.severity = severity;}- public PlanarRange getPosition() {- return position;+ public PlanarRange getRange() {+ return range;}public String getContent() {@@ -50,7 +50,7 @@ public class CodeProblem implements Serializable {return true;CodeProblem otherProblem = (CodeProblem) other;return new EqualsBuilder()- .append(position, otherProblem.position)+ .append(range, otherProblem.range).append(content, otherProblem.content).append(severity, otherProblem.severity).isEquals();@@ -59,7 +59,7 @@ public class CodeProblem implements Serializable {@Overridepublic int hashCode() {return new HashCodeBuilder(17, 37)- .append(position)+ .append(range).append(content).append(severity).toHashCode();@@ -69,7 +69,7 @@ public class CodeProblem implements Serializable {Map<Integer, List<CodeProblem>> problemsByLine = new HashMap<>();for (CodeProblem problem: problems) {- PlanarRange position = problem.getPosition();+ PlanarRange position = problem.getRange();int line = position.getFromRow();List<CodeProblem> problemsAtLine = problemsByLine.get(line);if (problemsAtLine == null) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 93dab77f81..fadccf43c0 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager;import java.util.Collection;import java.util.List;import java.util.Map;+import java.util.Optional;import javax.annotation.Nullable;@@ -33,8 +34,9 @@ public interface BuildManager extends EntityManager<Build> {Collection<Long> queryStreamPreviousNumbers(Build build, @Nullable Build.Status status, int limit);- Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName, @Nullable String refName,- @Nullable PullRequest request, Map<String, List<String>> params);+ Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,+ @Nullable String refName, @Nullable Optional<PullRequest> request,+ Map<String, List<String>> params);Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 6f8bc591aa..a748cbcc37 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -8,6 +8,7 @@ import java.util.HashSet;import java.util.Iterator;import java.util.List;import java.util.Map;+import java.util.Optional;import java.util.Set;import java.util.concurrent.Callable;import java.util.concurrent.atomic.AtomicInteger;@@ -258,7 +259,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Sessional@Overridepublic Collection<Build> query(Project project, ObjectId commitId, String jobName,- String refName, PullRequest request, Map<String, List<String>> params) {+ String refName, Optional<PullRequest> request, Map<String, List<String>> params) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Build> query = builder.createQuery(Build.class);Root<Build> root = query.from(Build.class);@@ -271,10 +272,12 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiif (refName != null)predicates.add(builder.equal(root.get(Build.PROP_REF_NAME), refName));- if (request != null)- predicates.add(builder.equal(root.get(Build.PROP_PULL_REQUEST), request));- else- predicates.add(builder.isNull(root.get(Build.PROP_PULL_REQUEST)));+ if (request != null) {+ if (request.isPresent())+ predicates.add(builder.equal(root.get(Build.PROP_PULL_REQUEST), request.get()));+ else+ predicates.add(builder.isNull(root.get(Build.PROP_PULL_REQUEST)));+ }for (Map.Entry<String, List<String>> entry: params.entrySet()) {if (!entry.getValue().isEmpty()) {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.javaindex 9bddfbda60..ccbb9fbd93 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@@ -5,21 +5,31 @@ import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;import java.util.List;+import java.util.Map;import javax.annotation.Nullable;-import org.eclipse.jgit.diff.DiffEntry;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.eclipse.jgit.diff.DiffEntry.ChangeType;+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.code.CodeProblem;+import io.onedev.server.code.LineCoverage;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Mark;+import io.onedev.server.util.Pair;import io.onedev.server.util.diff.DiffBlock;+import io.onedev.server.util.diff.DiffMatchPatch.Operation;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.WebConstants;import io.onedev.server.web.util.DiffPlanarRange;-import io.onedev.server.util.diff.DiffMatchPatch.Operation;@SuppressWarnings("serial")public abstract class BlobChange implements Serializable {@@ -34,37 +44,14 @@ public abstract class BlobChange implements Serializable {private transient List<DiffBlock<Tokenized>> diffBlocks;- public BlobChange(String oldRev, String newRev, DiffEntry diffEntry,- WhitespaceOption whitespaceOption) {- if (diffEntry.getChangeType() == ChangeType.RENAME- && diffEntry.getOldPath().equals(diffEntry.getNewPath())) {- // for some unknown reason, jgit detects rename even if path- // is the same- type = ChangeType.MODIFY;- } else {- type = diffEntry.getChangeType();- }- this.whitespaceOption = whitespaceOption;- oldBlobIdent = GitUtils.getOldBlobIdent(diffEntry, oldRev);- newBlobIdent = GitUtils.getNewBlobIdent(diffEntry, newRev);- }-- public BlobChange(@Nullable ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,+ public BlobChange(ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,WhitespaceOption whitespaceOption) {this.type = type;this.oldBlobIdent = oldBlobIdent;this.newBlobIdent = newBlobIdent;this.whitespaceOption = whitespaceOption;}-- /**- * Get change type. Return <tt>null</tt> if this is a faked change representing- * an unchanged file- *- * @return- * type of change, or <tt>null</tt> if the file is not changed actually- */- @Nullable+public ChangeType getType() {return type;}@@ -161,12 +148,12 @@ public abstract class BlobChange implements Serializable {public Blob getOldBlob() {Preconditions.checkNotNull(oldBlobIdent.path);- return getBlob(oldBlobIdent);+ return getProject().getBlob(oldBlobIdent, true);}public Blob getNewBlob() {Preconditions.checkNotNull(newBlobIdent.path);- return getBlob(newBlobIdent);+ return getProject().getBlob(newBlobIdent, true);}@Nullable@@ -204,6 +191,70 @@ public abstract class BlobChange implements Serializable {return DiffUtils.isVisible(getDiffBlocks(), leftSide, line, WebConstants.DIFF_CONTEXT_SIZE);}- public abstract Blob getBlob(BlobIdent blobIdent);+ public abstract Project getProject();++ @Nullable+ public AnnotationSupport getAnnotationSupport() {+ return null;+ }++ public ObjectId getOldCommitId() {+ if (oldBlobIdent.revision.equals(ObjectId.zeroId().name().toString()))+ return ObjectId.zeroId();+ else+ return getProject().getRevCommit(oldBlobIdent.revision, true);+ }++ public ObjectId getNewCommitId() {+ if (newBlobIdent.revision.equals(ObjectId.zeroId().name().toString()))+ return ObjectId.zeroId();+ else+ return getProject().getRevCommit(newBlobIdent.revision, true);+ }++ public Mark getMark(DiffPlanarRange range) {+ Mark mark = new Mark();+ mark.setRange(new PlanarRange(range));+ if (range.isLeftSide()) {+ mark.setCommitHash(getOldCommitId().name());+ mark.setPath(oldBlobIdent.path);+ } else {+ mark.setCommitHash(getNewCommitId().name());+ mark.setPath(newBlobIdent.path);+ }+ return mark;+ }++ public static interface AnnotationSupport extends Serializable {++ @Nullable+ DiffPlanarRange getMarkRange();++ String getMarkUrl(DiffPlanarRange markRange);++ Map<CodeComment, PlanarRange> getOldComments();++ Map<CodeComment, PlanarRange> getNewComments();++ Collection<CodeProblem> getOldProblems();++ Collection<CodeProblem> getNewProblems();++ Collection<LineCoverage> getOldCoverages();++ Collection<LineCoverage> getNewCoverages();++ DiffPlanarRange getCommentRange(CodeComment comment);++ @Nullable+ Pair<CodeComment, DiffPlanarRange> getOpenComment();++ void onOpenComment(AjaxRequestTarget target, CodeComment comment, DiffPlanarRange commentRange);++ void onAddComment(AjaxRequestTarget target, DiffPlanarRange commentRange);++ Component getCommentContainer();++ }}diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javaindex 20729b3f78..3e086b29f8 100644--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java@@ -86,7 +86,6 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;-import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;@@ -237,7 +236,6 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/activities", PullRequestActivitiesPage.class));add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));- add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));add(new DynamicPathPageMapper("projects/${project}/issues/boards", IssueBoardsPage.class));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.javaindex e0632c7696..9fa49256ef 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@@ -16,7 +16,6 @@ import io.onedev.server.OneDev;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.web.WebConstants;@@ -32,29 +31,18 @@ public class BlobDiffPanel extends Panel {private static final String CONTENT_ID = "content";- private final IModel<Project> projectModel;-- private final IModel<PullRequest> requestModel;-private final BlobChange change;private final IModel<Boolean> blameModel;private final DiffViewMode diffMode;- private final TextDiffPanel.AnnotationSupport annotationSupport;-- public BlobDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,- BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,- @Nullable TextDiffPanel.AnnotationSupport annotationSupport) {+ public BlobDiffPanel(String id, BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel) {super(id);- this.projectModel = projectModel;- this.requestModel = requestModel;this.change = change;this.blameModel = blameModel;this.diffMode = diffMode;- this.annotationSupport = annotationSupport;}private Fragment newFragment(String message, boolean warning) {@@ -68,6 +56,11 @@ public class BlobDiffPanel extends Panel {return fragment;}+ @Nullable+ protected PullRequest getPullRequest() {+ return null;+ }+private void showBlob(Blob blob) {if (blob.getText() != null) {if (blob.getText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {@@ -80,7 +73,14 @@ public class BlobDiffPanel extends Panel {elseadd(newFragment("Empty file removed.", false));} else {- add(new TextDiffPanel(CONTENT_ID, projectModel, requestModel, change, diffMode, blameModel, annotationSupport));+ add(new TextDiffPanel(CONTENT_ID, change, diffMode, blameModel) {++ @Override+ protected PullRequest getPullRequest() {+ return BlobDiffPanel.this.getPullRequest();+ }++ });}} else if (blob.isPartial()) {add(newFragment("File is too large to be loaded.", true));@@ -115,7 +115,14 @@ public class BlobDiffPanel extends Panel {} else if (change.getAdditions() + change.getDeletions() == 0) {add(newFragment("Content is identical", false));} else {- add(new TextDiffPanel(CONTENT_ID, projectModel, requestModel, change, diffMode, blameModel, annotationSupport));+ add(new TextDiffPanel(CONTENT_ID, change, diffMode, blameModel) {++ @Override+ protected PullRequest getPullRequest() {+ return BlobDiffPanel.this.getPullRequest();+ }++ });}} else if (change.getOldBlob().isPartial() || change.getNewBlob().isPartial()) {add(newFragment("File is too large to be loaded.", true));@@ -143,61 +150,46 @@ public class BlobDiffPanel extends Panel {}protected void onDetach() {- projectModel.detach();- requestModel.detach();-if (blameModel != null)blameModel.detach();super.onDetach();}- public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment, @Nullable DiffPlanarRange range) {+ public void onCommentDeleted(AjaxRequestTarget target) {Component content = get(CONTENT_ID);- if (content instanceof TextDiffPanel) {- TextDiffPanel textDiffPanel = (TextDiffPanel) content;- textDiffPanel.onCommentDeleted(target, comment, range);- }+ if (content instanceof TextDiffPanel)+ ((TextDiffPanel) content).onCommentDeleted(target);}- public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {+ public void onCommentClosed(AjaxRequestTarget target) {Component content = get(CONTENT_ID);- if (content instanceof TextDiffPanel) {- TextDiffPanel textDiffPanel = (TextDiffPanel) content;- textDiffPanel.onCommentClosed(target, comment);- }+ if (content instanceof TextDiffPanel)+ ((TextDiffPanel) content).onCommentClosed(target);}public void onCommentAdded(AjaxRequestTarget target, CodeComment comment, DiffPlanarRange range) {Component content = get(CONTENT_ID);- if (content instanceof TextDiffPanel) {- TextDiffPanel textDiffPanel = (TextDiffPanel) content;- textDiffPanel.onCommentAdded(target, comment, range);- }+ if (content instanceof TextDiffPanel)+ ((TextDiffPanel) content).onCommentAdded(target, comment, range);}public void mark(AjaxRequestTarget target, DiffPlanarRange markRange) {Component content = get(CONTENT_ID);- if (content instanceof TextDiffPanel) {- TextDiffPanel textDiffPanel = (TextDiffPanel) content;- textDiffPanel.mark(target, markRange);- }+ if (content instanceof TextDiffPanel)+ ((TextDiffPanel) content).mark(target, markRange);}public void unmark(AjaxRequestTarget target) {Component content = get(CONTENT_ID);- if (content instanceof TextDiffPanel) {- TextDiffPanel textDiffPanel = (TextDiffPanel) content;- textDiffPanel.unmark(target);- }+ if (content instanceof TextDiffPanel)+ ((TextDiffPanel) content).unmark(target);}public void onUnblame(AjaxRequestTarget target) {Component content = get(CONTENT_ID);- if (content instanceof TextDiffPanel) {- TextDiffPanel textDiffPanel = (TextDiffPanel) content;- textDiffPanel.onUnblame(target);- }+ if (content instanceof TextDiffPanel)+ ((TextDiffPanel) content).onUnblame(target);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffAnnotationInfo.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffAnnotationInfo.javaindex d44c47ece9..c1003dc245 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffAnnotationInfo.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffAnnotationInfo.java@@ -1,14 +1,8 @@package io.onedev.server.web.component.diff.blob.text;import java.io.Serializable;-import java.util.List;-import javax.annotation.Nullable;--import io.onedev.server.model.CodeComment;import io.onedev.server.web.util.AnnotationInfo;-import io.onedev.server.web.util.CodeCommentInfo;-import io.onedev.server.web.util.DiffPlanarRange;public class DiffAnnotationInfo implements Serializable {@@ -30,28 +24,5 @@ public class DiffAnnotationInfo implements Serializable {public AnnotationInfo getNewAnnotations() {return newAnnotations;}-- @Nullable- public DiffPlanarRange getMarkRange(CodeComment comment) {- for (List<CodeCommentInfo> eachList: oldAnnotations.getComments().values()) {- for (CodeCommentInfo eachInfo: eachList) {- if (eachInfo.getId() == comment.getId()) {- return new DiffPlanarRange(true,- eachInfo.getRange().getFromRow(), eachInfo.getRange().getFromColumn(),- eachInfo.getRange().getToRow(), eachInfo.getRange().getToColumn());- }- }- }- for (List<CodeCommentInfo> eachList: newAnnotations.getComments().values()) {- for (CodeCommentInfo eachInfo: eachList) {- if (eachInfo.getId() == comment.getId()) {- return new DiffPlanarRange(false,- eachInfo.getRange().getFromRow(), eachInfo.getRange().getFromColumn(),- eachInfo.getRange().getToRow(), eachInfo.getRange().getToColumn());- }- }- }- return 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.javaindex 4e0a94e668..89386ec653 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@@ -3,9 +3,7 @@ package io.onedev.server.web.component.diff.blob.text;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.Serializable;-import java.util.Collection;import java.util.HashMap;-import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -32,7 +30,6 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.diff.DiffEntry.ChangeType;import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;import org.unbescape.html.HtmlEscape;import org.unbescape.javascript.JavaScriptEscape;@@ -44,7 +41,6 @@ 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.PlanarRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.code.CodeProblem;@@ -62,6 +58,7 @@ import io.onedev.server.model.PullRequest;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.Pair;import io.onedev.server.util.diff.DiffBlock;import io.onedev.server.util.diff.DiffMatchPatch.Operation;import io.onedev.server.util.diff.DiffUtils;@@ -81,7 +78,6 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;-import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;import io.onedev.server.web.util.AnnotationInfo;import io.onedev.server.web.util.CodeCommentInfo;import io.onedev.server.web.util.DiffPlanarRange;@@ -90,10 +86,6 @@ import io.onedev.server.web.util.EditParamsAware;@SuppressWarnings("serial")public class TextDiffPanel extends Panel {- private final IModel<Project> projectModel;-- private final IModel<PullRequest> requestModel;-private final BlobChange change;private final Map<Integer, Integer> contextSizes = new HashMap<>();@@ -102,52 +94,26 @@ public class TextDiffPanel extends Panel {private final IModel<Boolean> blameModel;- private final AnnotationSupport annotationSupport;-private final IModel<DiffAnnotationInfo> annotationInfoModel = new LoadableDetachableModel<DiffAnnotationInfo>() {@Overrideprotected DiffAnnotationInfo load() {- if (annotationSupport != null) {- Map<CodeComment, PlanarRange> oldComments = annotationSupport.getOldComments();- for (Iterator<Map.Entry<CodeComment, PlanarRange>> it = oldComments.entrySet().iterator(); it.hasNext();) {- if (!change.isVisible(new DiffPlanarRange(true, it.next().getValue())))- it.remove();- }- Map<Integer, List<CodeCommentInfo>> oldCommentsByLine = CodeCommentInfo.groupByLine(oldComments);-- Map<CodeComment, PlanarRange> newComments = annotationSupport.getNewComments();- for (Iterator<Map.Entry<CodeComment, PlanarRange>> it = newComments.entrySet().iterator(); it.hasNext();) {- if (!change.isVisible(new DiffPlanarRange(false, it.next().getValue())))- it.remove();- }- Map<Integer, List<CodeCommentInfo>> newCommentsByLine = CodeCommentInfo.groupByLine(newComments);+ if (change.getAnnotationSupport() != null) {+ Map<Integer, List<CodeCommentInfo>> oldCommentsByLine =+ CodeCommentInfo.groupByLine(change.getAnnotationSupport().getOldComments());+ Map<Integer, List<CodeCommentInfo>> newCommentsByLine =+ CodeCommentInfo.groupByLine(change.getAnnotationSupport().getNewComments());- Collection<CodeProblem> oldProblems = annotationSupport.getOldProblems();- for (Iterator<CodeProblem> it = oldProblems.iterator(); it.hasNext();) {- if (!change.isVisible(new DiffPlanarRange(true, it.next().getPosition())))- it.remove();- }- Map<Integer, List<CodeProblem>> oldProblemsByLine = CodeProblem.groupByLine(oldProblems);+ Map<Integer, List<CodeProblem>> oldProblemsByLine =+ CodeProblem.groupByLine(change.getAnnotationSupport().getOldProblems());+ Map<Integer, List<CodeProblem>> newProblemsByLine =+ CodeProblem.groupByLine(change.getAnnotationSupport().getNewProblems());- Collection<CodeProblem> newProblems = annotationSupport.getNewProblems();- for (Iterator<CodeProblem> it = newProblems.iterator(); it.hasNext();) {- if (!change.isVisible(new DiffPlanarRange(false, it.next().getPosition())))- it.remove();- }- Map<Integer, List<CodeProblem>> newProblemsByLine = CodeProblem.groupByLine(newProblems);-- Map<Integer, Integer> oldCoveragesByLine = LineCoverage.groupByLine(annotationSupport.getOldCoverages());- for (Iterator<Map.Entry<Integer, Integer>> it = oldCoveragesByLine.entrySet().iterator(); it.hasNext();) {- if (!change.isVisible(false, it.next().getValue()))- it.remove();- }+ Map<Integer, Integer> oldCoveragesByLine =+ LineCoverage.groupByLine(change.getAnnotationSupport().getOldCoverages());+ Map<Integer, Integer> newCoveragesByLine =+ LineCoverage.groupByLine(change.getAnnotationSupport().getNewCoverages());- Map<Integer, Integer> newCoveragesByLine = LineCoverage.groupByLine(annotationSupport.getNewCoverages());- for (Iterator<Map.Entry<Integer, Integer>> it = newCoveragesByLine.entrySet().iterator(); it.hasNext();) {- if (!change.isVisible(true, it.next().getValue()))- it.remove();- }return new DiffAnnotationInfo(new AnnotationInfo(oldCommentsByLine, oldProblemsByLine, oldCoveragesByLine),new AnnotationInfo(newCommentsByLine, newProblemsByLine, newCoveragesByLine));@@ -168,16 +134,12 @@ public class TextDiffPanel extends Panel {private BlameInfo blameInfo;- public TextDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,- BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,- @Nullable AnnotationSupport annotationSupport) {+ public TextDiffPanel(String id, BlobChange change, DiffViewMode diffMode,+ @Nullable IModel<Boolean> blameModel) {super(id);- this.projectModel = projectModel;- this.requestModel = requestModel;this.change = change;this.diffMode = diffMode;- this.annotationSupport = annotationSupport;this.blameModel = blameModel;if (blameModel != null && blameModel.getObject()) {@@ -194,12 +156,21 @@ public class TextDiffPanel extends Panel {}}+ private Project getProject() {+ return change.getProject();+ }++ @Nullable+ protected PullRequest getPullRequest() {+ return null;+ }+private BlameInfo getBlameInfo() {blameInfo = new BlameInfo();- BlameCommand cmd = new BlameCommand(projectModel.getObject().getGitDir());+ BlameCommand cmd = new BlameCommand(getProject().getGitDir());String oldPath = change.getOldBlobIdent().path;if (oldPath != null) {- cmd.commitHash(getOldCommit().name()).file(oldPath);+ cmd.commitHash(change.getOldCommitId().name()).file(oldPath);for (BlameBlock blame: cmd.call()) {for (LinearRange range: blame.getRanges()) {for (int i=range.getFrom(); i<=range.getTo(); i++)@@ -209,7 +180,7 @@ public class TextDiffPanel extends Panel {}String newPath = change.getNewBlobIdent().path;if (newPath != null) {- cmd.commitHash(getNewCommit().name()).file(newPath);+ cmd.commitHash(change.getNewCommitId().name()).file(newPath);for (BlameBlock blame: cmd.call()) {for (LinearRange range: blame.getRanges()) {for (int i=range.getFrom(); i<=range.getTo(); i++)@@ -252,41 +223,39 @@ public class TextDiffPanel extends Panel {})).setOutputMarkupId(true));- Project project = projectModel.getObject();- PullRequest request = requestModel.getObject();ProjectBlobPage.State viewState = new ProjectBlobPage.State(change.getBlobIdent());- viewState.requestId = PullRequest.idOf(request);- PageParameters params = ProjectBlobPage.paramsOf(project, viewState);+ viewState.requestId = PullRequest.idOf(getPullRequest());+ PageParameters params = ProjectBlobPage.paramsOf(getProject(), viewState);actions.add(new ViewStateAwarePageLink<Void>("viewFile", ProjectBlobPage.class, params));if (change.getType() != ChangeType.DELETE) {- if (request != null- && request.getSource() != null- && request.getSource().getObjectName(false) != null- && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), change.getPath())- && (getPage() instanceof PullRequestChangesPage || getPage() instanceof MergePreviewPage)) {+ if (getPullRequest() != null+ && getPullRequest().getSource() != null+ && getPullRequest().getSource().getObjectName(false) != null+ && SecurityUtils.canModify(getPullRequest().getSourceProject(), getPullRequest().getSourceBranch(), change.getPath())+ && getPage() instanceof PullRequestChangesPage) {// we are in context of a pull request and pull request source branch exists, so we edit in source branch insteadLink<Void> editLink = new Link<Void>("editFile") {@Overridepublic void onClick() {- BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),+ BlobIdent blobIdent = new BlobIdent(getPullRequest().getSourceBranch(), change.getPath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State editState = new ProjectBlobPage.State(blobIdent);- editState.requestId = request.getId();+ editState.requestId = getPullRequest().getId();editState.mode = Mode.EDIT;editState.urlBeforeEdit = EditParamsAware.getUrlBeforeEdit(getPage());editState.urlAfterEdit = EditParamsAware.getUrlAfterEdit(getPage());- PageParameters params = ProjectBlobPage.paramsOf(request.getSourceProject(), editState);+ PageParameters params = ProjectBlobPage.paramsOf(getPullRequest().getSourceProject(), editState);setResponsePage(ProjectBlobPage.class, params);}};editLink.add(AttributeAppender.append("title", "Edit on source branch"));actions.add(editLink);- } else if (SecurityUtils.canModify(project, change.getBlobIdent().revision, change.getPath())- && project.getBranchRef(change.getBlobIdent().revision) != null) {+ } else if (SecurityUtils.canModify(getProject(), change.getBlobIdent().revision, change.getPath())+ && getProject().getBranchRef(change.getBlobIdent().revision) != null) {// we are on a branchLink<Void> editLink = new Link<Void>("editFile") {@@ -296,7 +265,7 @@ public class TextDiffPanel extends Panel {editState.mode = Mode.EDIT;editState.urlBeforeEdit = EditParamsAware.getUrlBeforeEdit(getPage());editState.urlAfterEdit = EditParamsAware.getUrlAfterEdit(getPage());- PageParameters params = ProjectBlobPage.paramsOf(project, editState);+ PageParameters params = ProjectBlobPage.paramsOf(getProject(), editState);setResponsePage(ProjectBlobPage.class, params);}@@ -403,11 +372,11 @@ public class TextDiffPanel extends Panel {String jsonOfPosition = String.format("{left: %d, top: %d}",params.getParameterValue("param1").toInt(),params.getParameterValue("param2").toInt());- DiffPlanarRange markRange = getRange(params, "param3", "param4", "param5", "param6", "param7");+ DiffPlanarRange commentRange = getRange(params, "param3", "param4", "param5", "param6", "param7");String markUrl;- if (annotationSupport != null) {- markUrl = annotationSupport.getMarkUrl(markRange);+ if (change.getAnnotationSupport() != null) {+ markUrl = change.getAnnotationSupport().getMarkUrl(commentRange);if (markUrl != null)markUrl = "'" + JavaScriptEscape.escapeJavaScript(markUrl) + "'";else@@ -416,27 +385,27 @@ public class TextDiffPanel extends Panel {markUrl = "undefined";}script = String.format("onedev.server.textDiff.openSelectionPopover('%s', %s, %s, %s, '%s', %s);",- getMarkupId(), jsonOfPosition, convertToJson(markRange), markUrl,- JavaScriptEscape.escapeJavaScript(getMarkedText(markRange)),+ getMarkupId(), jsonOfPosition, convertToJson(commentRange), markUrl,+ JavaScriptEscape.escapeJavaScript(getMarkedText(commentRange)),SecurityUtils.getUser()!=null);target.appendJavaScript(script);break;case "addComment":Preconditions.checkNotNull(SecurityUtils.getUser());- markRange = getRange(params, "param1", "param2", "param3", "param4", "param5");- annotationSupport.onAddComment(target, markRange);+ commentRange = getRange(params, "param1", "param2", "param3", "param4", "param5");+ change.getAnnotationSupport().onAddComment(target, commentRange);script = String.format("onedev.server.textDiff.onAddComment($('#%s'), %s);",- getMarkupId(), convertToJson(markRange));+ getMarkupId(), convertToJson(commentRange));target.appendJavaScript(script);break;case "openComment":Long commentId = params.getParameterValue("param1").toLong();- markRange = getRange(params, "param2", "param3", "param4", "param5", "param6");+ commentRange = getRange(params, "param2", "param3", "param4", "param5", "param6");CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);- annotationSupport.onOpenComment(target, comment, markRange);+ change.getAnnotationSupport().onOpenComment(target, comment, commentRange);script = String.format("onedev.server.textDiff.onCommentOpened($('#%s'), %s);",- getMarkupId(), convertToJson(new DiffCodeCommentInfo(comment, markRange)));+ getMarkupId(), convertToJson(new DiffCodeCommentInfo(comment, commentRange)));target.appendJavaScript(script);break;}@@ -448,11 +417,11 @@ public class TextDiffPanel extends Panel {@Overrideprotected Project getProject() {- return projectModel.getObject();+ return change.getProject();}});- symbolTooltip = new SymbolTooltipPanel("symbolTooltip", projectModel) {+ symbolTooltip = new SymbolTooltipPanel("symbolTooltip") {@Overrideprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {@@ -471,6 +440,11 @@ public class TextDiffPanel extends Panel {elsereturn change.getOldBlobIdent().path;}++ @Override+ protected Project getProject() {+ return change.getProject();+ }};add(symbolTooltip);@@ -531,48 +505,26 @@ public class TextDiffPanel extends Panel {}}- private ObjectId getOldCommit() {- String oldRev = change.getOldBlobIdent().revision;- if (oldRev.equals(ObjectId.zeroId().name().toString())) {- return ObjectId.zeroId();- } else {- return projectModel.getObject().getRevCommit(oldRev, true);- }- }-- private ObjectId getNewCommit() {- String newRev = change.getNewBlobIdent().revision;- if (newRev.equals(ObjectId.zeroId().name().toString())) {- return ObjectId.zeroId();- } else {- return projectModel.getObject().getRevCommit(newRev, true);- }- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));- DiffCodeCommentInfo openComment;+ DiffCodeCommentInfo openCommentInfo;DiffPlanarRange markRange;String commentContainerId;- if (annotationSupport != null) {- markRange = annotationSupport.getMarkRange();- if (markRange != null && !change.isVisible(markRange))- markRange = null;- CodeComment comment = annotationSupport.getOpenComment();- if (comment != null) {- DiffPlanarRange commentRange = annotationInfoModel.getObject().getMarkRange(comment);- openComment = new DiffCodeCommentInfo(comment, commentRange);- } else {- openComment = null;- }- commentContainerId = "'" + annotationSupport.getCommentContainer().getMarkupId() + "'";+ if (change.getAnnotationSupport() != null) {+ markRange = change.getAnnotationSupport().getMarkRange();+ Pair<CodeComment, DiffPlanarRange> openCommentPair = change.getAnnotationSupport().getOpenComment();+ if (openCommentPair != null)+ openCommentInfo = new DiffCodeCommentInfo(openCommentPair.getFirst(), openCommentPair.getSecond());+ else+ openCommentInfo = null;+ commentContainerId = "'" + change.getAnnotationSupport().getCommentContainer().getMarkupId() + "'";} else {markRange = null;- openComment = null;+ openCommentInfo = null;commentContainerId = null;}@@ -585,7 +537,7 @@ public class TextDiffPanel extends Panel {+ "%s, %s, %s, '%s');", getMarkupId(), symbolTooltip.getMarkupId(),change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,callback, blameMessageBehavior.getCallback(),- convertToJson(markRange), convertToJson(openComment),+ convertToJson(markRange), convertToJson(openCommentInfo),convertToJson(annotationInfoModel.getObject()),commentContainerId, OneDev.getInstance().getDocRoot());@@ -606,49 +558,52 @@ public class TextDiffPanel extends Panel {blameInfo.lastNewCommitHash = null;}+ int oldProblemsWidth;+ if (!annotationInfoModel.getObject().getOldAnnotations().getProblems().isEmpty())+ oldProblemsWidth = 24;+ else+ oldProblemsWidth = 0;++ int newProblemsWidth;+ if (!annotationInfoModel.getObject().getNewAnnotations().getProblems().isEmpty())+ newProblemsWidth = 24;+ else+ newProblemsWidth = 0;++ int shortBlameColumnWidth = 70;+ int longBlameColumnWidth = 240;+ int baseLineNumColumnWidth = 66;+ int operationColumnWidth = 15;+if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- builder.append(""- + "<colgroup>"- + "<col width='240'></col>"- + "<col width='60'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- } else {- builder.append(""- + "<colgroup>"- + "<col width='60'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- }+ builder.append("<colgroup>");+ if (blameInfo != null)+ builder.append(String.format("<col width='%d'></col>", longBlameColumnWidth));+ builder.append(String.format(""+ + "<col width='%d'></col>"+ + "<col width='%d'></col>"+ + "<col width='%d'></col>"+ + "<col></col>"+ + "</colgroup>",+ baseLineNumColumnWidth+oldProblemsWidth, baseLineNumColumnWidth+newProblemsWidth,+ operationColumnWidth));} else {- if (blameInfo != null) {- builder.append(""- + "<colgroup>"- + "<col width='70'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "<col width='70'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- } else {- builder.append(""- + "<colgroup>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- }+ builder.append("<colgroup>");+ if (blameInfo != null)+ builder.append(String.format("<col width='%d'></col>", shortBlameColumnWidth));+ builder.append(String.format(""+ + "<col width='%d'></col>"+ + "<col width='%d'></col>"+ + "<col></col>",+ baseLineNumColumnWidth+oldProblemsWidth, operationColumnWidth));+ if (blameInfo != null)+ builder.append(String.format("<col width='%d'></col>", shortBlameColumnWidth));+ builder.append(String.format(""+ + "<col width='%d'></col>"+ + "<col width='%d'></col>"+ + "<col></col>"+ + "</colgroup>",+ baseLineNumColumnWidth+newProblemsWidth, operationColumnWidth));}for (int i=0; i<change.getDiffBlocks().size(); i++) {DiffBlock<Tokenized> block = change.getDiffBlocks().get(i);@@ -759,7 +714,7 @@ public class TextDiffPanel extends Panel {CommitDetailPage.State state = new CommitDetailPage.State();state.revision = commit.getHash();state.whitespaceOption = change.getWhitespaceOption();- PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), state);+ PageParameters params = CommitDetailPage.paramsOf(getProject(), state);String url = urlFor(CommitDetailPage.class, params).toString();if (diffMode == DiffViewMode.UNIFIED) {builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",@@ -816,8 +771,8 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, oldLineNo, newLineNo);}- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("<a class='coverage'> </a></td>");+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("<a class='coverage'> </a></td>");builder.append("<td class='operation noselect'> </td>");builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");appendTokenized(builder, block.getUnits().get(lineIndex));@@ -826,7 +781,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, oldLineNo, -1);}- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("<a class='coverage'> </a></td>");builder.append("<td class='operation noselect'> </td>");builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");appendTokenized(builder, block.getUnits().get(lineIndex));@@ -834,7 +789,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, -1, newLineNo);}- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("<a class='coverage'> </a></td>");builder.append("<td class='operation noselect'> </td>");builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");appendTokenized(builder, block.getUnits().get(lineIndex));@@ -852,8 +807,8 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, -1, newLineNo);}- builder.append("<td class='number noselect new'> </td>");- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='number noselect new'><a class='coverage'> </a></td>");+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("<a class='coverage'> </a></td>");builder.append("<td class='operation noselect new'>+</td>");builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");if (tokenDiffs != null) {@@ -875,13 +830,13 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {builder.append("<td class='blame noselect'> </td>");}- builder.append("<td class='number noselect'> </td>");- builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='number noselect'><a class='coverage'> </a></td>");+ builder.append("<td class='operation noselect'></td>");builder.append("<td class='content left'> </td>");if (blameInfo != null) {appendBlame(builder, -1, newLineNo);}- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("<a class='coverage'> </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));@@ -899,8 +854,8 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, oldLineNo, -1);}- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect old'> </td>");+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("<a class='coverage'> </a></td>");+ builder.append("<td class='number noselect old'><a class='coverage'> </a></td>");builder.append("<td class='operation noselect old'>-</td>");builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");if (tokenDiffs != null) {@@ -922,7 +877,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, oldLineNo, -1);}- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("<a class='coverage'> </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));@@ -930,7 +885,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {builder.append("<td class='blame noselect'> </td>");}- builder.append("<td class='number noselect'> </td>");+ builder.append("<td class='number noselect'><a class='coverage'> </a></td>");builder.append("<td class='operation noselect'> </td>");builder.append("<td class='content right'> </td>");}@@ -945,7 +900,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, oldLineNo, -1);}- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("<a class='coverage'> </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));@@ -955,7 +910,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, -1, newLineNo);}- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("<a class='coverage'> </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));@@ -975,8 +930,8 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, oldLineNo, newLineNo);}- builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("<a class='coverage'> </a></td>");+ builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("<a class='coverage'> </a></td>");builder.append("<td class='operation noselect old new'>*</td>");builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");if (tokenDiffs.isEmpty()) {@@ -992,7 +947,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, oldLineNo, -1);}- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("<a class='coverage'> </a></td>");builder.append("<td class='operation noselect old'>-</td>");builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");if (tokenDiffs.isEmpty()) {@@ -1010,7 +965,7 @@ public class TextDiffPanel extends Panel {if (blameInfo != null) {appendBlame(builder, -1, newLineNo);}- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("<a class='coverage'> </a></td>");builder.append("<td class='operation noselect new'>+</td>");builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");if (tokenDiffs.isEmpty()) {@@ -1072,8 +1027,6 @@ public class TextDiffPanel extends Panel {@Overrideprotected void onDetach() {- projectModel.detach();- requestModel.detach();annotationInfoModel.detach();if (blameModel != null)@@ -1082,14 +1035,13 @@ public class TextDiffPanel extends Panel {super.onDetach();}- public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment, @Nullable DiffPlanarRange range) {- String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'), %s);",- getMarkupId(), convertToJson(new DiffCodeCommentInfo(comment, range)));+ public void onCommentDeleted(AjaxRequestTarget target) {+ String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'));", getMarkupId());target.appendJavaScript(script);unmark(target);}- public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {+ public void onCommentClosed(AjaxRequestTarget target) {String script = String.format("onedev.server.textDiff.onCommentClosed($('#%s'));", getMarkupId());target.appendJavaScript(script);unmark(target);@@ -1139,34 +1091,4 @@ public class TextDiffPanel extends Panel {}- public static interface AnnotationSupport extends Serializable {-- @Nullable- DiffPlanarRange getMarkRange();-- String getMarkUrl(DiffPlanarRange markRange);-- Map<CodeComment, PlanarRange> getOldComments();-- Map<CodeComment, PlanarRange> getNewComments();-- Collection<CodeProblem> getOldProblems();-- Collection<CodeProblem> getNewProblems();-- Collection<LineCoverage> getOldCoverages();-- Collection<LineCoverage> getNewCoverages();-- @Nullable- CodeComment getOpenComment();-- void onOpenComment(AjaxRequestTarget target, CodeComment comment, DiffPlanarRange commentRange);-- void onAddComment(AjaxRequestTarget target, DiffPlanarRange commentRange);-- Component getCommentContainer();-- }-}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.javaindex d94a1d19fc..c08acffc7f 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@@ -9,6 +9,7 @@ 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.codeproblem.CodeProblemResourceReference;import io.onedev.server.web.asset.commentindicator.CommentIndicatorCssResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;@@ -30,6 +31,7 @@ public class TextDiffResourceReference extends BaseDependentResourceReference {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 CommentIndicatorCssResourceReference()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.cssindex e6e5ee2757..aca1e8c78a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css@@ -23,11 +23,25 @@position: relative;}.text-diff>tbody>tr>td.number {- padding: 0 0.3rem;+ padding: 0 0.6rem 0.3rem 0;border-left: 1px solid var(--light-gray);text-align: right;color: var(--gray);}+.text-diff>tbody>tr>td.number>.coverage {+ position: absolute;+ width: 4px;+ right: 0;+ top: 0;+ bottom: 0;+}+.text-diff>tbody>tr>td.number>.tested {+ background: var(--success);+}+.text-diff>tbody>tr>td.number>.not-tested {+ background: var(--warning);+}+.text-diff>tbody>tr:not(.expanded)+tr.expanded>td, .text-diff>tbody>tr.expanded+tr:not(.expanded)>td {border-top: 1px solid var(--light-gray);}@@ -147,8 +161,9 @@background: #dc9ec9;}-.text-diff>tbody>tr>td.number>.comment-indicator {- margin: 0 0.3rem;+.text-diff>tbody>tr>td.number>.comment-indicator,+.text-diff>tbody>tr>td.number>.problem-trigger {+ margin-right: 0.3rem;}.text-diff>tbody>tr>td.blame {@@ -177,3 +192,4 @@.text-diff>tbody>tr>td.blame.abbr .same-as-above {margin-left: 1rem;}+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.jsindex 0a98e5ae0c..f3d55adff5 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@@ -416,6 +416,38 @@ onedev.server.textDiff = {}});+ let oldCoverages = annotationInfo.oldAnnotations.coverages;+ for (var line in oldCoverages) {+ if (oldCoverages.hasOwnProperty(line))+ onedev.server.textDiff.addCoverateInfo($container, true, line, oldCoverages[line]);+ }++ let newCoverages = annotationInfo.newAnnotations.coverages;+ for (var line in newCoverages) {+ if (newCoverages.hasOwnProperty(line))+ onedev.server.textDiff.addCoverateInfo($container, false, line, newCoverages[line]);+ }++ let oldProblems = annotationInfo.oldAnnotations.problems;+ for (var line in oldProblems) {+ if (oldProblems.hasOwnProperty(line)) {+ let oldProblemsOnLine = oldProblems[line];+ for (var i in oldProblemsOnLine)+ oldProblemsOnLine[i].range.leftSide = true;+ onedev.server.textDiff.addProblemInfo($container, true, line, oldProblems[line]);+ }+ }++ let newProblems = annotationInfo.newAnnotations.problems;+ for (var line in newProblems) {+ if (newProblems.hasOwnProperty(line)) {+ let newProblemsOnLine = newProblems[line];+ for (var i in newProblemsOnLine)+ newProblemsOnLine[i].range.leftSide = false;+ onedev.server.textDiff.addProblemInfo($container, false, line, newProblems[line]);+ }+ }+if (openComment) {$container.data("openComment", openComment);}@@ -437,7 +469,7 @@ onedev.server.textDiff = {onedev.server.textDiff.addCommentIndicator($container, false, line, newCommentsOnLine);}}-+onedev.server.textDiff.highlightCommentTrigger($container);if (markRange) {@@ -623,119 +655,132 @@ onedev.server.textDiff = {if ($startTd && $endTd)$startTd.scrollIntoView();},- mark: function($container, markRange) {+ mark: function($container, markRangeOrMarkRanges) {onedev.server.textDiff.clearMark($container);-- var markInfo = onedev.server.textDiff.getMarkInfo($container, markRange);- var $startTd = markInfo.startTd;- var $endTd = markInfo.endTd;- if ($startTd && $endTd) {- var startCursor = markInfo.startCursor;- var endCursor = markInfo.endCursor;- var oldOrNew = markInfo.oldOrNew;- var $td = $startTd;- while (true) {- var ch = 0;- $td.addClass("content-mark");- $td.data("beforemark", $td.html());- $td.contents().each(function() {- var $this = $(this);- var text = $this.text();- function markText(from, to) {++ var markRanges;+ if (Array.isArray(markRangeOrMarkRanges)) {+ markRanges = markRangeOrMarkRanges;+ } else {+ markRanges = [];+ markRanges.push(markRangeOrMarkRanges);+ }++ for (let i in markRanges) {+ let markRange = markRanges[i];+ var markInfo = onedev.server.textDiff.getMarkInfo($container, markRange);+ var $startTd = markInfo.startTd;+ var $endTd = markInfo.endTd;+ if ($startTd && $endTd) {+ var startCursor = markInfo.startCursor;+ var endCursor = markInfo.endCursor;+ var oldOrNew = markInfo.oldOrNew;+ var $td = $startTd;+ while (true) {+ var ch = 0;+ if (!$td.hasClass("content-mark")) {+ $td.addClass("content-mark");+ $td.data("beforemark", $td.html());+ }+ $td.contents().each(function() {+ var $this = $(this);var text = $this.text();- var left = text.substring(0, from);- var middle = text.substring(from, to);- var right = text.substring(to);-- if (left.length == 0 && right.length == 0 && $this.is("span")) {- $this.addClass("content-mark");- } else {- var classes;- if ($this.is("span"))- classes = $this.attr("class");- else- classes = "";-- var $current = $this;- if (left.length != 0) {- $current.after("<span></span>");- $current = $current.next();- $current.attr("class", classes).text(left);- }-- $current.after("<span></span>");- $current = $current.next();- $current.attr("class", classes + " content-mark").text(middle);+ function markText(from, to) {+ var text = $this.text();+ var left = text.substring(0, from);+ var middle = text.substring(from, to);+ var right = text.substring(to);- if (right.length != 0) {+ if (left.length == 0 && right.length == 0 && $this.is("span")) {+ $this.addClass("content-mark");+ } else {+ var classes;+ if ($this.is("span"))+ classes = $this.attr("class");+ else+ classes = "";++ var $current = $this;+ if (left.length != 0) {+ $current.after("<span></span>");+ $current = $current.next();+ $current.attr("class", classes).text(left);+ }+$current.after("<span></span>");$current = $current.next();- $current.attr("class", classes).text(right);+ $current.attr("class", classes + " content-mark").text(middle);++ if (right.length != 0) {+ $current.after("<span></span>");+ $current = $current.next();+ $current.attr("class", classes).text(right);+ }+ $this.remove();}- $this.remove();}- }- if ($this.hasClass("insert") && oldOrNew == "old"- || $this.hasClass("delete") && oldOrNew == "new") {- if (!$td.is($startTd) && !$td.is($endTd)) {- markText(0, text.length);- } else if ($td.is($startTd) && $td.is($endTd)) {- if (endCursor[1]>ch && startCursor[1]<ch) {- markText(0, text.length);- }- } else if ($td.is($startTd)) {- if (startCursor[1]<ch) {+ if ($this.hasClass("insert") && oldOrNew == "old"+ || $this.hasClass("delete") && oldOrNew == "new") {+ if (!$td.is($startTd) && !$td.is($endTd)) {markText(0, text.length);+ } else if ($td.is($startTd) && $td.is($endTd)) {+ if (endCursor[1]>ch && startCursor[1]<ch) {+ markText(0, text.length);+ }+ } else if ($td.is($startTd)) {+ if (startCursor[1]<ch) {+ markText(0, text.length);+ }+ } else {+ if (endCursor[1]>ch) {+ markText(0, text.length);+ }}} else {- if (endCursor[1]>ch) {+ var nextCh = ch + text.length;+ if (!$td.is($startTd) && !$td.is($endTd)) {markText(0, text.length);- }- }- } else {- var nextCh = ch + text.length;- if (!$td.is($startTd) && !$td.is($endTd)) {- markText(0, text.length);- } else if ($td.is($startTd) && $td.is($endTd)) {- if (endCursor[1]>ch && startCursor[1]<nextCh) {- if (ch>=startCursor[1] && nextCh<=endCursor[1]) {+ } else if ($td.is($startTd) && $td.is($endTd)) {+ if (endCursor[1]>ch && startCursor[1]<nextCh) {+ if (ch>=startCursor[1] && nextCh<=endCursor[1]) {+ markText(0, text.length);+ } else if (ch<startCursor[1] && nextCh>endCursor[1]) {+ markText(startCursor[1]-ch, endCursor[1]-ch);+ } else if (ch<startCursor[1]) {+ markText(startCursor[1]-ch, text.length);+ } else {+ markText(0, endCursor[1]-ch);+ }+ }+ } else if ($td.is($startTd)) {+ if (ch>=startCursor[1]) {markText(0, text.length);- } else if (ch<startCursor[1] && nextCh>endCursor[1]) {- markText(startCursor[1]-ch, endCursor[1]-ch);- } else if (ch<startCursor[1]) {+ } else if (nextCh>startCursor[1]) {markText(startCursor[1]-ch, text.length);- } else {+ }+ } else {+ if (nextCh<=endCursor[1]) {+ markText(0, text.length);+ } else if (ch<endCursor[1]) {markText(0, endCursor[1]-ch);- }+ }}- } else if ($td.is($startTd)) {- if (ch>=startCursor[1]) {- markText(0, text.length);- } else if (nextCh>startCursor[1]) {- markText(startCursor[1]-ch, text.length);- }- } else {- if (nextCh<=endCursor[1]) {- markText(0, text.length);- } else if (ch<endCursor[1]) {- markText(0, endCursor[1]-ch);- }+ ch = nextCh;}- ch = nextCh;- }- });- if ($td.is($endTd) || $td.length == 0) {- break;- } else {- if ($startTd.hasClass("left")) {- $td = $td.parent().next().children("td.left");- } else if ($startTd.hasClass("right")) {- $td = $td.parent().next().children("td.right");+ });+ if ($td.is($endTd) || $td.length == 0) {+ break;} else {- $td = $td.parent().next().children("td.content");+ if ($startTd.hasClass("left")) {+ $td = $td.parent().next().children("td.left");+ } else if ($startTd.hasClass("right")) {+ $td = $td.parent().next().children("td.right");+ } else {+ $td = $td.parent().next().children("td.content");+ }}- }- }+ }+ }}},clearMark: function($container) {@@ -756,6 +801,70 @@ onedev.server.textDiff = {onedev.server.textDiff.clearMark($container);}},+ addProblemInfo: function($container, leftSide, line, problems) {+ let oldOrNew = leftSide?"old":"new";+ $container.find("." + oldOrNew + ".problem-popover[data-line='" + line + "']").remove();+ let $lineNumTd = onedev.server.textDiff.getLineNumTd($container, leftSide, line);++ let $trigger = $(document.createElement("a"));+ $trigger.addClass("problem-trigger");+ $trigger.addClass(onedev.server.codeProblem.getLinkClass(problems));++ let icon = onedev.server.codeProblem.getIcon(problems);+ $trigger.append(`<svg class='icon'><use xlink:href='${onedev.server.icons}#${icon}'/></svg>`);++ let markRanges = [];+ for (var i in problems)+ markRanges.push(problems[i].range);++ $trigger.mouseover(function() {+ onedev.server.textDiff.mark($container, markRanges);+ }).mouseout(function() {+ onedev.server.textDiff.restoreMark($container);+ });++ $trigger.popover({+ html: true,+ sanitize: false,+ placement: "top",+ container: $container,+ content: onedev.server.codeProblem.renderProblems(problems),+ template: `<div data-line='${line}' class='${oldOrNew} popover problem-popover'><div class='arrow'></div><div class='popover-body'></div></div>`+ }).on("shown.bs.popover", function() {+ var $currentPopover = $(`.problem-popover.${oldOrNew}[data-line='${line}']`);+ $(".popover").not($currentPopover).popover("hide");+ $currentPopover.find(".problem-content").mouseover(function() {+ onedev.server.textDiff.mark($container, problems[$(this).index()].range);+ }).mouseout(function() {+ onedev.server.textDiff.restoreMark($container);+ }).each(function() {+ var problem = problems[$(this).index()];+ $(this).children(".add-comment").click(function() {+ if (onedev.server.textDiff.confirmUnsavedChanges($container)) {+ $currentPopover.popover("hide");+ var range = problem.range;+ $container.data("callback")("addComment", leftSide, range.fromRow, range.fromColumn,+ range.toRow, range.toColumn);+ }+ });+ });+ });++ $lineNumTd.prepend($trigger);+ },+ addCoverateInfo: function($container, leftSide, line, testCount) {+ var $lineNumTd = onedev.server.textDiff.getLineNumTd($container, leftSide, line);+ var cssClass;+ var title;+ if (testCount > 0) {+ cssClass = "tested";+ title = "Tested " + testCount + " times";+ } else {+ cssClass = "not-tested";+ title ="Not covered by any tests";+ }+ $lineNumTd.find(".coverage").addClass(cssClass).attr("title", title);+ },addCommentIndicator: function($container, leftSide, line, comments) {var oldOrNew = leftSide?"old":"new";$container.find("." + oldOrNew + ".comment-popover[data-line='" + line + "']").remove();@@ -773,7 +882,6 @@ onedev.server.textDiff = {* list of comment triggers upon click, user can then click one of the* trigger link to display the actual comment content*/- var oldOrNew = leftSide?"old":"new";var updated = false;var content = "";@@ -859,7 +967,7 @@ onedev.server.textDiff = {highlightCommentTrigger: function($container) {$container.find(".comment-trigger").removeClass("active");var openComment = $container.data("openComment");- if (openComment && openComment.range) {+ if (openComment) {var line = parseInt(openComment.range.fromRow);var $indicator = onedev.server.textDiff.getLineNumTd($container, openComment.range.leftSide, line).children(".comment-indicator");if ($indicator.length != 0) {@@ -896,27 +1004,31 @@ onedev.server.textDiff = {onedev.server.textDiff.addCommentIndicator($container, leftSide, line, comments);onedev.server.textDiff.highlightCommentTrigger($container);},- onCommentDeleted: function($container, comment) {+ onCommentDeleted: function($container) {$(".popover").popover("hide");- $container.removeData("openComment");- var line = parseInt(comment.range.fromRow);- var leftSide = comment.range.leftSide;- var $indicator = onedev.server.textDiff.getLineNumTd($container, leftSide, line).children(".comment-indicator");- var comments = $indicator.data("comments");- if (comments.length == 1) {- $indicator.remove();- } else {- for (var i in comments) {- var each = comments[i];- if (each.id == comment.id) {- comments.splice(i, 1);- break;+ var openComment = $container.data("openComment");+ if (openComment) {+ $container.removeData("openComment");++ var line = parseInt(openComment.range.fromRow);+ var leftSide = openComment.range.leftSide;+ var $indicator = onedev.server.textDiff.getLineNumTd($container, leftSide, line).children(".comment-indicator");+ var comments = $indicator.data("comments");+ if (comments.length == 1) {+ $indicator.remove();+ } else {+ for (var i in comments) {+ var each = comments[i];+ if (each.id == openComment.id) {+ comments.splice(i, 1);+ break;+ }}+ onedev.server.textDiff.addCommentIndicator($container, leftSide, line, comments);}- onedev.server.textDiff.addCommentIndicator($container, leftSide, line, comments);+ onedev.server.textDiff.highlightCommentTrigger($container);}- onedev.server.textDiff.highlightCommentTrigger($container);},onCommentOpened: function($container, comment) {$(".popover").popover("hide");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.javaindex a043c10817..51fd1f033f 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,6 +1,5 @@package io.onedev.server.web.component.diff.revision;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -55,6 +54,7 @@ import org.eclipse.jgit.lib.AnyObjectId;import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Objects;+import com.google.common.base.Optional;import com.google.common.collect.Lists;import com.google.common.collect.Sets;@@ -80,6 +80,7 @@ import io.onedev.server.model.support.Mark;import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.code.IndexManager;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.Pair;import io.onedev.server.util.PathComparator;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;@@ -92,7 +93,6 @@ 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.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.menu.MenuItem;@@ -102,6 +102,7 @@ import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.util.DiffPlanarRange;import io.onedev.server.web.util.ProjectAttachmentSupport;+import io.onedev.server.web.util.RevisionDiff;import io.onedev.server.web.util.SuggestionUtils;/**@@ -111,7 +112,7 @@ import io.onedev.server.web.util.SuggestionUtils;**/@SuppressWarnings("serial")-public class RevisionDiffPanel extends Panel {+public abstract class RevisionDiffPanel extends Panel {private static final String COOKIE_VIEW_MODE = "onedev.server.diff.viewmode";@@ -119,17 +120,13 @@ public class RevisionDiffPanel extends Panel {private static final String DIFF_ID = "diff";- private final IModel<Project> projectModel;-- private final IModel<PullRequest> requestModel;-private final String oldRev;private final String newRev;private final IModel<String> blameModel;- private final AnnotationSupport annotationSupport;+ private final RevisionDiff.AnnotationSupport annotationSupport;private final IModel<String> pathFilterModel;@@ -141,30 +138,33 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected List<DiffEntry> load() {- AnyObjectId oldRevId = projectModel.getObject().getObjectId(oldRev, true);- AnyObjectId newRevId = projectModel.getObject().getObjectId(newRev, true);- return GitUtils.diff(projectModel.getObject().getRepository(), oldRevId, newRevId);+ AnyObjectId oldRevId = getProject().getObjectId(oldRev, true);+ AnyObjectId newRevId = getProject().getObjectId(newRev, true);+ return GitUtils.diff(getProject().getRepository(), oldRevId, newRevId);}};- private IModel<ChangesAndCount> changesAndCountModel = new LoadableDetachableModel<ChangesAndCount>() {+ private IModel<RevisionDiff> revsionDiffModel = new LoadableDetachableModel<RevisionDiff>() {@Override- protected ChangesAndCount load() {+ protected RevisionDiff load() {List<DiffEntry> diffEntries = diffEntriesModel.getObject();List<BlobChange> changes = new ArrayList<>();- for (DiffEntry entry: diffEntries) {- BlobChange change = new BlobChange(oldRev, newRev, entry, whitespaceOptionModel.getObject()) {-- @Override- public Blob getBlob(BlobIdent blobIdent) {- return projectModel.getObject().getBlob(blobIdent, true);- }-- };- changes.add(change);+ for (DiffEntry entry: diffEntries) {+ ChangeType changeType;+ if (entry.getChangeType() == ChangeType.RENAME+ && entry.getOldPath().equals(entry.getNewPath())) {+ // for some unknown reason, jgit detects rename even if path+ // is the same+ changeType = ChangeType.MODIFY;+ } else {+ changeType = entry.getChangeType();+ }+ BlobIdent oldBlobIdent = GitUtils.getOldBlobIdent(entry, oldRev);+ BlobIdent newBlobIdent = GitUtils.getNewBlobIdent(entry, newRev);+ changes.add(newBlobChange(changeType, oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()));}List<BlobChange> filteredChanges = new ArrayList<>();@@ -210,15 +210,8 @@ public class RevisionDiffPanel extends Panel {BlobIdent newBlobIdent = added.get(change.getPath());if (oldBlobIdent != null && newBlobIdent != null) {if (change.getType() == ChangeType.DELETE) {- BlobChange normalizedChange = new BlobChange(ChangeType.MODIFY,- oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()) {-- @Override- public Blob getBlob(BlobIdent blobIdent) {- return projectModel.getObject().getBlob(blobIdent, true);- }-- };+ BlobChange normalizedChange = newBlobChange(ChangeType.MODIFY,+ oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject());normalizedChanges.add(normalizedChange);}} else {@@ -258,9 +251,9 @@ public class RevisionDiffPanel extends Panel {}}- int totalChanges = normalizedChanges.size();+ int totalChangeCount = normalizedChanges.size();- if (diffChanges.size() == totalChanges) {+ if (diffChanges.size() == totalChangeCount) {// some changes should be removed if content is the same after line processingfor (Iterator<BlobChange> it = diffChanges.iterator(); it.hasNext();) {BlobChange change = it.next();@@ -275,7 +268,7 @@ public class RevisionDiffPanel extends Panel {}}}- totalChanges = diffChanges.size();+ totalChangeCount = diffChanges.size();}List<BlobChange> displayChanges = new ArrayList<>();@@ -302,7 +295,7 @@ public class RevisionDiffPanel extends Panel {displayChanges.add(change);}}- return new ChangesAndCount(displayChanges, totalChanges);+ return new RevisionDiff(displayChanges, totalChangeCount);}};@@ -312,13 +305,11 @@ public class RevisionDiffPanel extends Panel {private WebMarkupContainer body;- 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 AnnotationSupport annotationSupport) {+ public RevisionDiffPanel(String id, String oldRev, String newRev, IModel<String> pathFilterModel,+ IModel<WhitespaceOption> whitespaceOptionModel, @Nullable IModel<String> blameModel,+ @Nullable RevisionDiff.AnnotationSupport annotationSupport) {super(id);- this.projectModel = projectModel;- this.requestModel = requestModel;this.oldRev = oldRev;this.newRev = newRev;this.pathFilterModel = pathFilterModel;@@ -392,21 +383,20 @@ public class RevisionDiffPanel extends Panel {protected void onConfigure() {super.onConfigure();- Project project = projectModel.getObject();IndexManager indexManager = OneDev.getInstance(IndexManager.class);ObjectId oldCommit = getOldCommitId();ObjectId newCommit = getNewCommitId();boolean oldCommitIndexed = oldCommit.equals(ObjectId.zeroId())- || indexManager.isIndexed(project, oldCommit);+ || indexManager.isIndexed(getProject(), oldCommit);boolean newCommitIndexed = newCommit.equals(ObjectId.zeroId())- || indexManager.isIndexed(project, newCommit);+ || indexManager.isIndexed(getProject(), newCommit);if (oldCommitIndexed && newCommitIndexed) {setVisible(false);} else {if (!oldCommitIndexed)- indexManager.indexAsync(project, oldCommit);+ indexManager.indexAsync(getProject(), oldCommit);if (!newCommitIndexed)- indexManager.indexAsync(project, newCommit);+ indexManager.indexAsync(getProject(), newCommit);setVisible(true);}}@@ -590,7 +580,7 @@ public class RevisionDiffPanel extends Panel {public String getObject() {String icon = String.format("<svg class='icon'><use xlink:href='%s'/></svg>",SpriteImage.getVersionedHref("arrow"));- return "Total " + changesAndCountModel.getObject().getChanges().size() + " files " + icon;+ return "Total " + revsionDiffModel.getObject().getDisplayChanges().size() + " files " + icon;}}).setEscapeModelStrings(false));@@ -600,8 +590,8 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- ChangesAndCount changesAndCount = changesAndCountModel.getObject();- setVisible(changesAndCount.getChanges().size() < changesAndCount.getCount());+ RevisionDiff changesAndCount = revsionDiffModel.getObject();+ setVisible(changesAndCount.getDisplayChanges().size() < changesAndCount.getTotalChangeCount());}});@@ -619,7 +609,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic List<BlobChange> getObject() {- return changesAndCountModel.getObject().getChanges();+ return revsionDiffModel.getObject().getDisplayChanges();}}) {@@ -643,19 +633,23 @@ public class RevisionDiffPanel extends Panel {boolean hasComments = false;if (annotationSupport != null) {- for (Map.Entry<CodeComment, PlanarRange> entry: annotationSupport.getOldComments().entrySet()) {- if (entry.getKey().getMark().getPath().equals(change.getOldBlobIdent().path)- && change.isVisible(new DiffPlanarRange(true, entry.getValue()))) {- hasComments = true;- break;+ String blobPath = change.getOldBlobIdent().path;+ if (blobPath != null) {+ for (Map.Entry<CodeComment, PlanarRange> entry: annotationSupport.getOldComments(blobPath).entrySet()) {+ if (change.isVisible(new DiffPlanarRange(true, entry.getValue()))) {+ hasComments = true;+ break;+ }}}if (!hasComments) {- for (Map.Entry<CodeComment, PlanarRange> entry: annotationSupport.getNewComments().entrySet()) {- if (entry.getKey().getMark().getPath().equals(change.getNewBlobIdent().path)- && change.isVisible(new DiffPlanarRange(false, entry.getValue()))) {- hasComments = true;- break;+ blobPath = change.getNewBlobIdent().path;+ if (blobPath != null) {+ for (Map.Entry<CodeComment, PlanarRange> entry: annotationSupport.getNewComments(blobPath).entrySet()) {+ if (change.isVisible(new DiffPlanarRange(false, entry.getValue()))) {+ hasComments = true;+ break;+ }}}}@@ -692,7 +686,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic List<BlobChange> getObject() {- return changesAndCountModel.getObject().getChanges();+ return revsionDiffModel.getObject().getDisplayChanges();}}) {@@ -701,278 +695,382 @@ public class RevisionDiffPanel extends Panel {protected void populateItem(ListItem<BlobChange> item) {BlobChange change = item.getModelObject();item.setMarkupId("diff-" + encodePath(change.getPath()));- if (annotationSupport != null) {- item.add(new BlobDiffPanel(DIFF_ID, projectModel, requestModel, change, diffMode,- getBlobBlameModel(change), new TextDiffPanel.AnnotationSupport() {+ item.add(new BlobDiffPanel(DIFF_ID, change, diffMode, getBlobBlameModel(change)) {++ @Override+ protected PullRequest getPullRequest() {+ return RevisionDiffPanel.this.getPullRequest();+ }++ });+ }++ });++ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "diff-mode-" + diffMode.name().toLowerCase();+ }++ }));++ setOutputMarkupId(true);+ }- @Override- public DiffPlanarRange getMarkRange() {- Mark mark = annotationSupport.getMark();- if (mark != null) {- if (change.getPaths().contains(mark.getPath())) {- boolean leftSide = getOldCommitId().name().equals(mark.getCommitHash());- return new DiffPlanarRange(leftSide, mark.getRange());+ private BlobChange newBlobChange(ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,+ WhitespaceOption whitespaceOption) {+ return new BlobChange(type, oldBlobIdent, newBlobIdent, whitespaceOption) {++ @Override+ public Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }++ private transient Optional<AnnotationSupport> annotationSupportCache;++ @Override+ public AnnotationSupport getAnnotationSupport() {+ if (annotationSupportCache == null) {+ if (annotationSupport != null) {+ annotationSupportCache = Optional.of(new BlobChange.AnnotationSupport() {++ @Override+ public DiffPlanarRange getMarkRange() {+ Mark mark = annotationSupport.getMark();+ if (mark != null) {+ if (getPaths().contains(mark.getPath())) {+ boolean leftSide = getOldCommitId().name().equals(mark.getCommitHash());+ DiffPlanarRange markRange = new DiffPlanarRange(leftSide, mark.getRange());+ if (isVisible(markRange))+ return markRange;+ else+ return null;+ } else {+ return null;+ }} else {- return null;+ Pair<CodeComment, DiffPlanarRange> openCommentPair = getOpenComment();+ if (openCommentPair != null)+ return openCommentPair.getSecond();+ else+ return null;}- } else {- CodeComment openComment = getOpenComment();- if (openComment != null)- return getCommentRange(openComment);- else- return null;}- }- @Override- public String getMarkUrl(DiffPlanarRange markRange) {- return annotationSupport.getMarkUrl(getMark(change, markRange));- }+ @Override+ public String getMarkUrl(DiffPlanarRange markRange) {+ return annotationSupport.getMarkUrl(getMark(markRange));+ }- @Override- public CodeComment getOpenComment() {- CodeComment openComment = annotationSupport.getOpenComment();- if (openComment != null && change.getPaths().contains(openComment.getMark().getPath()))- return openComment;- else+ @Override+ public Pair<CodeComment, DiffPlanarRange> getOpenComment() {+ CodeComment openComment = annotationSupport.getOpenComment();+ if (openComment != null) {+ DiffPlanarRange commentRange = getCommentRange(openComment);+ if (commentRange != null)+ return new Pair<>(openComment, commentRange);+ }return null;- }-- @Override- public void onOpenComment(AjaxRequestTarget target, CodeComment comment, DiffPlanarRange commentRange) {- RevisionDiffPanel.this.onOpenComment(target, comment, getMark(change, commentRange));- ((BasePage)getPage()).resizeWindow(target);- }+ }- @Override- public void onAddComment(AjaxRequestTarget target, DiffPlanarRange commentRange) {- Mark mark = getMark(change, commentRange);- commentContainer.setDefaultModelObject(mark);-- Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", RevisionDiffPanel.this);- fragment.setOutputMarkupId(true);-- Form<?> form = new Form<Void>("form");-- String uuid = UUID.randomUUID().toString();-- CommentInput contentInput;-- StringBuilder mentions = new StringBuilder();-- if (requestModel.getObject() == null) {- /*- * Outside of pull request, no one will be notified of the comment. So we automatically- * mention authors of commented lines- */- for (User user: projectModel.getObject().getAuthors(mark.getPath(),- ObjectId.fromString(mark.getCommitHash()),- new LinearRange(commentRange.getFromRow(), commentRange.getToRow()))) {- if (user.getEmail() != null)- mentions.append("@").append(user.getName()).append(" ");- }+ @Override+ public void onOpenComment(AjaxRequestTarget target, CodeComment comment, DiffPlanarRange commentRange) {+ RevisionDiffPanel.this.onOpenComment(target, comment, getMark(commentRange));+ ((BasePage)getPage()).resizeWindow(target);}-- form.add(contentInput = new CommentInput("content", Model.of(mentions.toString()), true) {-- @Override- protected ProjectAttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(projectModel.getObject(), uuid,- SecurityUtils.canManageCodeComments(projectModel.getObject()));- }-- @Override- protected Project getProject() {- return projectModel.getObject();- }++ @Override+ public void onAddComment(AjaxRequestTarget target, DiffPlanarRange commentRange) {+ Mark mark = getMark(commentRange);+ commentContainer.setDefaultModelObject(mark);- });- contentInput.setRequired(true);- contentInput.setLabel(Model.of("Comment"));-- FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.add(feedback);-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));- }+ Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", RevisionDiffPanel.this);+ fragment.setOutputMarkupId(true);- @Override- public void onClick(AjaxRequestTarget target) {- clearComment(target);- Mark mark = annotationSupport.getMark();- if (mark != null) {- BlobDiffPanel blobDiffPanel = getBlobDiffPanel(mark.getPath());- if (blobDiffPanel != null)- blobDiffPanel.unmark(target);- ((AnnotationSupport)annotationSupport).onUnmark(target);+ Form<?> form = new Form<Void>("form");++ String uuid = UUID.randomUUID().toString();++ CommentInput contentInput;++ StringBuilder mentions = new StringBuilder();++ if (getPullRequest() == null) {+ /*+ * Outside of pull request, no one will be notified of the comment. So we automatically+ * mention authors of commented lines+ */+ for (User user: getProject().getAuthors(mark.getPath(),+ ObjectId.fromString(mark.getCommitHash()),+ new LinearRange(commentRange.getFromRow(), commentRange.getToRow()))) {+ if (user.getEmail() != null)+ mentions.append("@").append(user.getName()).append(" ");}}- });-- form.add(new AjaxButton("save") {-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(feedback);- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Project project = projectModel.getObject();- PullRequest request = requestModel.getObject();- CodeComment comment = new CodeComment();- comment.setUUID(uuid);- comment.setProject(project);- comment.setRequest(request);- comment.setUser(SecurityUtils.getUser());- comment.setMark(mark);- comment.setCompareContext(getCompareContext(mark.getCommitHash()));- comment.setContent(contentInput.getModelObject());+ form.add(contentInput = new CommentInput("content", Model.of(mentions.toString()), true) {++ @Override+ protected ProjectAttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), uuid,+ SecurityUtils.canManageCodeComments(getProject()));+ }++ @Override+ protected Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }- annotationSupport.onSaveComment(comment);+ });+ contentInput.setRequired(true);+ contentInput.setLabel(Model.of("Comment"));++ FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }- CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {-- @Override- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- RevisionDiffPanel.this.onCommentDeleted(target, comment, mark);+ @Override+ public void onClick(AjaxRequestTarget target) {+ clearComment(target);+ Mark mark = annotationSupport.getMark();+ if (mark != null) {+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(mark.getPath());+ if (blobDiffPanel != null)+ blobDiffPanel.unmark(target);+ annotationSupport.onUnmark(target);}+ }++ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);- @Override- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {- annotationSupport.onSaveComment(comment);- target.add(commentContainer.get("head"));+ CodeComment comment = new CodeComment();+ comment.setUUID(uuid);+ comment.setProject(getProject());+ comment.setRequest(getPullRequest());+ comment.setUser(SecurityUtils.getUser());+ comment.setMark(mark);+ comment.setCompareContext(getCompareContext(mark.getCommitHash()));+ comment.setContent(contentInput.getModelObject());++ annotationSupport.onSaveComment(comment);++ CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {++ @Override+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {+ RevisionDiffPanel.this.onCommentDeleted(target, comment);+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {+ annotationSupport.onSaveComment(comment);+ target.add(commentContainer.get("head"));+ }++ @Override+ protected PullRequest getPullRequest() {+ return RevisionDiffPanel.this.getPullRequest();+ }++ @Override+ protected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {+ reply.getComment().setCompareContext(getCompareContext(comment.getMark().getCommitHash()));+ annotationSupport.onSaveCommentReply(reply);+ }++ };+ commentContainer.replace(commentPanel);+ target.add(commentContainer);++ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());+ if (blobDiffPanel != null)+ blobDiffPanel.onCommentAdded(target, comment, commentRange);++ annotationSupport.onCommentOpened(target, comment);+ }++ });+ fragment.add(form);++ commentContainer.replace(fragment);+ commentContainer.setVisible(true);+ target.add(commentContainer);++ Mark prevMark = annotationSupport.getMark();+ if (prevMark != null) {+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevMark.getPath());+ if (blobDiffPanel != null)+ blobDiffPanel.unmark(target);+ }++ CodeComment prevComment = annotationSupport.getOpenComment();+ if (prevComment != null) {+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevComment.getMark().getPath());+ if (blobDiffPanel != null)+ blobDiffPanel.onCommentClosed(target);+ }+ annotationSupport.onAddComment(target, mark);+ String script = String.format(""+ + "setTimeout(function() {"+ + " var $textarea = $('#%s textarea');"+ + " $textarea.caret($textarea.val().length);"+ + "}, 100);"+ + "$(window).resize();",+ commentContainer.getMarkupId());+ target.appendJavaScript(script);+ }++ @Override+ public Component getCommentContainer() {+ return commentContainer;+ }++ private transient Map<CodeComment, PlanarRange> oldComments;++ @Override+ public Map<CodeComment, PlanarRange> getOldComments() {+ if (oldComments == null) {+ oldComments = new HashMap<>();+ if (getOldBlobIdent().path != null) {+ for (Map.Entry<CodeComment, PlanarRange> entry:+ annotationSupport.getOldComments(getOldBlobIdent().path).entrySet()) {+ if (isVisible(new DiffPlanarRange(true, entry.getValue())))+ oldComments.put(entry.getKey(), entry.getValue());}-- @Override- protected PullRequest getPullRequest() {- return requestModel.getObject();+ }+ }+ return oldComments;+ }++ private transient Map<CodeComment, PlanarRange> newComments;++ @Override+ public Map<CodeComment, PlanarRange> getNewComments() {+ if (newComments == null) {+ newComments = new HashMap<>();+ if (getNewBlobIdent().path != null) {+ for (Map.Entry<CodeComment, PlanarRange> entry:+ annotationSupport.getNewComments(getNewBlobIdent().path).entrySet()) {+ if (isVisible(new DiffPlanarRange(false, entry.getValue())))+ newComments.put(entry.getKey(), entry.getValue());}+ }+ }+ return newComments;+ }- @Override- protected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {- reply.getComment().setCompareContext(getCompareContext(comment.getMark().getCommitHash()));- annotationSupport.onSaveCommentReply(reply);+ private transient Collection<CodeProblem> oldProblems;++ @Override+ public Collection<CodeProblem> getOldProblems() {+ if (oldProblems == null) {+ oldProblems = new HashSet<>();+ if (getOldBlobIdent().path != null) {+ for (CodeProblem problem: annotationSupport.getOldProblems(getOldBlobIdent().path)) {+ if (isVisible(new DiffPlanarRange(true, problem.getRange())))+ oldProblems.add(problem);}-- };- commentContainer.replace(commentPanel);- target.add(commentContainer);-- BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());- if (blobDiffPanel != null)- blobDiffPanel.onCommentAdded(target, comment, commentRange);-- ((AnnotationSupport)annotationSupport).onCommentOpened(target, comment);+ }}+ return oldProblems;+ }- });- fragment.add(form);-- commentContainer.replace(fragment);- commentContainer.setVisible(true);- target.add(commentContainer);+ private transient Collection<CodeProblem> newProblems;- Mark prevMark = annotationSupport.getMark();- if (prevMark != null) {- BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevMark.getPath());- if (blobDiffPanel != null)- blobDiffPanel.unmark(target);+ @Override+ public Collection<CodeProblem> getNewProblems() {+ if (newProblems == null) {+ newProblems = new HashSet<>();+ if (getNewBlobIdent().path != null) {+ for (CodeProblem problem: annotationSupport.getNewProblems(getNewBlobIdent().path)) {+ if (isVisible(new DiffPlanarRange(false, problem.getRange())))+ newProblems.add(problem);+ }+ }+ }+ return newProblems;}-- CodeComment prevComment = annotationSupport.getOpenComment();- if (prevComment != null) {- BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevComment.getMark().getPath());- if (blobDiffPanel != null)- blobDiffPanel.onCommentClosed(target, prevComment);- }- ((AnnotationSupport)annotationSupport).onAddComment(target, mark);- String script = String.format(""- + "setTimeout(function() {"- + " var $textarea = $('#%s textarea');"- + " $textarea.caret($textarea.val().length);"- + "}, 100);"- + "$(window).resize();",- commentContainer.getMarkupId());- target.appendJavaScript(script);- }- @Override- public Component getCommentContainer() {- return commentContainer;- }-- @Override- public Map<CodeComment, PlanarRange> getOldComments() {- Map<CodeComment, PlanarRange> oldComments = new HashMap<>();- for (Map.Entry<CodeComment, PlanarRange> entry: annotationSupport.getOldComments().entrySet()) {- if (entry.getKey().getMark().getPath().equals(change.getOldBlobIdent().path))- oldComments.put(entry.getKey(), entry.getValue());+ private transient Collection<LineCoverage> oldCoverages;++ @Override+ public Collection<LineCoverage> getOldCoverages() {+ if (oldCoverages == null) {+ oldCoverages = new ArrayList<>();+ if (getOldBlobIdent().path != null) {+ for (LineCoverage coverage: annotationSupport.getOldCoverages(getOldBlobIdent().path)) {+ for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {+ if (isVisible(true, line))+ oldCoverages.add(new LineCoverage(line, line, coverage.getTestCount()));+ }+ }+ }+ }+ return oldCoverages;}- return oldComments;- }- @Override- public Map<CodeComment, PlanarRange> getNewComments() {- Map<CodeComment, PlanarRange> newComments = new HashMap<>();- for (Map.Entry<CodeComment, PlanarRange> entry: annotationSupport.getNewComments().entrySet()) {- if (entry.getKey().getMark().getPath().equals(change.getNewBlobIdent().path))- newComments.put(entry.getKey(), entry.getValue());+ private transient Collection<LineCoverage> newCoverages;++ @Override+ public Collection<LineCoverage> getNewCoverages() {+ if (newCoverages == null) {+ newCoverages = new ArrayList<>();+ if (getNewBlobIdent().path != null) {+ for (LineCoverage coverage: annotationSupport.getNewCoverages(getNewBlobIdent().path)) {+ for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {+ if (isVisible(false, line))+ newCoverages.add(new LineCoverage(line, line, coverage.getTestCount()));+ }+ }+ }+ }+ return newCoverages;}- return newComments;- }-- @Override- public Collection<CodeProblem> getOldProblems() {- return new ArrayList<>();- }-- @Override- public Collection<CodeProblem> getNewProblems() {- return new ArrayList<>();- }- @Override- public Collection<LineCoverage> getOldCoverages() {- return new ArrayList<>();- }-- @Override- public Collection<LineCoverage> getNewCoverages() {- return new ArrayList<>();- }-- }));- } else {- item.add(new BlobDiffPanel(DIFF_ID, projectModel, requestModel, change,- diffMode, getBlobBlameModel(change), null));+ @Override+ public DiffPlanarRange getCommentRange(CodeComment comment) {+ PlanarRange commentRange = getNewComments().get(comment);+ if (commentRange != null)+ return new DiffPlanarRange(false, commentRange);+ commentRange = getOldComments().get(comment);+ if (commentRange != null)+ return new DiffPlanarRange(true, commentRange);+ return null;+ }++ });+ } else {+ annotationSupportCache = Optional.absent();+ }}+ return annotationSupportCache.orNull();}- });-- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return "diff-mode-" + diffMode.name().toLowerCase();- }-- }));-- setOutputMarkupId(true);+ };}-+private CompareContext getCompareContext(String commitHash) {CompareContext compareContext = new CompareContext();String oldCommitHash = getOldCommitId().name();@@ -994,7 +1092,7 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- onCommentDeleted(target, comment, mark);+ onCommentDeleted(target, comment);}@Override@@ -1005,7 +1103,7 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected PullRequest getPullRequest() {- return requestModel.getObject();+ return RevisionDiffPanel.this.getPullRequest();}@Override@@ -1025,7 +1123,7 @@ public class RevisionDiffPanel extends Panel {if (prevComment != null) {BlobDiffPanel blobDiffPanel = getBlobDiffPanel(prevComment.getMark().getPath());if (blobDiffPanel != null)- blobDiffPanel.onCommentClosed(target, prevComment);+ blobDiffPanel.onCommentClosed(target);}Mark prevMark = annotationSupport.getMark();@@ -1037,19 +1135,6 @@ public class RevisionDiffPanel extends Panel {annotationSupport.onCommentOpened(target, comment);}- private Mark getMark(BlobChange change, DiffPlanarRange range) {- Mark mark = new Mark();- mark.setRange(new PlanarRange(range));- if (range.isLeftSide()) {- mark.setCommitHash(getOldCommitId().name());- mark.setPath(change.getOldBlobIdent().path);- } else {- mark.setCommitHash(getNewCommitId().name());- mark.setPath(change.getNewBlobIdent().path);- }- return mark;- }-private DiffPlanarRange getMarkRange(@Nullable Mark mark) {if (mark != null)return new DiffPlanarRange(mark.getCommitHash().equals(getOldCommitId().name()), mark.getRange());@@ -1088,20 +1173,6 @@ public class RevisionDiffPanel extends Panel {}}- @Nullable- private DiffPlanarRange getCommentRange(CodeComment comment) {- PlanarRange range = annotationSupport.getNewComments().get(comment);- if (range != null) {- return new DiffPlanarRange(false, range);- } else {- range = annotationSupport.getOldComments().get(comment);- if (range != null)- return new DiffPlanarRange(true, range);- else- return null;- }- }-private WebMarkupContainer newCommentContainer() {WebMarkupContainer commentContainer = new WebMarkupContainer("comment", Model.of((Mark)null)) {@@ -1135,7 +1206,7 @@ public class RevisionDiffPanel extends Panel {BlobDiffPanel blobDiffPanel = getBlobDiffPanel(mark.getPath());if (blobDiffPanel != null)blobDiffPanel.mark(target, getMarkRange(mark));- ((AnnotationSupport)annotationSupport).onMark(target, mark);+ annotationSupport.onMark(target, mark);target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));}@@ -1159,12 +1230,10 @@ public class RevisionDiffPanel extends Panel {public void onClick(AjaxRequestTarget target) {CodeComment comment = annotationSupport.getOpenComment();clearComment(target);- if (comment != null) {- BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());- if (blobDiffPanel != null)- blobDiffPanel.onCommentClosed(target, comment);- annotationSupport.onCommentClosed(target);- }+ BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());+ if (blobDiffPanel != null)+ blobDiffPanel.onCommentClosed(target);+ annotationSupport.onCommentClosed(target);}});@@ -1172,17 +1241,17 @@ public class RevisionDiffPanel extends Panel {if (annotationSupport != null) {CodeComment openComment = annotationSupport.getOpenComment();if (openComment != null) {- DiffPlanarRange commentRange = getCommentRange(openComment);- if (commentRange != null) {- BlobChange blobChange = getBlobChange(commentRange.isLeftSide(), openComment.getMark().getPath());- if (blobChange != null && blobChange.isVisible(commentRange))- commentContainer.setDefaultModelObject(getMark(blobChange, commentRange));+ BlobChange change = getBlobChange(openComment.getMark().getPath());+ if (change != null) {+ DiffPlanarRange commentRange = change.getAnnotationSupport().getCommentRange(openComment);+ if (commentRange != null)+ commentContainer.setDefaultModelObject(commentRange);}CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, openComment.getId()) {@Overrideprotected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- onCommentDeleted(target, comment, (Mark) commentContainer.getDefaultModelObject());+ onCommentDeleted(target, comment);}@Override@@ -1193,7 +1262,7 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected PullRequest getPullRequest() {- return requestModel.getObject();+ return RevisionDiffPanel.this.getPullRequest();}@Override@@ -1215,20 +1284,25 @@ public class RevisionDiffPanel extends Panel {return commentContainer;}+ protected abstract Project getProject();++ @Nullable+ protected PullRequest getPullRequest() {+ return null;+ }+private ObjectId getOldCommitId() {- if (oldRev.equals(ObjectId.zeroId().name().toString())) {+ if (oldRev.equals(ObjectId.zeroId().name().toString()))return ObjectId.zeroId();- } else {- return projectModel.getObject().getRevCommit(oldRev, true);- }+ else+ return getProject().getRevCommit(oldRev, true);}private ObjectId getNewCommitId() {- if (newRev.equals(ObjectId.zeroId().name().toString())) {+ if (newRev.equals(ObjectId.zeroId().name().toString()))return ObjectId.zeroId();- } else {- return projectModel.getObject().getRevCommit(newRev, true);- }+ else+ return getProject().getRevCommit(newRev, true);}@Nullable@@ -1252,28 +1326,20 @@ public class RevisionDiffPanel extends Panel {}@Nullable- private BlobChange getBlobChange(boolean leftSide, String path) {- for (BlobChange change: changesAndCountModel.getObject().getChanges()) {- if (leftSide && path.equals(change.getOldBlobIdent().path)- || !leftSide && path.equals(change.getNewBlobIdent().path)) {+ private BlobChange getBlobChange(String blobPath) {+ for (BlobChange change: revsionDiffModel.getObject().getDisplayChanges()) {+ if (change.getPaths().contains(blobPath))return change;- }}return null;}- private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment, @Nullable Mark mark) {+ private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {clearComment(target);BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());if (blobDiffPanel != null)- blobDiffPanel.onCommentDeleted(target, comment, getMarkRange(mark));+ blobDiffPanel.onCommentDeleted(target);annotationSupport.onCommentClosed(target);- mark = annotationSupport.getMark();- if (mark != null) {- blobDiffPanel = getBlobDiffPanel(mark.getPath());- if (blobDiffPanel != null)- blobDiffPanel.mark(target, getMarkRange(mark));- }}private void clearComment(AjaxRequestTarget target) {@@ -1286,9 +1352,7 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected void onDetach() {diffEntriesModel.detach();- changesAndCountModel.detach();- projectModel.detach();- requestModel.detach();+ revsionDiffModel.detach();if (blameModel != null)blameModel.detach();pathFilterModel.detach();@@ -1304,76 +1368,9 @@ public class RevisionDiffPanel extends Panel {}private Set<String> getWebSocketObservables() {- Project project = projectModel.getObject();return Sets.newHashSet(- CommitIndexed.getWebSocketObservable(project.getObjectId(oldRev, true).name()),- CommitIndexed.getWebSocketObservable(project.getObjectId(newRev, true).name()));- }-- private static class ChangesAndCount {-- private final List<BlobChange> changes;-- private final int count;-- public ChangesAndCount(List<BlobChange> changes, int count) {- this.changes = changes;- this.count = count;- }-- /**- * Get list of changes we are capable to handle, note that size of this list- * might be less than total number of changes in order not to put heavy- * burden on the system and browser- *- * @return- * list of changes we are capable to handle- */- public List<BlobChange> getChanges() {- return changes;- }-- /**- * Get total number of changes detected- *- * @return- * total number of changes detected- */- public int getCount() {- return count;- }-- }-- 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();-- Map<CodeComment, PlanarRange> getOldComments();-- Map<CodeComment, PlanarRange> getNewComments();-- void onCommentOpened(AjaxRequestTarget target, CodeComment comment);-- void onCommentClosed(AjaxRequestTarget target);-- void onAddComment(AjaxRequestTarget target, Mark mark);-- void onSaveComment(CodeComment comment);-- void onSaveCommentReply(CodeCommentReply reply);-+ CommitIndexed.getWebSocketObservable(getProject().getObjectId(oldRev, true).name()),+ CommitIndexed.getWebSocketObservable(getProject().getObjectId(newRev, true).name()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.javaindex 022cd9f8dd..2c6c49ad46 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java@@ -5,6 +5,7 @@ import java.util.Collection;import java.util.Comparator;import java.util.HashMap;import java.util.List;+import java.util.Optional;import javax.annotation.Nullable;@@ -142,8 +143,8 @@ public abstract class JobListPanel extends Panel {@Overrideprotected List<Build> load() {BuildManager buildManager = OneDev.getInstance(BuildManager.class);- List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId, job.getName(),- refName, getPullRequest(), new HashMap<>()));+ List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId,+ job.getName(), refName, Optional.ofNullable(getPullRequest()), new HashMap<>()));builds.sort(Comparator.comparing(Build::getNumber));return builds;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex ee78045ce5..406c369f37 100644--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -20,7 +20,6 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -53,19 +52,17 @@ public abstract class SymbolTooltipPanel extends Panel {private static final int QUERY_ENTRIES = 20;- private final IModel<Project> projectModel;-private String revision = "";private String symbolName = "";private List<QueryHit> symbolHits = new ArrayList<>();- public SymbolTooltipPanel(String id, IModel<Project> projectModel) {+ public SymbolTooltipPanel(String id) {super(id);-- this.projectModel = projectModel;}++ protected abstract Project getProject();@Overrideprotected void onInitialize() {@@ -153,8 +150,8 @@ public abstract class SymbolTooltipPanel extends Panel {.build();try {SearchManager searchManager = OneDev.getInstance(SearchManager.class);- ObjectId commit = projectModel.getObject().getRevCommit(revision, true);- hits = searchManager.search(projectModel.getObject(), commit, query);+ ObjectId commit = getProject().getRevCommit(revision, true);+ hits = searchManager.search(getProject(), commit, query);} catch (InterruptedException e) {throw new RuntimeException(e);}@@ -207,11 +204,11 @@ public abstract class SymbolTooltipPanel extends Panel {// do this check to avoid TooGeneralQueryExceptionif (symbolName.length() != 0 && symbolName.indexOf('?') == -1 && symbolName.indexOf('*') == -1) {BlobIdent blobIdent = new BlobIdent(revision, getBlobPath(), FileMode.TYPE_FILE);- Blob blob = projectModel.getObject().getBlob(blobIdent, true);+ Blob blob = getProject().getBlob(blobIdent, true);if (symbolHits.size() < QUERY_ENTRIES) {// first find in current file for matched symbols- List<Symbol> symbols = OneDev.getInstance(SearchManager.class).getSymbols(projectModel.getObject(),+ List<Symbol> symbols = OneDev.getInstance(SearchManager.class).getSymbols(getProject(),blob.getBlobId(), getBlobPath());if (symbols != null) {for (Symbol symbol: symbols) {@@ -237,7 +234,7 @@ public abstract class SymbolTooltipPanel extends Panel {// then find in other files for public symbolstry {SearchManager searchManager = OneDev.getInstance(SearchManager.class);- ObjectId commit = projectModel.getObject().getRevCommit(revision, true);+ ObjectId commit = getProject().getRevCommit(revision, true);BlobQuery query;if (symbolHits.size() < QUERY_ENTRIES) {query = new SymbolQuery.Builder().term(symbolName)@@ -247,7 +244,7 @@ public abstract class SymbolTooltipPanel extends Panel {.caseSensitive(true).count(QUERY_ENTRIES).build();- symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(getProject(), commit, query));}if (symbolHits.size() < QUERY_ENTRIES) {query = new SymbolQuery.Builder().term(symbolName)@@ -257,7 +254,7 @@ public abstract class SymbolTooltipPanel extends Panel {.caseSensitive(true).count(QUERY_ENTRIES - symbolHits.size()).build();- symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));+ symbolHits.addAll(searchManager.search(getProject(), commit, query));}} catch (InterruptedException e) {throw new RuntimeException(e);@@ -294,14 +291,14 @@ public abstract class SymbolTooltipPanel extends Panel {BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.position = SourceRendererProvider.getPosition(hit.getTokenPos());- return ProjectBlobPage.paramsOf(projectModel.getObject(), state);+ return ProjectBlobPage.paramsOf(getProject(), state);}public PageParameters getFindOccurrencesParams() {BlobIdent blobIdent = new BlobIdent(revision, getBlobPath(), FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.query = symbolName;- return ProjectBlobPage.paramsOf(projectModel.getObject(), state);+ return ProjectBlobPage.paramsOf(getProject(), state);}public String getSymbol() {@@ -312,12 +309,6 @@ public abstract class SymbolTooltipPanel extends Panel {return revision;}- @Override- protected void onDetach() {- projectModel.detach();- super.onDetach();- }-protected abstract String getBlobPath();protected abstract void onSelect(AjaxRequestTarget target, QueryHit hit);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 1469c7190d..2b3a15a2f7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project;import java.util.ArrayList;+import java.util.Collection;import java.util.Comparator;import java.util.HashMap;import java.util.List;@@ -22,7 +23,9 @@ import com.google.common.collect.Lists;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.avatar.AvatarManager;@@ -75,6 +78,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {protected final IModel<Project> projectModel;+ private transient Map<ObjectId, Collection<Build>> buildsCache;+public static PageParameters paramsOf(Project project) {PageParameters params = new PageParameters();params.add(PARAM_PROJECT, project.getName());@@ -271,4 +276,16 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {protected abstract Component newProjectTitle(String componentId);+ protected Collection<Build> getBuilds(ObjectId commitId) {+ if (buildsCache == null)+ buildsCache = new HashMap<>();+ Collection<Build> builds = buildsCache.get(commitId);+ if (builds == null) {+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ builds = buildManager.query(getProject(), commitId, null, null, null, new HashMap<>());+ buildsCache.put(commitId, builds);+ }+ return builds;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex c405ab9640..409bfb3b5b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -25,8 +25,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.Model;import org.eclipse.jgit.diff.DiffEntry;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;@@ -40,7 +38,6 @@ import com.google.common.base.Objects;import com.google.common.base.Preconditions;import io.onedev.server.event.RefUpdated;-import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;@@ -50,7 +47,6 @@ import io.onedev.server.git.exception.NotTreeException;import io.onedev.server.git.exception.ObjectAlreadyExistsException;import io.onedev.server.git.exception.ObsoleteCommitException;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Provider;@@ -143,18 +139,10 @@ public abstract class CommitOptionPanel extends Panel {private void newChangesOfOthersContainer(@Nullable AjaxRequestTarget target) {Component changesOfOthersContainer;- if (changesOfOthers != null) {- changesOfOthersContainer = new BlobDiffPanel("changesOfOthers", new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return context.getProject();- }-- }, new Model<PullRequest>(null), changesOfOthers, DiffViewMode.UNIFIED, null, null);- } else {+ if (changesOfOthers != null)+ changesOfOthersContainer = new BlobDiffPanel("changesOfOthers", changesOfOthers, DiffViewMode.UNIFIED, null);+ elsechangesOfOthersContainer = new WebMarkupContainer("changesOfOthers").setVisible(false);- }if (target != null) {form.replace(changesOfOthersContainer);target.add(form);@@ -393,8 +381,8 @@ public abstract class CommitOptionPanel extends Panel {return new BlobChange(changeType, oldBlobIdent, newBlobIdent, WhitespaceOption.DEFAULT) {@Override- public Blob getBlob(BlobIdent blobIdent) {- return context.getProject().getBlob(blobIdent, true);+ public Project getProject() {+ return context.getProject();}};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.javaindex faa2a585ed..394a9dc998 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@@ -37,7 +37,6 @@ import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.Form;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;@@ -352,8 +351,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overrideprotected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment,- (PlanarRange) commentContainer.getDefaultModelObject());+ SourceViewPanel.this.onCommentDeleted(target);}@Override@@ -475,7 +473,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searmark.setCommitHash(context.getCommit().name());mark.setPath(context.getBlobIdent().path);- PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();mark.setRange(range);comment.setMark(mark);@@ -491,7 +488,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overrideprotected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment, range);+ SourceViewPanel.this.onCommentDeleted(target);}@Override@@ -538,8 +535,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overrideprotected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();- SourceViewPanel.this.onCommentDeleted(target, comment, range);+ SourceViewPanel.this.onCommentDeleted(target);}@Override@@ -685,14 +681,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searoutline.setVisible(isOutlineVisibleInitially());- add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return context.getProject();- }-- }) {+ add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip") {@Overrideprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {@@ -710,6 +699,11 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprotected String getBlobPath() {return context.getBlobIdent().path;}++ @Override+ protected Project getProject() {+ return context.getProject();+ }});}@@ -765,11 +759,9 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searsuper.onDetach();}- private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment, @Nullable PlanarRange range) {+ private void onCommentDeleted(AjaxRequestTarget target) {clearComment(target);- String script = String.format("onedev.server.sourceView.onCommentDeleted(%s);",- convertToJson(new CodeCommentInfo(comment, range)));- target.appendJavaScript(script);+ target.appendJavaScript("onedev.server.sourceView.onCommentDeleted();");context.onCommentClosed(target);}@@ -831,12 +823,15 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearString jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);- CodeCommentInfo openComment;+ CodeCommentInfo openCommentInfo;if (context.getOpenComment() != null) {PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();- openComment = new CodeCommentInfo(context.getOpenComment(), range);+ if (range != null)+ openCommentInfo = new CodeCommentInfo(context.getOpenComment(), range);+ else+ openCommentInfo = null;} else {- openComment = null;+ openCommentInfo = null;}CharSequence callback = ajaxBehavior.getCallbackFunction(@@ -851,7 +846,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear+ "'%s', '%s', %s, %s, '%s', '%s', %s, %s, %s, %s, '%s', %s);",JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),- convertToJson(openComment),+ convertToJson(openCommentInfo),convertToJson(markRange),symbolTooltip.getMarkupId(),context.getBlobIdent().revision,@@ -993,8 +988,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate void closeComment(AjaxRequestTarget target) {clearComment(target);- if (context.getOpenComment() != null)- context.onCommentClosed(target);+ context.onCommentClosed(target);target.appendJavaScript("onedev.server.sourceView.onCloseComment();");}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.cssindex b71e6c9e1e..afdba16750 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css@@ -39,6 +39,10 @@background: #FCF5DA;}+.CodeMirror-linenumber {+ width: 30px;+ padding-left: 0;+}.CodeMirror-coverages {width: 6px;}@@ -58,9 +62,12 @@background: #b37600;}-.CodeMirror-comments, .CodeMirror-problems {+.CodeMirror-comments {width: 24px;}+.CodeMirror-problems {+ width: 20px;+}.CodeMirror-comment, .CodeMirror-problem {text-align: right;}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.jsindex 71f5710494..08a7e6123f 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@@ -111,17 +111,17 @@ onedev.server.sourceView = {});for (var line in annotationInfo.comments) {- if (annotationInfo.comments.hasOwnProperty(line))+ if (annotationInfo.comments.hasOwnProperty(line) && line<cm.lineCount())onedev.server.sourceView.addCommentGutter(line, annotationInfo.comments[line]);}for (var line in annotationInfo.problems) {- if (annotationInfo.problems.hasOwnProperty(line))+ if (annotationInfo.problems.hasOwnProperty(line) && line<cm.lineCount())onedev.server.sourceView.addProblemGutter(line, annotationInfo.problems[line]);}for (var line in annotationInfo.coverages) {- if (annotationInfo.coverages.hasOwnProperty(line))+ if (annotationInfo.coverages.hasOwnProperty(line) && line<cm.lineCount())onedev.server.sourceView.addCoverageGutter(line, annotationInfo.coverages[line]);}@@ -229,7 +229,7 @@ onedev.server.sourceView = {if (testCount > 0)tooltip = `Tested ${testCount} times`;else- tooltip = "Not covered by any test";+ tooltip = "Not covered by any tests";let $gutter = $(`<a class='CodeMirror-coverage d-block' title='${tooltip}'> </a>`);@@ -239,6 +239,7 @@ onedev.server.sourceView = {$gutter.addClass("not-tested");let cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+cm.setGutterMarker(parseInt(line), "CodeMirror-coverages", $gutter[0]);},addProblemGutter: function(line, problems) {@@ -247,11 +248,10 @@ onedev.server.sourceView = {var $gutter = $(document.createElement("div"));$gutter.addClass("CodeMirror-problem");- $gutter.data("problems", problems);var markRanges = [];for (var i in problems)- markRanges.push(problems[i].position);+ markRanges.push(problems[i].range);var icon = onedev.server.codeProblem.getIcon(problems);var linkClass = onedev.server.codeProblem.getLinkClass(problems);@@ -276,7 +276,7 @@ onedev.server.sourceView = {var $currentPopover = $(".problem-popover[data-line='" + line + "']");$(".popover").not($currentPopover).popover("hide");$currentPopover.find(".problem-content").mouseover(function() {- onedev.server.codemirror.mark(cm, problems[$(this).index()].position);+ onedev.server.codemirror.mark(cm, problems[$(this).index()].range);}).mouseout(function() {onedev.server.sourceView.restoreMark();}).each(function() {@@ -284,9 +284,9 @@ onedev.server.sourceView = {$(this).children(".add-comment").click(function() {if (onedev.server.sourceView.confirmUnsavedChanges()) {$currentPopover.popover("hide");- var position = problem.position;- callback("addComment", position.fromRow, position.fromColumn,- position.toRow, position.toColumn);+ var range = problem.range;+ callback("addComment", range.fromRow, range.fromColumn,+ range.toRow, range.toColumn);}});});@@ -449,12 +449,12 @@ onedev.server.sourceView = {onedev.server.sourceView.highlightCommentTrigger();$(window).resize();},- onCommentDeleted: function(comment) {+ onCommentDeleted: function() {var $sourceView = $(".source-view");- $sourceView.removeData("openComment");-- if (comment.range) {- var line = parseInt(comment.range.fromRow);+ var openComment = $sourceView.data("openComment");+ if (openComment) {+ $sourceView.removeData("openComment");+ var line = parseInt(openComment.range.fromRow);var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;var lineInfo = cm.lineInfo(line);var $gutter = $(lineInfo.gutterMarkers["CodeMirror-comments"]);@@ -463,7 +463,7 @@ onedev.server.sourceView = {cm.setGutterMarker(line, "CodeMirror-comments", null);} else {for (var i in comments) {- if (comments[i].id == comment.id) {+ if (comments[i].id == openComment.id) {comments.splice(i, 1);break;}@@ -475,20 +475,20 @@ onedev.server.sourceView = {$(window).resize();onedev.server.sourceView.clearMark();},- onAddComment: function(markRange) {+ onAddComment: function(commentRange) {$(".popover").popover("hide");onedev.server.sourceView.exitFullScreen();var $sourceView = $(".source-view");$sourceView.removeData("openComment");- $sourceView.data("markRange", markRange);+ $sourceView.data("markRange", commentRange);$(".source-view>.code").selectionPopover("close");var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;onedev.server.codemirror.clearSelection(cm);$(window).resize();- onedev.server.sourceView.mark(markRange, false);- onedev.server.codemirror.scrollIntoView(cm, markRange);+ onedev.server.sourceView.mark(commentRange, false);+ onedev.server.codemirror.scrollIntoView(cm, commentRange);onedev.server.sourceView.highlightCommentTrigger();var $textarea = $sourceView.find(".comment textarea");@@ -539,7 +539,7 @@ onedev.server.sourceView = {}var openComment = $(".source-view").data("openComment");- if (openComment && openComment.range) {+ if (openComment) {var line = parseInt(openComment.range.fromRow);var lineInfo = cm.lineInfo(line);if (lineInfo && lineInfo.gutterMarkers) {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.javaindex 16ae6a4f4f..493d837677 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@@ -5,8 +5,10 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -49,6 +51,10 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;+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;@@ -84,9 +90,10 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.util.ReferenceTransformer;+import io.onedev.server.web.util.RevisionDiff;@SuppressWarnings("serial")-public class CommitDetailPage extends ProjectPage implements RevisionDiffPanel.AnnotationSupport {+public class CommitDetailPage extends ProjectPage implements RevisionDiff.AnnotationSupport {private static final Logger logger = LoggerFactory.getLogger(CommitDetailPage.class);@@ -566,9 +573,15 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiffPanel.A}};- revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,- Model.of((PullRequest)null), getCompareWith().name(), state.revision,- pathFilterModel, whitespaceOptionModel, blameModel, this);+ revisionDiff = new RevisionDiffPanel("revisionDiff", getCompareWith().name(),+ state.revision, pathFilterModel, whitespaceOptionModel, blameModel, this) {++ @Override+ protected Project getProject() {+ return projectModel.getObject();+ }++ };revisionDiff.setOutputMarkupId(true);if (target != null) {replace(revisionDiff);@@ -765,23 +778,67 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiffPanel.A}@Override- public Map<CodeComment, PlanarRange> getOldComments() {+ public Map<CodeComment, PlanarRange> getOldComments(String blobPath) {Map<CodeComment, PlanarRange> oldComments = new HashMap<>();for (CodeComment comment: commentsModel.getObject()) {- if (comment.getMark().getCommitHash().equals(getCompareWith().name()))+ if (comment.getMark().getPath().equals(blobPath)+ && comment.getMark().getCommitHash().equals(getCompareWith().name())) {oldComments.put(comment, comment.getMark().getRange());+ }}return oldComments;}@Override- public Map<CodeComment, PlanarRange> getNewComments() {+ public Map<CodeComment, PlanarRange> getNewComments(String blobPath) {Map<CodeComment, PlanarRange> newComments = new HashMap<>();for (CodeComment comment: commentsModel.getObject()) {- if (comment.getMark().getCommitHash().equals(resolvedRevision.name()))+ if (comment.getMark().getPath().equals(blobPath)+ && comment.getMark().getCommitHash().equals(getCommit().name())) {newComments.put(comment, comment.getMark().getRange());+ }}return newComments;}+ @Override+ public Collection<CodeProblem> getOldProblems(String blobPath) {+ Set<CodeProblem> problems = new HashSet<>();+ for (Build build: getBuilds(getCompareWith())) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ problems.addAll(contribution.getCodeProblems(build, blobPath, null));+ }+ return problems;+ }++ @Override+ public Collection<CodeProblem> getNewProblems(String blobPath) {+ Set<CodeProblem> problems = new HashSet<>();+ for (Build build: getBuilds(getCommit())) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ problems.addAll(contribution.getCodeProblems(build, blobPath, null));+ }+ return problems;+ }++ @Override+ public Collection<LineCoverage> getOldCoverages(String blobPath) {+ Collection<LineCoverage> coverages = new ArrayList<>();+ for (Build build: getBuilds(getCompareWith())) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))+ coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ }+ return coverages;+ }++ @Override+ public Collection<LineCoverage> getNewCoverages(String blobPath) {+ Collection<LineCoverage> coverages = new ArrayList<>();+ for (Build build: getBuilds(getCommit())) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))+ coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ }+ return coverages;+ }+}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.javaindex 63d2e0b915..9086784db7 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@@ -4,8 +4,10 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import javax.annotation.Nullable;@@ -31,10 +33,15 @@ import com.google.common.collect.Lists;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.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;@@ -62,9 +69,10 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.EditParamsAware;+import io.onedev.server.web.util.RevisionDiff;@SuppressWarnings("serial")-public class RevisionComparePage extends ProjectPage implements RevisionDiffPanel.AnnotationSupport, EditParamsAware {+public class RevisionComparePage extends ProjectPage implements RevisionDiff.AnnotationSupport, EditParamsAware {public enum TabPanel {COMMITS,@@ -619,10 +627,16 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiffPane};- tabPanel = new RevisionDiffPanel(TAB_PANEL_ID, projectModel,- new Model<PullRequest>(null),+ tabPanel = new RevisionDiffPanel(TAB_PANEL_ID,state.compareWithMergeBase?mergeBase.name():state.leftSide.getRevision(),- state.rightSide.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this);+ state.rightSide.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {++ @Override+ protected Project getProject() {+ return projectModel.getObject();+ }++ };break;default:tabPanel = new CommitListPanel(TAB_PANEL_ID, new IModel<String>() {@@ -847,24 +861,70 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiffPane}@Override- public Map<CodeComment, PlanarRange> getOldComments() {+ public Map<CodeComment, PlanarRange> getOldComments(String blobPath) {Map<CodeComment, PlanarRange> oldComments = new HashMap<>();for (CodeComment comment: commentsModel.getObject()) {ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;- if (comment.getMark().getCommitHash().equals(oldCommitId.name()))+ if (comment.getMark().getCommitHash().equals(oldCommitId.name())+ && comment.getMark().getPath().equals(blobPath)) {oldComments.put(comment, comment.getMark().getRange());+ }}return oldComments;}@Override- public Map<CodeComment, PlanarRange> getNewComments() {+ public Map<CodeComment, PlanarRange> getNewComments(String blobPath) {Map<CodeComment, PlanarRange> newComments = new HashMap<>();for (CodeComment comment: commentsModel.getObject()) {- if (comment.getMark().getCommitHash().equals(rightCommitId.name()))+ if (comment.getMark().getCommitHash().equals(rightCommitId.name())+ && comment.getMark().getPath().equals(blobPath)) {newComments.put(comment, comment.getMark().getRange());+ }}return newComments;}+ @Override+ public Collection<CodeProblem> getOldProblems(String blobPath) {+ Set<CodeProblem> problems = new HashSet<>();+ ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;+ for (Build build: getBuilds(oldCommitId)) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ problems.addAll(contribution.getCodeProblems(build, blobPath, null));+ }+ return problems;+ }++ @Override+ public Collection<CodeProblem> getNewProblems(String blobPath) {+ Set<CodeProblem> problems = new HashSet<>();+ for (Build build: getBuilds(rightCommitId)) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ problems.addAll(contribution.getCodeProblems(build, blobPath, null));+ }+ return problems;+ }++ @Override+ public Collection<LineCoverage> getOldCoverages(String blobPath) {+ Collection<LineCoverage> coverages = new ArrayList<>();+ ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;+ for (Build build: getBuilds(oldCommitId)) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))+ coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ }+ return coverages;+ }++ @Override+ public Collection<LineCoverage> getNewCoverages(String blobPath) {+ Collection<LineCoverage> coverages = new ArrayList<>();+ for (Build build: getBuilds(rightCommitId)) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))+ coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ }+ return coverages;+ }+}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.javaindex d90ec42980..7b643417ef 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@@ -6,8 +6,10 @@ import java.util.Collection;import java.util.Comparator;import java.util.Date;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.concurrent.atomic.AtomicReference;import org.apache.commons.lang3.StringUtils;@@ -43,12 +45,17 @@ import com.google.common.collect.Lists;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.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.infomanager.CommitInfoManager;+import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;@@ -92,9 +99,10 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.simple.security.LoginPage;import io.onedev.server.web.util.ProjectAttachmentSupport;+import io.onedev.server.web.util.RevisionDiff;@SuppressWarnings("serial")-public class NewPullRequestPage extends ProjectPage implements RevisionDiffPanel.AnnotationSupport {+public class NewPullRequestPage extends ProjectPage implements RevisionDiff.AnnotationSupport {private static final String TABS_ID = "tabs";@@ -517,10 +525,14 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiffPanel* later. Also it is guaranteed to be resolved to the same commit has as we've cached* it above when loading the project*/- RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, projectModel,- new Model<PullRequest>(null), request.getBaseCommitHash(),+ RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, request.getBaseCommitHash(),source.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {+ @Override+ protected Project getProject() {+ return projectModel.getObject();+ }+@Overrideprotected void onConfigure() {super.onConfigure();@@ -874,25 +886,71 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiffPanel}@Override- public Map<CodeComment, PlanarRange> getOldComments() {+ public Map<CodeComment, PlanarRange> getOldComments(String blobPath) {Map<CodeComment, PlanarRange> oldComments = new HashMap<>();for (CodeComment comment: commentsModel.getObject()) {- if (comment.getMark().getCommitHash().equals(getPullRequest().getBaseCommitHash()))+ if (comment.getMark().getCommitHash().equals(getPullRequest().getBaseCommitHash())+ && comment.getMark().getPath().equals(blobPath)) {oldComments.put(comment, comment.getMark().getRange());+ }}return oldComments;}@Override- public Map<CodeComment, PlanarRange> getNewComments() {+ public Map<CodeComment, PlanarRange> getNewComments(String blobPath) {Map<CodeComment, PlanarRange> newComments = new HashMap<>();for (CodeComment comment: commentsModel.getObject()) {- if (comment.getMark().getCommitHash().equals(source.getObjectName()))+ if (comment.getMark().getCommitHash().equals(source.getObjectName())+ && comment.getMark().getPath().equals(blobPath)) {newComments.put(comment, comment.getMark().getRange());+ }}return newComments;}+ @Override+ public Collection<CodeProblem> getOldProblems(String blobPath) {+ Set<CodeProblem> problems = new HashSet<>();+ ObjectId baseCommitId = ObjectId.fromString(getPullRequest().getBaseCommitHash());+ for (Build build: getBuilds(baseCommitId)) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ problems.addAll(contribution.getCodeProblems(build, blobPath, null));+ }+ return problems;+ }++ @Override+ public Collection<CodeProblem> getNewProblems(String blobPath) {+ Set<CodeProblem> problems = new HashSet<>();+ for (Build build: getBuilds(source.getObjectId())) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ problems.addAll(contribution.getCodeProblems(build, blobPath, null));+ }+ return problems;+ }++ @Override+ public Collection<LineCoverage> getOldCoverages(String blobPath) {+ Collection<LineCoverage> coverages = new ArrayList<>();+ ObjectId baseCommitId = ObjectId.fromString(getPullRequest().getBaseCommitHash());+ for (Build build: getBuilds(baseCommitId)) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))+ coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ }+ return coverages;+ }++ @Override+ public Collection<LineCoverage> getNewCoverages(String blobPath) {+ Collection<LineCoverage> coverages = new ArrayList<>();+ for (Build build: getBuilds(source.getObjectId())) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class))+ coverages.addAll(contribution.getLineCoverages(build, blobPath, null));+ }+ return coverages;+ }+@Overridepublic void onAddComment(AjaxRequestTarget target, Mark mark) {this.commentId = null;@@ -908,6 +966,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiffPanel@Overridepublic void onCommentClosed(AjaxRequestTarget target) {commentId = null;+ mark = null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex c54b6ff1bb..d1680af506 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -106,7 +106,6 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;-import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.CommentableOperationConfirmPanel;import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.MergeConfirmPanel;import io.onedev.server.web.util.ConfirmClickModifier;@@ -607,8 +606,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});tabs.add(new PullRequestTab("File Changes", PullRequestChangesPage.class));tabs.add(new PullRequestTab("Code Comments", PullRequestCodeCommentsPage.class));- if (getPullRequest().isOpen())- tabs.add(new PullRequestTab("Merge Preview", MergePreviewPage.class));add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));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.javaindex 755d14c742..213c278112 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@@ -7,8 +7,10 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Date;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import javax.annotation.Nullable;@@ -44,12 +46,18 @@ import com.google.common.collect.Sets;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.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestComment;@@ -57,6 +65,7 @@ import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;+import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;@@ -71,10 +80,11 @@ import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.util.EditParamsAware;+import io.onedev.server.web.util.RevisionDiff;import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")-public class PullRequestChangesPage extends PullRequestDetailPage implements RevisionDiffPanel.AnnotationSupport, EditParamsAware {+public class PullRequestChangesPage extends PullRequestDetailPage implements RevisionDiff.AnnotationSupport, EditParamsAware {public static final String PARAM_OLD_COMMIT = "old-commit";@@ -222,24 +232,23 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Nullableprivate PlanarRange mapRange(CodeComment comment, ObjectId commitId) {- Map<Integer, Integer> lineMapping = getLineMapping(- comment.getMark().getPath(),+ Map<Integer, Integer> lineMapping = getLineMapping(ObjectId.fromString(comment.getMark().getCommitHash()),- commitId);+ commitId, comment.getMark().getPath());return DiffUtils.mapRange(lineMapping, comment.getMark().getRange());}- private Map<Integer, Integer> getLineMapping(String path, ObjectId oldCommitId, ObjectId newCommitId) {+ private Map<Integer, Integer> getLineMapping(ObjectId oldCommitId, ObjectId newCommitId, String blobPath) {if (lineMappingCache == null)lineMappingCache = new HashMap<>();ImmutableTriple<ObjectId, ObjectId, String> key =- new ImmutableTriple<>(oldCommitId, newCommitId, path);+ new ImmutableTriple<>(oldCommitId, newCommitId, blobPath);Map<Integer, Integer> lineMapping = lineMappingCache.get(key);if (lineMapping == null) {- BlobIdent newBlobIdent = new BlobIdent(newCommitId.name(), path, FileMode.REGULAR_FILE.getBits());+ BlobIdent newBlobIdent = new BlobIdent(newCommitId.name(), blobPath, FileMode.REGULAR_FILE.getBits());List<String> newLines = getProject().readLines(newBlobIdent, WhitespaceOption.DEFAULT, false);if (newLines != null) {- BlobIdent oldBlobIdent = new BlobIdent(oldCommitId.name(), path, FileMode.REGULAR_FILE.getBits());+ BlobIdent oldBlobIdent = new BlobIdent(oldCommitId.name(), blobPath, FileMode.REGULAR_FILE.getBits());List<String> oldLines = getProject().readLines(oldBlobIdent, WhitespaceOption.DEFAULT, true);if (oldLines != null)lineMapping = DiffUtils.mapLines(oldLines, newLines);@@ -700,9 +709,20 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev};- Component revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,- requestModel, getComparisonBase().name(), state.newCommitHash,- pathFilterModel, whitespaceOptionModel, blameModel, this);+ Component revisionDiff = new RevisionDiffPanel("revisionDiff", getComparisonBase().name(),+ state.newCommitHash, pathFilterModel, whitespaceOptionModel, blameModel, this) {++ @Override+ protected Project getProject() {+ return projectModel.getObject();+ }++ @Override+ protected PullRequest getPullRequest() {+ return requestModel.getObject();+ }++ };revisionDiff.setOutputMarkupId(true);if (target != null) {replace(revisionDiff);@@ -858,13 +878,129 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev}@Override- public Map<CodeComment, PlanarRange> getOldComments() {- return oldCommentsModel.getObject();+ public Map<CodeComment, PlanarRange> getOldComments(String blobPath) {+ Map<CodeComment, PlanarRange> oldComments = new HashMap<>();+ for (Map.Entry<CodeComment, PlanarRange> entry: oldCommentsModel.getObject().entrySet()) {+ if (entry.getKey().getMark().getPath().equals(blobPath))+ oldComments.put(entry.getKey(), entry.getValue());+ }+ return oldComments;+ }++ @Override+ public Map<CodeComment, PlanarRange> getNewComments(String blobPath) {+ Map<CodeComment, PlanarRange> newComments = new HashMap<>();+ for (Map.Entry<CodeComment, PlanarRange> entry: newCommentsModel.getObject().entrySet()) {+ if (entry.getKey().getMark().getPath().equals(blobPath))+ newComments.put(entry.getKey(), entry.getValue());+ }+ return newComments;+ }++ @Override+ public Collection<CodeProblem> getOldProblems(String blobPath) {+ Set<CodeProblem> problems = new HashSet<>();+ ObjectId buildCommitId = ObjectId.fromString(state.oldCommitHash);+ for (Build build: getBuilds(buildCommitId)) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {+ for (CodeProblem problem: contribution.getCodeProblems(build, blobPath, null)) {+ if (!buildCommitId.equals(getComparisonBase())) {+ Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId, getComparisonBase(), blobPath);+ PlanarRange range = DiffUtils.mapRange(lineMapping, problem.getRange());+ if (range != null)+ problems.add(new CodeProblem(range, problem.getContent(), problem.getSeverity()));+ } else {+ problems.add(problem);+ }+ }+ }+ }+ return problems;+ }++ @Override+ public Collection<CodeProblem> getNewProblems(String blobPath) {+ ObjectId buildCommitId;+ MergePreview preview = getPullRequest().getMergePreview();+ if (preview != null && preview.getMergeCommitHash() != null+ && state.newCommitHash.equals(preview.getHeadCommitHash())) {+ buildCommitId = ObjectId.fromString(preview.getMergeCommitHash());+ } else {+ buildCommitId = ObjectId.fromString(state.newCommitHash);+ }++ Set<CodeProblem> problems = new HashSet<>();+ for (Build build: getBuilds(buildCommitId)) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {+ for (CodeProblem problem: contribution.getCodeProblems(build, blobPath, null)) {+ if (!state.newCommitHash.equals(buildCommitId.name())) {+ Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId,+ ObjectId.fromString(state.newCommitHash), blobPath);+ PlanarRange range = DiffUtils.mapRange(lineMapping, problem.getRange());+ if (range != null)+ problems.add(new CodeProblem(range, problem.getContent(), problem.getSeverity()));+ } else {+ problems.add(problem);+ }+ }+ }+ }+ return problems;+ }++ @Override+ public Collection<LineCoverage> getOldCoverages(String blobPath) {+ List<LineCoverage> coverages = new ArrayList<>();+ ObjectId buildCommitId = ObjectId.fromString(state.oldCommitHash);+ for (Build build: getBuilds(buildCommitId)) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ for (LineCoverage coverage: contribution.getLineCoverages(build, blobPath, null)) {+ if (!buildCommitId.equals(getComparisonBase())) {+ Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId, getComparisonBase(), blobPath);+ for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {+ Integer mappedLine = lineMapping.get(line);+ if (mappedLine != null)+ coverages.add(new LineCoverage(mappedLine, mappedLine, coverage.getTestCount()));+ }+ } else {+ coverages.add(coverage);+ }+ }+ }+ }+ return coverages;}@Override- public Map<CodeComment, PlanarRange> getNewComments() {- return newCommentsModel.getObject();+ public Collection<LineCoverage> getNewCoverages(String blobPath) {+ ObjectId commitId;+ MergePreview preview = getPullRequest().getMergePreview();+ if (preview != null && preview.getMergeCommitHash() != null+ && state.newCommitHash.equals(preview.getHeadCommitHash())) {+ commitId = ObjectId.fromString(preview.getMergeCommitHash());+ } else {+ commitId = ObjectId.fromString(state.newCommitHash);+ }++ List<LineCoverage> coverages = new ArrayList<>();+ for (Build build: getBuilds(commitId)) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ for (LineCoverage coverage: contribution.getLineCoverages(build, blobPath, null)) {+ if (!state.newCommitHash.equals(commitId.name())) {+ Map<Integer, Integer> lineMapping = getLineMapping(commitId,+ ObjectId.fromString(state.newCommitHash), blobPath);+ for (int line = coverage.getFromLine(); line<=coverage.getToLine(); line++) {+ Integer mappedLine = lineMapping.get(line);+ if (mappedLine != null)+ coverages.add(new LineCoverage(mappedLine, mappedLine, coverage.getTestCount()));+ }+ } else {+ coverages.add(coverage);+ }+ }+ }+ }+ return coverages;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.htmldeleted file mode 100644index a7cdabcc68..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html+++ /dev/null@@ -1,17 +0,0 @@-<wicket:extend>- <div wicket:id="content" class="merge-preview"></div>- <wicket:fragment wicket:id="availableFrag">- <div class="available">- <div class="alert alert-notice alert-light mb-4">- Comparing <a wicket:id="targetHead" class="link-primary">target branch</a> and <a wicket:id="mergedCommit" class="link-primary mr-1">merge preview commit</a> <span wicket:id="buildStatus" class="build-status"></span>- </div>- <div wicket:id="outDated" class="out-dated alert alert-notice alert-light-warning mb-4">- Merge preview is outdated. <a wicket:id="link" class="link-primary">Click to refresh</a>- </div>- <div wicket:id="revisionDiff" class="body"></div>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="notAvailableFrag">- <div class="not-available alert alert-notice alert-light-warning">Merge preview not available</div>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.javadeleted file mode 100644index 3e21a9f34a..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java+++ /dev/null@@ -1,279 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.detail.mergepreview;--import java.io.Serializable;-import java.util.Collection;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.ObjectId;--import com.google.common.collect.Sets;--import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.util.diff.WhitespaceOption;-import io.onedev.server.web.behavior.WebSocketObserver;-import io.onedev.server.web.component.commit.status.CommitStatusPanel;-import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;-import io.onedev.server.web.util.EditParamsAware;--@SuppressWarnings("serial")-public class MergePreviewPage extends PullRequestDetailPage implements EditParamsAware {-- private static final String PARAM_WHITESPACE_OPTION = "whitespace-option";-- private static final String PARAM_PATH_FILTER = "path-filter";-- private static final String PARAM_BLAME_FILE = "blame-file";-- private State state = new State();-- public MergePreviewPage(PageParameters params) {- super(params);-- state.pathFilter = params.get(PARAM_PATH_FILTER).toString();- state.whitespaceOption = WhitespaceOption.ofName(- params.get(PARAM_WHITESPACE_OPTION).toString(WhitespaceOption.DEFAULT.name()));- state.blameFile = params.get(PARAM_BLAME_FILE).toString();- }-- @Override- protected String getRobotsMeta() {- return "noindex,nofollow";- }-- @Override- protected void onInitialize() {- super.onInitialize();-- newContent(null);- }-- public static PageParameters paramsOf(PullRequest request, State state) {- PageParameters params = PullRequestDetailPage.paramsOf(request);-- if (state.whitespaceOption != WhitespaceOption.DEFAULT)- params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());- if (state.pathFilter != null)- params.set(PARAM_PATH_FILTER, state.pathFilter);- if (state.blameFile != null)- params.set(PARAM_BLAME_FILE, state.blameFile);-- return params;- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- super.onPopState(target, data);-- state = (State) data;-- newContent(target);- }-- private void newContent(IPartialPageRequestHandler handler) {- Fragment fragment;- MergePreview preview = getPullRequest().getMergePreview();- if (getPullRequest().isOpen() && preview != null && preview.getMergeCommitHash() != null) {- fragment = new Fragment("content", "availableFrag", this);-- CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = preview.getTargetHeadCommitHash();- PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);- fragment.add(new ViewStateAwarePageLink<Void>("targetHead", CommitDetailPage.class, params));-- commitState = new CommitDetailPage.State();- commitState.revision = preview.getMergeCommitHash();- params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);- fragment.add(new ViewStateAwarePageLink<Void>("mergedCommit", CommitDetailPage.class, params));-- fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMergeCommitHash()), null) {-- @Override- protected Project getProject() {- return MergePreviewPage.this.getProject();- }-- @Override- protected PullRequest getPullRequest() {- return MergePreviewPage.this.getPullRequest();- }-- });- fragment.add(new WebMarkupContainer("outDated") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- newContent(target);- }-- });-- add(new WebSocketObserver() {-- @Override- public Collection<String> getObservables() {- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));- }-- @Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- handler.add(component);- }-- });- }-- @Override- protected void onConfigure() {- super.onConfigure();- MergePreview latestPreview = getPullRequest().getMergePreview();- setVisible(!getPullRequest().isOpen()- || latestPreview == null- || latestPreview.getMergeCommitHash() == null- || !latestPreview.getTargetHeadCommitHash().equals(preview.getTargetHeadCommitHash())- || !latestPreview.getMergeCommitHash().equals(preview.getMergeCommitHash()));- }-- }.setOutputMarkupPlaceholderTag(true));-- IModel<String> blameModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return state.blameFile;- }-- @Override- public void setObject(String object) {- state.blameFile = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));- }-- };- IModel<String> pathFilterModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return state.pathFilter;- }-- @Override- public void setObject(String object) {- state.pathFilter = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));- }-- };- IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {-- @Override- public void detach() {- }-- @Override- public WhitespaceOption getObject() {- return state.whitespaceOption;- }-- @Override- public void setObject(WhitespaceOption object) {- state.whitespaceOption = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));- }-- };-- Component revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,- requestModel, preview.getTargetHeadCommitHash(), preview.getMergeCommitHash(), pathFilterModel,- whitespaceOptionModel, blameModel, null);- revisionDiff.setOutputMarkupId(true);- fragment.add(revisionDiff);- } else {- fragment = new Fragment("content", "notAvailableFrag", this);- fragment.add(new WebSocketObserver() {-- @Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- newContent(handler);- }-- @Override- public Collection<String> getObservables() {- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));- }-- });- }- fragment.setOutputMarkupId(true);-- if (handler != null) {- replace(fragment);- handler.add(fragment);- } else {- add(fragment);- }- }-- public State getState() {- return state;- }-- private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {- PageParameters params = paramsOf(getPullRequest(), state);- CharSequence url = RequestCycle.get().urlFor(MergePreviewPage.class, params);- pushState(partialPageRequestHandler, url.toString(), state);- }-- @Override- public PageParameters getParamsBeforeEdit() {- return paramsOf(getPullRequest(), state);- }-- @Override- public PageParameters getParamsAfterEdit() {- return paramsOf(getPullRequest(), state);- }-- public static class State implements Serializable {-- private static final long serialVersionUID = 1L;-- public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;-- @Nullable- public String pathFilter;-- @Nullable- public String blameFile;-- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/util/CodeCommentInfo.java b/server-core/src/main/java/io/onedev/server/web/util/CodeCommentInfo.javaindex 6945db3a5c..bf9d2edb8f 100644--- a/server-core/src/main/java/io/onedev/server/web/util/CodeCommentInfo.java+++ b/server-core/src/main/java/io/onedev/server/web/util/CodeCommentInfo.java@@ -6,8 +6,6 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.annotation.Nullable;-import io.onedev.commons.utils.PlanarRange;import io.onedev.server.model.CodeComment;@@ -21,7 +19,7 @@ public class CodeCommentInfo implements Serializable {private final boolean updated;- public CodeCommentInfo(CodeComment comment, @Nullable PlanarRange range) {+ public CodeCommentInfo(CodeComment comment, PlanarRange range) {id = comment.getId();updated = !comment.isVisitedAfter(comment.getLastUpdate().getDate());this.range = range;@@ -31,7 +29,6 @@ public class CodeCommentInfo implements Serializable {return id;}- @Nullablepublic PlanarRange getRange() {return range;}diff --git a/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java b/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.javanew file mode 100644index 0000000000..f4a456ae91--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java@@ -0,0 +1,91 @@+package io.onedev.server.web.util;++import java.io.Serializable;+import java.util.Collection;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.code.CodeProblem;+import io.onedev.server.code.LineCoverage;+import io.onedev.server.git.BlobChange;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.support.Mark;++public class RevisionDiff {++ private final List<BlobChange> displayChanges;++ private final int totalChangeCount;++ public RevisionDiff(List<BlobChange> displayChanges, int totalChangeCount) {+ this.displayChanges = displayChanges;+ this.totalChangeCount = totalChangeCount;+ }++ /**+ * Get list of changes we are capable to handle, note that size of this list+ * might be less than total number of changes in order not to put heavy+ * burden on the system and browser+ *+ * @return+ * list of changes we are capable to handle+ */+ public List<BlobChange> getDisplayChanges() {+ return displayChanges;+ }++ /**+ * Get total number of changes detected+ *+ * @return+ * total number of changes detected+ */+ public int getTotalChangeCount() {+ return totalChangeCount;+ }++ 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();++ Map<CodeComment, PlanarRange> getOldComments(String blobPath);++ Map<CodeComment, PlanarRange> getNewComments(String blobPath);++ Collection<CodeProblem> getOldProblems(String blobPath);++ Collection<CodeProblem> getNewProblems(String blobPath);++ Collection<LineCoverage> getOldCoverages(String blobPath);++ Collection<LineCoverage> getNewCoverages(String blobPath);++ void onCommentOpened(AjaxRequestTarget target, CodeComment comment);++ void onCommentClosed(AjaxRequestTarget target);++ void onAddComment(AjaxRequestTarget target, Mark mark);++ void onSaveComment(CodeComment comment);++ void onSaveCommentReply(CodeCommentReply reply);++ }+}\ No newline at end of filediff --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.javaindex 9c0b137b5f..54d4b3eeb3 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@@ -93,14 +93,9 @@ public class HtmlReportModule extends AbstractPluginModule {@Overridepublic List<CodeProblem> getCodeProblems(Build build, String blobPath, String reportName) {- String longMessage = "This is a very long message and we have a very \n"- + "good practice oover This <b>is a very</b> long message and \n"- + "we have a very good practice oover This is a very long message and we have a very good practice oover";return Lists.newArrayList(- new CodeProblem(new PlanarRange(0, 1, 1, 5), longMessage, Severity.ERROR),- new CodeProblem(new PlanarRange(10, 6, 12, 10), reportName, Severity.WARNING),- new CodeProblem(new PlanarRange(14, 1, 14, 5), "This is an error message", Severity.ERROR),- new CodeProblem(new PlanarRange(19, 6, 19, 10), longMessage + "\n" + longMessage, Severity.WARNING)+ new CodeProblem(new PlanarRange(21, 1, 21, 5), "message1", Severity.ERROR),+ new CodeProblem(new PlanarRange(227, 1, 230, 10), "message4", Severity.WARNING));}@@ -110,10 +105,7 @@ public class HtmlReportModule extends AbstractPluginModule {@Overridepublic List<LineCoverage> getLineCoverages(Build build, String blobPath, String reportName) {- if (reportName == null)- return Lists.newArrayList(new LineCoverage(5, 8, 1), new LineCoverage(12, 15, 0));- else- return Lists.newArrayList(new LineCoverage(5, 8, 1));+ return Lists.newArrayList(new LineCoverage(21, 21, 1), new LineCoverage(226, 229, 0));}});