fix: URLs with more than 1 colon gets split before colon (#1398)

mz0in · May 30, 2023 · 41d53c8 · 41d53c8
1 parent a75f2bd
commit 41d53c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.../src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java b/.../src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java
@@ -55,14 +55,14 @@ public void process(Delimiter opener, Delimiter closer, int delimitersUsed) {
 	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);
 	}
 
 	@Override
 	public boolean canBeCloser(String before, String after, boolean leftFlanking, boolean rightFlanking,
 			boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace,
 			boolean afterIsWhiteSpace) {
-        return rightFlanking;
+        return rightFlanking && (afterIsPunctuation || afterIsWhiteSpace);
 	}
 
 	@Override

diff --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.java
@@ -8,12 +8,10 @@ public class EmojiExtension implements Parser.ParserExtension, HtmlRenderer.Html
 
     @Override
     public void rendererOptions(final MutableDataHolder options) {
-
     }
 
     @Override
     public void parserOptions(final MutableDataHolder options) {
-
     }
 
     @Override