The Unified and Autonomous Development Platform
fix: URLs with more than 1 colon gets split before colon (#1398)
Robin Shen41d53c86362c
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.javaindex 8869835d29..234773dadc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java@@ -55,14 +55,14 @@ public class EmojiDelimiterProcessor implements DelimiterProcessor {public boolean canBeOpener(String before, String after, boolean leftFlanking, boolean rightFlanking,boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace,boolean afterIsWhiteSpace) {- return leftFlanking;+ return leftFlanking && (beforeIsPunctuation || beforeIsWhitespace);}@Overridepublic boolean canBeCloser(String before, String after, boolean leftFlanking, boolean rightFlanking,boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace,boolean afterIsWhiteSpace) {- return rightFlanking;+ return rightFlanking && (afterIsPunctuation || afterIsWhiteSpace);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiExtension.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiExtension.javaindex 6753235f35..e4b745a9eb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiExtension.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiExtension.java@@ -8,12 +8,10 @@ public class EmojiExtension implements Parser.ParserExtension, HtmlRenderer.Html@Overridepublic void rendererOptions(final MutableDataHolder options) {-}@Overridepublic void parserOptions(final MutableDataHolder options) {-}@Override