From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/utils/MarkdownUtils.java | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/MarkdownUtils.java b/src/main/java/com/gitblit/utils/MarkdownUtils.java
index 1595f65..e0c9dd4 100644
--- a/src/main/java/com/gitblit/utils/MarkdownUtils.java
+++ b/src/main/java/com/gitblit/utils/MarkdownUtils.java
@@ -16,14 +16,23 @@
package com.gitblit.utils;
import static org.pegdown.Extensions.ALL;
+import static org.pegdown.Extensions.ANCHORLINKS;
+import static org.pegdown.Extensions.SMARTYPANTS;
import java.io.IOException;
import java.io.Reader;
import java.io.StringWriter;
+import java.text.MessageFormat;
import org.apache.commons.io.IOUtils;
import org.pegdown.LinkRenderer;
+import org.pegdown.ParsingTimeoutException;
import org.pegdown.PegDownProcessor;
+import org.pegdown.ast.RootNode;
+
+import com.gitblit.IStoredSettings;
+import com.gitblit.Keys;
+import com.gitblit.wicket.MarkupProcessor.WorkaroundHtmlSerializer;
/**
* Utility methods for transforming raw markdown text to html.
@@ -67,9 +76,13 @@
* @throws java.text.ParseException
*/
public static String transformMarkdown(String markdown, LinkRenderer linkRenderer) {
- PegDownProcessor pd = new PegDownProcessor(ALL);
- String html = pd.markdownToHtml(markdown, linkRenderer == null ? new LinkRenderer() : linkRenderer);
- return html;
+ try {
+ PegDownProcessor pd = new PegDownProcessor(ALL & ~SMARTYPANTS & ~ANCHORLINKS);
+ RootNode astRoot = pd.parseMarkdown(markdown.toCharArray());
+ return new WorkaroundHtmlSerializer(linkRenderer == null ? new LinkRenderer() : linkRenderer).toHtml(astRoot);
+ } catch (ParsingTimeoutException e) {
+ return null;
+ }
}
/**
@@ -95,4 +108,49 @@
}
}
}
+
+
+ /**
+ * Transforms GFM (Github Flavored Markdown) to html.
+ * Gitblit does not support the complete GFM specification.
+ *
+ * @param input
+ * @param repositoryName
+ * @return html
+ */
+ public static String transformGFM(IStoredSettings settings, String input, String repositoryName) {
+ String text = input;
+
+ // strikethrough
+ text = text.replaceAll("~~(.*)~~", "<s>$1</s>");
+ text = text.replaceAll("\\{(?:-){2}(.*)(?:-){2}}", "<s>$1</s>");
+
+ // underline
+ text = text.replaceAll("\\{(?:\\+){2}(.*)(?:\\+){2}}", "<u>$1</u>");
+
+ // strikethrough, replacement
+ text = text.replaceAll("\\{~~(.*)~>(.*)~~}", "<s>$1</s><u>$2</u>");
+
+ // highlight
+ text = text.replaceAll("\\{==(.*)==}", "<span class='highlight'>$1</span>");
+
+ String canonicalUrl = settings.getString(Keys.web.canonicalUrl, "https://localhost:8443");
+
+ // emphasize and link mentions
+ String mentionReplacement = String.format(" **[@$1](%1s/user/$1)**", canonicalUrl);
+ text = text.replaceAll("\\s@([A-Za-z0-9-_]+)", mentionReplacement);
+
+ // link ticket refs
+ String ticketReplacement = MessageFormat.format("$1[#$2]({0}/tickets?r={1}&h=$2)$3", canonicalUrl, repositoryName);
+ text = text.replaceAll("([\\s,]+)#(\\d+)([\\s,:\\.\\n])", ticketReplacement);
+
+ // link commit shas
+ int shaLen = settings.getInteger(Keys.web.shortCommitIdLength, 6);
+ String commitPattern = MessageFormat.format("\\s([A-Fa-f0-9]'{'{0}'}')([A-Fa-f0-9]'{'{1}'}')", shaLen, 40 - shaLen);
+ String commitReplacement = String.format(" [`$1`](%1$s/commit?r=%2$s&h=$1$2)", canonicalUrl, repositoryName);
+ text = text.replaceAll(commitPattern, commitReplacement);
+
+ String html = transformMarkdown(text);
+ return html;
+ }
}
--
Gitblit v1.9.1