The Unified and Autonomous Development Platform
Fix issue #1365 - Able to reference issue without 'issue' prefix for brevity
Robin Shenc8e45ab48bb7
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.javaindex dd0ae0dfd4..4745b665c6 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java@@ -1,28 +1,21 @@package io.onedev.server.entityreference;-import java.util.Collection;-import java.util.HashSet;-import java.util.regex.Matcher;-import java.util.regex.Pattern;--import javax.annotation.Nullable;--import org.jsoup.nodes.Document;-import org.jsoup.nodes.TextNode;-import org.jsoup.select.NodeTraversor;-import com.google.common.collect.ImmutableSet;--import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.Project;+import io.onedev.server.model.*;import io.onedev.server.util.HtmlUtils;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.TextNodeVisitor;import io.onedev.server.validation.validator.ProjectPathValidator;+import org.jsoup.nodes.Document;+import org.jsoup.nodes.TextNode;+import org.jsoup.select.NodeTraversor;++import javax.annotation.Nullable;+import java.util.*;+import java.util.regex.Matcher;+import java.util.regex.Pattern;public class ReferenceParser {@@ -30,32 +23,34 @@ public class ReferenceParser {private final Pattern pattern;- private final String referenceType;-public ReferenceParser(Class<? extends AbstractEntity> referenceClass) {- referenceType = referenceClass.getSimpleName();- String[] words = StringUtils.split(WordUtils.uncamel(referenceType).toLowerCase(), " ");- StringBuilder builder = new StringBuilder("(^|\\W+)(");- for (int i=0; i<words.length-1; i++)- builder.append(words[i]).append("\\s*");- builder.append(words[words.length-1]).append("\\s+)(");+ StringBuilder builder = new StringBuilder();+ if (referenceClass == Build.class)+ builder.append("(^|\\W+)((build)\\s+)(");+ else if (referenceClass == PullRequest.class)+ builder.append("(^|\\W+)((pull\\s*request|pr)\\s+)(");+ else if (referenceClass == Issue.class)+ builder.append("(^|\\W+)((issue)\\s+)?(");+ else+ throw new RuntimeException("Unexpected reference class: " + referenceClass);+builder.append(ProjectPathValidator.PATTERN.pattern());builder.append(")?#(\\d+)(?=$|[\\W|/]+)");pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);}- public Collection<ProjectScopedNumber> parseReferences(String text, @Nullable Project project) {- Collection<ProjectScopedNumber> references = new HashSet<>();- if (StringUtils.deleteWhitespace(text.toLowerCase()).contains(referenceType.toLowerCase())- && text.contains("#")) { // fast scan here, do pattern match later+ public List<ProjectScopedNumber> parseReferences(String text, @Nullable Project project) {+ Collection<ProjectScopedNumber> references = new LinkedHashSet<>();+ var projectManager = OneDev.getInstance(ProjectManager.class);+ if (fastScan(text)) {Matcher matcher = pattern.matcher(text);while (matcher.find()) {- String referenceProjectName = matcher.group(3);- Long referenceNumber = Long.valueOf(matcher.group(5));+ String referenceProjectName = matcher.group(4);+ Long referenceNumber = Long.valueOf(matcher.group(6));Project referenceProject;if (referenceProjectName != null) {- referenceProject = OneDev.getInstance(ProjectManager.class).findByPath(referenceProjectName);+ referenceProject = projectManager.findByPath(referenceProjectName);} else {referenceProject = project;}@@ -64,11 +59,20 @@ public class ReferenceParser {references.add(new ProjectScopedNumber(referenceProject, referenceNumber));}}- return references;+ return new ArrayList<>(references);+ }++ private boolean fastScan(String text) {+ var chars = text.toCharArray();+ for (var i=0; i<chars.length; i++) {+ if (chars[i] == '#' && i<chars.length-1 && Character.isDigit(chars[i+1]))+ return true;+ }+ return false;}- public Collection<ProjectScopedNumber> parseReferences(Document document, @Nullable Project project) {- Collection<ProjectScopedNumber> references = new HashSet<>();+ public List<ProjectScopedNumber> parseReferences(Document document, @Nullable Project project) {+ Collection<ProjectScopedNumber> references = new LinkedHashSet<>();TextNodeVisitor visitor = new TextNodeVisitor() {@@ -77,23 +81,25 @@ public class ReferenceParser {if (HtmlUtils.hasAncestor(node, IGNORED_TAGS))return false;- String text = StringUtils.deleteWhitespace(node.getWholeText()).toLowerCase();- return text.contains(referenceType.toLowerCase()) && text.contains("#"); // fast scan here, do pattern match later+ return fastScan(node.getWholeText());}};NodeTraversor.traverse(visitor, document);+ var projectManager = OneDev.getInstance(ProjectManager.class);for (TextNode node : visitor.getMatchedNodes()) {Matcher matcher = pattern.matcher(node.getWholeText());while (matcher.find()) {String referenceText = matcher.group(2);- String referenceProjectName = matcher.group(3);- Long referenceNumber = Long.valueOf(matcher.group(5));+ if (referenceText == null)+ referenceText = "";+ String referenceProjectName = matcher.group(4);+ Long referenceNumber = Long.valueOf(matcher.group(6));Project referenceProject;if (referenceProjectName != null) {- referenceProject = OneDev.getInstance(ProjectManager.class).findByPath(referenceProjectName);+ referenceProject = projectManager.findByPath(referenceProjectName);referenceText += referenceProjectName;} else {referenceProject = project;@@ -113,7 +119,7 @@ public class ReferenceParser {HtmlUtils.appendTail(matcher, node);}- return references;+ return new ArrayList<>(references);}protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {diff --git a/server-core/src/main/java/io/onedev/server/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/BuildProcessor.javadeleted file mode 100644index 7f9f5bab87..0000000000--- a/server-core/src/main/java/io/onedev/server/markdown/BuildProcessor.java+++ /dev/null@@ -1,48 +0,0 @@-package io.onedev.server.markdown;--import javax.annotation.Nullable;--import org.apache.wicket.request.cycle.RequestCycle;-import org.jsoup.nodes.Document;-import org.unbescape.html.HtmlEscape;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entityreference.ReferenceParser;-import io.onedev.server.model.Build;-import io.onedev.server.model.Project;-import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.web.component.markdown.SuggestionSupport;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;--public class BuildProcessor extends ReferenceParser implements MarkdownProcessor {-- public BuildProcessor() {- super(Build.class);- }-- @Override- public void process(Document document, @Nullable Project project,- @Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport,- boolean forExternal) {- parseReferences(document, project);- }-- @Override- protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- if (RequestCycle.get() != null) {- CharSequence url = RequestCycle.get().urlFor(- BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable));- Build build = OneDev.getInstance(BuildManager.class).find(referenceable);- if (build != null && build.getVersion() != null)- referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";- return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",- url, referenceable.toString(), referenceText);- } else {- return super.toHtml(referenceable, referenceText);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/markdown/IssueProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/IssueProcessor.javadeleted file mode 100644index ae2c960b65..0000000000--- a/server-core/src/main/java/io/onedev/server/markdown/IssueProcessor.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.markdown;--import javax.annotation.Nullable;--import org.apache.wicket.request.cycle.RequestCycle;-import org.jsoup.nodes.Document;--import io.onedev.server.entityreference.ReferenceParser;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.web.component.markdown.SuggestionSupport;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;--public class IssueProcessor extends ReferenceParser implements MarkdownProcessor {-- public IssueProcessor() {- super(Issue.class);- }-- @Override- public void process(Document document, @Nullable Project project,- @Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport,- boolean forExternal) {- parseReferences(document, project);- }-- @Override- protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- if (RequestCycle.get() != null) {- CharSequence url = RequestCycle.get().urlFor(- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable));- return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",- url, referenceable.toString(), referenceText);- } else {- return super.toHtml(referenceable, referenceText);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/markdown/PullRequestProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/PullRequestProcessor.javadeleted file mode 100644index c1a09683d6..0000000000--- a/server-core/src/main/java/io/onedev/server/markdown/PullRequestProcessor.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.markdown;--import javax.annotation.Nullable;--import org.apache.wicket.request.cycle.RequestCycle;-import org.jsoup.nodes.Document;--import io.onedev.server.entityreference.ReferenceParser;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.web.component.markdown.SuggestionSupport;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;--public class PullRequestProcessor extends ReferenceParser implements MarkdownProcessor {-- public PullRequestProcessor() {- super(PullRequest.class);- }-- @Override- public void process(Document document, @Nullable Project project,- @Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport,- boolean forExternal) {- parseReferences(document, project);- }-- @Override- protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- if (RequestCycle.get() != null) {- CharSequence url = RequestCycle.get().urlFor(- PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable));- return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",- url, referenceable.toString(), referenceText);- } else {- return super.toHtml(referenceable, referenceText);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.javanew file mode 100644index 0000000000..4452686d08--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java@@ -0,0 +1,76 @@+package io.onedev.server.markdown;++import javax.annotation.Nullable;++import io.onedev.server.model.Issue;+import io.onedev.server.model.PullRequest;+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import org.apache.wicket.request.cycle.RequestCycle;+import org.jsoup.nodes.Document;+import org.unbescape.html.HtmlEscape;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entityreference.ReferenceParser;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.web.component.markdown.SuggestionSupport;+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;++public class ReferenceProcessor implements MarkdownProcessor {++ @Override+ public void process(Document document, @Nullable Project project,+ @Nullable BlobRenderContext blobRenderContext,+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {+ new ReferenceParser(Build.class) {+ @Override+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {+ if (RequestCycle.get() != null) {+ CharSequence url = RequestCycle.get().urlFor(+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable));+ Build build = OneDev.getInstance(BuildManager.class).find(referenceable);+ if (build != null && build.getVersion() != null)+ referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";+ return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);+ } else {+ return super.toHtml(referenceable, referenceText);+ }+ }+ }.parseReferences(document, project);++ new ReferenceParser(PullRequest.class) {+ @Override+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {+ if (RequestCycle.get() != null) {+ CharSequence url = RequestCycle.get().urlFor(+ PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable));+ return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);+ } else {+ return super.toHtml(referenceable, referenceText);+ }+ }+ }.parseReferences(document, project);++ new ReferenceParser(Issue.class) {+ @Override+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {+ if (RequestCycle.get() != null) {+ CharSequence url = RequestCycle.get().urlFor(+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable));+ return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);+ } else {+ return super.toHtml(referenceable, referenceText);+ }+ }+ }.parseReferences(document, project);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.javaindex b7ea87c55c..0f17a03f79 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java@@ -22,17 +22,11 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {private static final int REFERENCE_SUGGESTION_LIMIT = 5;- private static final Pattern REFERENCE_PATTERN = Pattern.compile("(^|[\\W|/]+)((pull\\s*request|issue|build)\\s+)?(" + ProjectPathValidator.PATTERN.pattern() + ")?#(\\S*)$",+ private static final Pattern REFERENCE_PATTERN = Pattern.compile("(^|[\\W|/]+)((pull\\s*request|pr|issue|build)\\s+)?(" + ProjectPathValidator.PATTERN.pattern() + ")?#(\\S*)$",Pattern.CASE_INSENSITIVE);private static final Pattern SPACE_PATTERN = Pattern.compile("\\s+");- private final boolean appendTitle;-- public ReferenceInputBehavior(boolean appendTitle) {- this.appendTitle = appendTitle;- }-@Overrideprotected List<InputCompletion> getSuggestions(InputStatus inputStatus) {List<InputCompletion> completions = new ArrayList<>();@@ -54,46 +48,25 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {elsereferenceType = "";switch (referenceType) {- case "issue":- suggestions = SuggestionUtils.suggestIssues(project, matchWith, REFERENCE_SUGGESTION_LIMIT*3);- break;- case "build":- suggestions = SuggestionUtils.suggestBuilds(project, matchWith, REFERENCE_SUGGESTION_LIMIT*3);- break;- case "pullrequest":- suggestions = SuggestionUtils.suggestPullRequests(project, matchWith, REFERENCE_SUGGESTION_LIMIT*3);- break;- default:- if (projectName == null) {- for (InputSuggestion suggestion: SuggestionUtils.suggestIssues(project, matchWith, REFERENCE_SUGGESTION_LIMIT)) {- suggestions.add(new InputSuggestion("issue " + suggestion.getContent(), -1,- suggestion.getDescription(), null));- }- for (InputSuggestion suggestion: SuggestionUtils.suggestPullRequests(project, matchWith, REFERENCE_SUGGESTION_LIMIT)) {- suggestions.add(new InputSuggestion("pull request " + suggestion.getContent(), -1,- suggestion.getDescription(), null));- }- for (InputSuggestion suggestion: SuggestionUtils.suggestBuilds(project, matchWith, REFERENCE_SUGGESTION_LIMIT)) {- suggestions.add(new InputSuggestion("build " + suggestion.getContent(), -1,- suggestion.getDescription(), null));- }- }+ case "":+ case "issue":+ suggestions = SuggestionUtils.suggestIssues(project, matchWith, REFERENCE_SUGGESTION_LIMIT * 3);+ break;+ case "build":+ suggestions = SuggestionUtils.suggestBuilds(project, matchWith, REFERENCE_SUGGESTION_LIMIT * 3);+ break;+ case "pullrequest":+ case "pr":+ suggestions = SuggestionUtils.suggestPullRequests(project, matchWith, REFERENCE_SUGGESTION_LIMIT * 3);+ break;}for (InputSuggestion suggestion: suggestions) {int hashIndex = matcher.start(6)-1;- InputCompletion completion;- if (appendTitle) {- String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent()- + " - " + suggestion.getDescription();- completion = new InputCompletion(suggestion.getContent(),- content + inputStatus.getContentAfterCaret(), content.length(),- suggestion.getDescription(), suggestion.getMatch());- } else {- String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent();- completion = new InputCompletion(suggestion.getContent(),- content + inputStatus.getContentAfterCaret(), content.length(),- suggestion.getDescription(), suggestion.getMatch());- }+ String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent()+ + " ";+ var completion = new InputCompletion(suggestion.getContent(),+ content + inputStatus.getContentAfterCaret(), content.length(),+ suggestion.getDescription(), suggestion.getMatch());completions.add(completion);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 153a76a4db..815bd00cb5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -112,7 +112,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement}}));- titleInput.add(new ReferenceInputBehavior(false) {+ titleInput.add(new ReferenceInputBehavior() {@Overrideprotected Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.javaindex cb158f035e..b527238e10 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java@@ -49,7 +49,7 @@ public abstract class IssueEditableTitlePanel extends Panel {}));TextField<String> titleInput = new TextField<String>("title", Model.of(getIssue().getTitle()));- titleInput.add(new ReferenceInputBehavior(false) {+ titleInput.add(new ReferenceInputBehavior() {@Overrideprotected Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex a132fd7b69..d603e0fc63 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -518,7 +518,7 @@ abstract class InsertUrlPanel extends Panel {});- ReferenceInputBehavior behavior = new ReferenceInputBehavior(true) {+ ReferenceInputBehavior behavior = new ReferenceInputBehavior() {@Overrideprotected Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.htmlindex bc899e8ee5..2c03f7927e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html@@ -59,8 +59,8 @@</div></div><wicket:fragment wicket:id="referenceMenuFrag">- <a class="dropdown-item do-reference" data-reference="issue"><wicket:svg href="bug" class="icon mr-1"></wicket:svg> Reference Issue</a>- <a class="dropdown-item do-reference" data-reference="pull request"><wicket:svg href="pull-request" class="icon mr-1"></wicket:svg> Reference Pull Request</a>+ <a class="dropdown-item do-reference" data-reference=""><wicket:svg href="bug" class="icon mr-1"></wicket:svg> Reference Issue</a>+ <a class="dropdown-item do-reference" data-reference="pr"><wicket:svg href="pull-request" class="icon mr-1"></wicket:svg> Reference Pull Request</a><a class="dropdown-item do-reference" data-reference="build"><wicket:svg href="play-circle" class="icon mr-1"></wicket:svg> Reference Build</a></wicket:fragment><wicket:fragment wicket:id="actionMenuFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 9791963cde..2b8b167533 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -424,7 +424,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {elsereferenceProject = null;if (referenceProject != null || StringUtils.isBlank(referenceProjectPath)) {- if ("issue".equals(referenceQueryType)) {+ if (referenceQueryType.length() == 0 || "issue".equals(referenceQueryType)) {for (Issue issue: getReferenceSupport().findIssues(referenceProject, referenceQuery, ATWHO_LIMIT)) {Map<String, String> referenceMap = new HashMap<>();referenceMap.put("referenceType", "issue");@@ -433,7 +433,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {referenceMap.put("searchKey", issue.getNumber() + " " + StringUtils.deleteWhitespace(issue.getTitle()));referenceList.add(referenceMap);}- } else if ("pullrequest".equals(referenceQueryType)) {+ } else if ("pr".equals(referenceQueryType) || "pullrequest".equals(referenceQueryType)) {for (PullRequest request: getReferenceSupport().findPullRequests(referenceProject, referenceQuery, ATWHO_LIMIT)) {Map<String, String> referenceMap = new HashMap<>();referenceMap.put("referenceType", "pull request");diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex b9a5e99f7a..60ddb0fea4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -435,7 +435,7 @@ onedev.server.markdown = {});}- var referencePattern = "(^|[\\W|/]+)((pull\\s*request|issue|build)\\s+)?(" + projectPathPattern + ")?#(\\S*)$";+ var referencePattern = "(^|[\\W|/]+)((pull\\s*request|pr|issue|build)\\s+)?(" + projectPathPattern + ")?#(\\S*)$";if (canReferenceEntity) {function matchReference() {@@ -454,7 +454,7 @@ onedev.server.markdown = {return undefined;}}-+$input.atwho({at: '#',startWithSpace: false,@@ -468,16 +468,10 @@ onedev.server.markdown = {}},displayTpl: function() {- if (matchReference().type)- return "<li><span>#${referenceNumber}</span> - ${referenceTitle}</li>";- else- return "<li><span>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";+ return "<li><span>#${referenceNumber}</span> - ${referenceTitle}</li>";},insertTpl: function() {- if (matchReference().type)- return "#${referenceNumber} ";- else- return "${referenceType} #${referenceNumber} ";+ return "#${referenceNumber} ";},limit: atWhoLimit});diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.javaindex dc8dd6d55c..64e9e9f554 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java@@ -52,7 +52,7 @@ public class ReferenceAwareEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(- new ReferenceInputBehavior(true) {+ new ReferenceInputBehavior() {@Overrideprotected Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.javaindex d419958f44..50b8e3ca26 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java@@ -101,7 +101,7 @@ public abstract class BlobUploadPanel extends Panel {form.add(new TextField<String>("directory", new PropertyModel<String>(this, "directory")));- ReferenceInputBehavior behavior = new ReferenceInputBehavior(true) {+ ReferenceInputBehavior behavior = new ReferenceInputBehavior() {@Overrideprotected Project getProject() {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 be1bd6bf16..186b85fbfb 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@@ -691,7 +691,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno}});- titleInput.add(new ReferenceInputBehavior(false) {+ titleInput.add(new ReferenceInputBehavior() {@Overrideprotected Project getProject() {diff --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 75e0777665..ab1970dd03 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@@ -253,7 +253,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRtitle = object;}- }).setRequired(true).add(new ReferenceInputBehavior(false) {+ }).setRequired(true).add(new ReferenceInputBehavior() {@Overrideprotected Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.javaindex 4cdea9d057..82da64a689 100644--- a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java+++ b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java@@ -41,36 +41,36 @@ public class ReferenceTransformer implements Function<String, String> {String escaped = "<pre>" + HtmlEscape.escapeHtml5(t) + "</pre>";Document doc = Jsoup.parseBodyFragment(escaped);- new ReferenceParser(Issue.class) {+ new ReferenceParser(PullRequest.class) {@Overrideprotected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(PullRequestActivitiesPage.class,+ PullRequestActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";}}.parseReferences(doc, project);- new ReferenceParser(PullRequest.class) {+ new ReferenceParser(Build.class) {@Overrideprotected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(PullRequestActivitiesPage.class,- PullRequestActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,+ BuildDashboardPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";}}.parseReferences(doc, project);- new ReferenceParser(Build.class) {+ new ReferenceParser(Issue.class) {@Overrideprotected String toHtml(ProjectScopedNumber referenceable, String referenceText) {- return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,- BuildDashboardPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,+ IssueActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";}}.parseReferences(doc, project);-+if (url != null) {StringBuilder builder = new StringBuilder();for (Node node: Jsoup.parseBodyFragment(doc.body().html()).body().child(0).childNodes()) {diff --git a/server-core/src/test/java/io/onedev/server/entityreference/ReferenceParserTest.java b/server-core/src/test/java/io/onedev/server/entityreference/ReferenceParserTest.javanew file mode 100644index 0000000000..8587e5859d--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/entityreference/ReferenceParserTest.java@@ -0,0 +1,88 @@+package io.onedev.server.entityreference;++import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.AppLoaderMocker;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.HtmlUtils;+import io.onedev.server.util.ProjectScopedNumber;+import org.jsoup.nodes.Document;+import org.junit.Test;+import org.mockito.Mockito;++import static org.junit.Assert.assertEquals;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;++public class ReferenceParserTest extends AppLoaderMocker {++ @Test+ public void parseReferences() {+ var projectManager = mock(ProjectManager.class);+ Mockito.when(AppLoader.getInstance(ProjectManager.class)).thenReturn(projectManager);+ var project1 = new Project();+ project1.setId(1L);+ project1.setPath("test/project1");+ when(projectManager.load(1L)).thenReturn(project1);+ when(projectManager.findByPath("test/project1")).thenReturn(project1);+ var project2 = new Project();+ project2.setId(2L);+ project2.setPath("test/project2");+ when(projectManager.load(2L)).thenReturn(project2);+ when(projectManager.findByPath("test/project2")).thenReturn(project2);++ var parser = new ReferenceParser(Issue.class);++ var issueNumbers = parser.parseReferences("#1", project1);+ assertEquals(1L, issueNumbers.get(0).getNumber().longValue());++ issueNumbers = parser.parseReferences("#1 and issue #2", project1);+ assertEquals(1L, issueNumbers.get(0).getNumber().longValue());+ assertEquals(2L, issueNumbers.get(1).getNumber().longValue());++ issueNumbers = parser.parseReferences("feat (docs): this is doc (#3)", project1);+ assertEquals(3L, issueNumbers.get(0).getNumber().longValue());++ issueNumbers = parser.parseReferences("test/project2#1 issue test/project2#2", project1);+ assertEquals("test/project2", issueNumbers.get(0).getProject().getPath());+ assertEquals(1L, issueNumbers.get(0).getNumber().longValue());+ assertEquals("test/project2", issueNumbers.get(1).getProject().getPath());+ assertEquals(2L, issueNumbers.get(1).getNumber().longValue());++ parser = new ReferenceParser(PullRequest.class);++ var pullRequestNumbers = parser.parseReferences("pull request #1 and pr #2", project1);+ assertEquals(1L, pullRequestNumbers.get(0).getNumber().longValue());+ assertEquals(2L, pullRequestNumbers.get(1).getNumber().longValue());++ parser = new ReferenceParser(Build.class);++ var buildNumbers = parser.parseReferences("build #1", project1);+ assertEquals(1L, buildNumbers.get(0).getNumber().longValue());++ var doc = HtmlUtils.parse("issue #1 and #2");+ parser = new ReferenceParser(Issue.class) {+ @Override+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {+ return "<a href='" + referenceable.getFQN() + "'>" + referenceText + "</a>";+ }+ };+ issueNumbers = parser.parseReferences(doc, project1);+ assertEquals(1L, issueNumbers.get(0).getNumber().longValue());+ assertEquals(2L, issueNumbers.get(1).getNumber().longValue());+ assertEquals("<a href=\"test/project1#1\">issue #1</a> and <a href=\"test/project1#2\">#2</a>", doc.body().html());+ }++ @Override+ protected void setup() {++ }++ @Override+ protected void teardown() {++ }+}\ No newline at end of file