The Unified and Autonomous Development Platform
fix: incorrect pull request referrence in issue comment (#1445)
Robin Shenfb776e883df0
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 83b83f7247..be9a7bc320 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@@ -21,28 +21,66 @@ public class ReferenceParser {private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("code", "a");+ private final boolean issue;+private final Pattern pattern;+ private final Pattern buildPattern;++ private final Pattern pullRequestPattern;+public ReferenceParser(Class<? extends AbstractEntity> referenceClass) {- 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);+ issue = referenceClass == Issue.class;+ var suffix = ")?#(\\d+)(?=$|[\\W|/]+)";++ var builder = new StringBuilder("(^|\\W+)((build)\\s+)(");+ builder.append(ProjectPathValidator.PATTERN.pattern());+ builder.append(suffix);+ buildPattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);++ builder = new StringBuilder("(^|\\W+)((pull\\s*request|pr)\\s+)(");builder.append(ProjectPathValidator.PATTERN.pattern());- builder.append(")?#(\\d+)(?=$|[\\W|/]+)");- pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);+ builder.append(suffix);+ pullRequestPattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);++ if (referenceClass == Build.class) {+ pattern = buildPattern;+ } else if (referenceClass == PullRequest.class) {+ pattern = pullRequestPattern;+ } else if (referenceClass == Issue.class) {+ builder = new StringBuilder("(^|\\W+)((issue)\\s+)?(");+ builder.append(ProjectPathValidator.PATTERN.pattern());+ builder.append(suffix);+ pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);+ } else {+ throw new RuntimeException("Unexpected reference class: " + referenceClass);+ }+ }++ private String stripBuildAndPullRequestReferences(String text) {+ var buffer = new StringBuffer();+ var matcher = buildPattern.matcher(text);+ while (matcher.find())+ matcher.appendReplacement(buffer, "");+ matcher.appendTail(buffer);+ text = buffer.toString();++ buffer = new StringBuffer();+ matcher = pullRequestPattern.matcher(text);+ while (matcher.find())+ matcher.appendReplacement(buffer, "");+ matcher.appendTail(buffer);+ text = buffer.toString();++ return text;}-public List<ProjectScopedNumber> parseReferences(String text, @Nullable Project project) {Collection<ProjectScopedNumber> references = new LinkedHashSet<>();var projectManager = OneDev.getInstance(ProjectManager.class);if (fastScan(text)) {+ if (issue)+ text = stripBuildAndPullRequestReferences(text);Matcher matcher = pattern.matcher(text);while (matcher.find()) {try {@@ -90,7 +128,10 @@ public class ReferenceParser {var projectManager = OneDev.getInstance(ProjectManager.class);for (TextNode node : visitor.getMatchedNodes()) {- Matcher matcher = pattern.matcher(node.getWholeText());+ var text = node.getWholeText();+ if (issue)+ text = stripBuildAndPullRequestReferences(text);+ Matcher matcher = pattern.matcher(text);while (matcher.find()) {String referenceText = matcher.group(2);if (referenceText == null)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.javaindex 8587e5859d..b1ec59733d 100644--- a/server-core/src/test/java/io/onedev/server/entityreference/ReferenceParserTest.java+++ b/server-core/src/test/java/io/onedev/server/entityreference/ReferenceParserTest.java@@ -14,6 +14,7 @@ import org.junit.Test;import org.mockito.Mockito;import static org.junit.Assert.assertEquals;+import static org.junit.Assert.assertTrue;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.when;@@ -36,7 +37,18 @@ public class ReferenceParserTest extends AppLoaderMocker {var parser = new ReferenceParser(Issue.class);- var issueNumbers = parser.parseReferences("#1", project1);+ assertTrue(parser.parseReferences("pull request #1", project1).isEmpty());+ assertTrue(parser.parseReferences("pr #1", project1).isEmpty());+ assertTrue(parser.parseReferences("build #1", project1).isEmpty());+ assertTrue(parser.parseReferences("pull request test/project1#1", project1).isEmpty());+ assertTrue(parser.parseReferences("pr test/project1#1", project1).isEmpty());+ assertTrue(parser.parseReferences("build test/project1#1", project1).isEmpty());++ var issueNumbers = parser.parseReferences("pull request #1 #2", project1);+ assertEquals(1, issueNumbers.size());+ assertEquals(2L, issueNumbers.get(0).getNumber().longValue());++ issueNumbers = parser.parseReferences("#1", project1);assertEquals(1L, issueNumbers.get(0).getNumber().longValue());issueNumbers = parser.parseReferences("#1 and issue #2", project1);