Skip to content

The Unified and Autonomous Development Platform

Fix the issue that hashtag link does not work in markdown

robin shen6722c773cb79
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
index b26138511a..9ba0f4d7ee 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
@@ -19,7 +19,7 @@ import org.jsoup.safety.Whitelist;
import com.gitplex.server.manager.MarkdownManager;
import com.gitplex.server.util.markdown.HtmlTransformer;
-import com.gitplex.server.util.markdown.RelativeUrlResolveExtension;
+import com.gitplex.server.util.markdown.UrlResolveExtension;
import com.google.common.base.Preconditions;
import com.vladsch.flexmark.Extension;
import com.vladsch.flexmark.ast.Node;
@@ -99,7 +99,7 @@ public class DefaultMarkdownManager implements MarkdownManager {
extensions.add(DefinitionExtension.create());
extensions.add(TocExtension.create());
extensions.add(AutolinkExtension.create());
- extensions.add(new RelativeUrlResolveExtension());
+ extensions.add(new UrlResolveExtension());
extensions.addAll(contributedExtensions);
MutableDataHolder options = new MutableDataSet();
@@ -107,7 +107,7 @@ public class DefaultMarkdownManager implements MarkdownManager {
.set(TablesExtension.COLUMN_SPANS, false).set(TablesExtension.APPEND_MISSING_COLUMNS, true)
.set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
.set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
- .set(RelativeUrlResolveExtension.BASE_URL, baseUrl)
+ .set(UrlResolveExtension.BASE_URL, baseUrl)
.set(Parser.EXTENSIONS, extensions);
Parser parser = Parser.builder(options).build();
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/RelativeUrlResolveExtension.java b/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java
similarity index 96%
rename from core/src/main/java/com/gitplex/server/util/markdown/RelativeUrlResolveExtension.java
rename to core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java
index dd58a875ca..c1c2ae859a 100644
--- a/core/src/main/java/com/gitplex/server/util/markdown/RelativeUrlResolveExtension.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java
@@ -20,7 +20,7 @@ import com.vladsch.flexmark.util.options.DataHolder;
import com.vladsch.flexmark.util.options.DataKey;
import com.vladsch.flexmark.util.options.MutableDataHolder;
-public class RelativeUrlResolveExtension implements HtmlRenderer.HtmlRendererExtension {
+public class UrlResolveExtension implements HtmlRenderer.HtmlRendererExtension {
public static final DataKey<String> BASE_URL = new DataKey<>("BASE_URL", (String)null);
@@ -74,7 +74,7 @@ public class RelativeUrlResolveExtension implements HtmlRenderer.HtmlRendererExt
}
private String resolveUrl(String baseUrl, String urlToResolve) {
- if (urlToResolve.contains(":") || urlToResolve.startsWith("/")) {
+ if (urlToResolve.contains(":") || urlToResolve.startsWith("/") || urlToResolve.startsWith("#")) {
return urlToResolve;
} else {
Path resolvedPath = Paths.get(baseUrl).resolveSibling(urlToResolve);
diff --git a/web/src/main/java/com/gitplex/server/web/util/AbsoluteUrlRenderer.java b/web/src/main/java/com/gitplex/server/web/util/AbsoluteUrlRenderer.java
index 193a6a33b8..a3b509b51f 100644
--- a/web/src/main/java/com/gitplex/server/web/util/AbsoluteUrlRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/util/AbsoluteUrlRenderer.java
@@ -15,26 +15,7 @@ public class AbsoluteUrlRenderer extends UrlRenderer {
}
@Override
- public String renderUrl(Url url) {
- String renderedUrl;
- if (shouldRenderAsFull(url)) {
- if (!(url.isFull() || url.isContextAbsolute())) {
- String relativeUrl = renderRelativeUrl(url);
- Url relative = Url.parse(relativeUrl, url.getCharset());
- relative.setHost(url.getHost());
- relative.setPort(url.getPort());
- relative.setProtocol(url.getProtocol());
- renderedUrl = renderFullUrl(relative);
- } else {
- renderedUrl = renderFullUrl(url);
- }
- } else {
- renderedUrl = renderAbsoluteUrl(url);
- }
- return renderedUrl;
- }
-
- private String renderAbsoluteUrl(Url url) {
+ public String renderRelativeUrl(Url url) {
if (url.isFull()) {
return url.toString();
} else if (url.getSegments().isEmpty()) {