${m.group(2)}/${m.group(3)}@${m.group(4).substring(0, 7)}"""
+ s"""${m.group(2)}/${m.group(
+ 3
+ )}@${m.group(4).substring(0, 7)}"""
}
}
// convert username/project#Num to link
- .replaceBy( ("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)/([a-zA-Z0-9\\-_\\.]+)" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m =>
- getIssue(m.group(2), m.group(3), m.group(4)) match {
- case Some(issue) if (issue.isPullRequest) =>
- Some(s"""${m.group(2)}/${m.group(3)}#${m.group(4)}""")
- case Some(_) =>
- Some(s"""${m.group(2)}/${m.group(3)}#${m.group(4)}""")
- case None =>
- Some(s"""${m.group(2)}/${m.group(3)}#${m.group(4)}""")
- }
+ .replaceBy(("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)/([a-zA-Z0-9\\-_\\.]+)" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r) {
+ m =>
+ getIssue(m.group(2), m.group(3), m.group(4)) match {
+ case Some(issue) if (issue.isPullRequest) =>
+ Some(s"""${m.group(2)}/${m.group(
+ 3
+ )}#${m.group(4)}""")
+ case Some(_) =>
+ Some(s"""${m.group(2)}/${m
+ .group(3)}#${m.group(4)}""")
+ case None =>
+ Some(s"""${m.group(2)}/${m.group(3)}#${m.group(4)}""")
+ }
}
// convert username@SHA to link
- .replaceBy( ("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)@([a-f0-9]{40})(?=(\\W|$))").r ) { m =>
+ .replaceBy(("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)@([a-f0-9]{40})(?=(\\W|$))").r) { m =>
getAccountByUserName(m.group(2)).map { _ =>
- s"""${m.group(2)}@${m.group(3).substring(0, 7)}"""
+ s"""${m.group(2)}@${m
+ .group(3)
+ .substring(0, 7)}"""
}
}
// convert username#Num to link
- .replaceBy( ("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r ) { m =>
+ .replaceBy(("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r) { m =>
getIssue(m.group(2), repository.name, m.group(3)) match {
- case Some(issue) if(issue.isPullRequest) =>
- Some(s"""${m.group(2)}#${m.group(3)}""")
+ case Some(issue) if (issue.isPullRequest) =>
+ Some(s"""${m.group(2)}#${m
+ .group(3)}""")
case Some(_) =>
- Some(s"""${m.group(2)}#${m.group(3)}""")
+ Some(s"""${m.group(2)}#${m
+ .group(3)}""")
case None =>
Some(s"""${m.group(2)}#${m.group(3)}""")
}
}
// convert issue id to link
- .replaceBy(("(?<=(^|\\W))(GH-|(?
- val prefix = if(m.group(2) == "issue:") "#" else m.group(2)
+ .replaceBy(("(?<=(^|\\W))(GH-|(?
+ val prefix = if (m.group(2) == "issue:") "#" else m.group(2)
getIssue(repository.owner, repository.name, m.group(3)) match {
- case Some(issue) if(issue.isPullRequest) =>
- Some(s"""${prefix}${m.group(3)}""")
+ case Some(issue) if (issue.isPullRequest) =>
+ Some(s"""${prefix}${m
+ .group(3)}""")
case Some(_) =>
- Some(s"""${prefix}${m.group(3)}""")
+ Some(s"""${prefix}${m
+ .group(3)}""")
case None =>
Some(s"""${m.group(2)}${m.group(3)}""")
}
}
// convert @username to link
- .replaceBy("(?<=(^|\\W))@([a-zA-Z0-9\\-_\\.]+)(?=(\\W|$))".r){ m =>
+ .replaceBy("(?<=(^|\\W))@([a-zA-Z0-9\\-_\\.]+)(?=(\\W|$))".r) { m =>
getAccountByUserName(m.group(2)).map { _ =>
s"""@${m.group(2)}"""
}
}
// convert commit id to link
- .replaceBy("(?<=(^|[^\\w/@]))([a-f0-9]{40})(?=(\\W|$))".r){ m =>
- Some(s"""${m.group(2).substring(0, 7)}""")
+ .replaceBy("(?<=(^|[^\\w/@]))([a-f0-9]{40})(?=(\\W|$))".r) { m =>
+ Some(s"""${m.group(2).substring(0, 7)}""")
}
}
}
diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala
index a4d05b6..4eac137 100644
--- a/src/main/scala/gitbucket/core/view/Markdown.scala
+++ b/src/main/scala/gitbucket/core/view/Markdown.scala
@@ -24,24 +24,34 @@
* @param hasWritePermission true if user has writable to ths given repository
* @param pages the list of existing Wiki pages
*/
- def toHtml(markdown: String,
- repository: RepositoryService.RepositoryInfo,
- enableWikiLink: Boolean,
- enableRefsLink: Boolean,
- enableAnchor: Boolean,
- enableLineBreaks: Boolean,
- enableTaskList: Boolean = false,
- hasWritePermission: Boolean = false,
- pages: List[String] = Nil)(implicit context: Context): String = {
+ def toHtml(
+ markdown: String,
+ repository: RepositoryService.RepositoryInfo,
+ enableWikiLink: Boolean,
+ enableRefsLink: Boolean,
+ enableAnchor: Boolean,
+ enableLineBreaks: Boolean,
+ enableTaskList: Boolean = false,
+ hasWritePermission: Boolean = false,
+ pages: List[String] = Nil
+ )(implicit context: Context): String = {
// escape task list
- val source = if(enableTaskList) escapeTaskList(markdown) else markdown
+ val source = if (enableTaskList) escapeTaskList(markdown) else markdown
val options = new Options()
options.setBreaks(enableLineBreaks)
- val renderer = new GitBucketMarkedRenderer(options, repository,
- enableWikiLink, enableRefsLink, enableAnchor, enableTaskList, hasWritePermission, pages)
+ val renderer = new GitBucketMarkedRenderer(
+ options,
+ repository,
+ enableWikiLink,
+ enableRefsLink,
+ enableAnchor,
+ enableTaskList,
+ hasWritePermission,
+ pages
+ )
Marked.marked(source, options, renderer)
}
@@ -49,25 +59,31 @@
/**
* Extends markedj Renderer for GitBucket
*/
- class GitBucketMarkedRenderer(options: Options,
- repository: RepositoryService.RepositoryInfo,
- enableWikiLink: Boolean,
- enableRefsLink: Boolean,
- enableAnchor: Boolean,
- enableTaskList: Boolean,
- hasWritePermission: Boolean,
- pages: List[String])
- (implicit val context: Context) extends Renderer(options) with LinkConverter with RequestCache {
+ class GitBucketMarkedRenderer(
+ options: Options,
+ repository: RepositoryService.RepositoryInfo,
+ enableWikiLink: Boolean,
+ enableRefsLink: Boolean,
+ enableAnchor: Boolean,
+ enableTaskList: Boolean,
+ hasWritePermission: Boolean,
+ pages: List[String]
+ )(implicit val context: Context)
+ extends Renderer(options)
+ with LinkConverter
+ with RequestCache {
- override def heading(text: String, level: Int, raw: String): String = {
+ override def heading(text: String, level: Int, raw: String): String = {
val id = generateAnchorName(text)
val out = new StringBuilder()
out.append("" + - (if(escaped) code else escape(code, true)) + "" + "
" + + (if (escaped) code else escape(code, true)) + "" } override def list(body: String, ordered: Boolean): String = { @@ -90,7 +106,7 @@ } else { listType = "ul" } - if(body.contains("""class="task-list-item-checkbox"""")){ + if (body.contains("""class="task-list-item-checkbox"""")) { "<" + listType + " class=\"task-list\">\n" + body + "\n" } else { "<" + listType + ">\n" + body + "\n" @@ -98,7 +114,7 @@ } override def listitem(text: String): String = { - if(text.contains("""class="task-list-item-checkbox" """)){ + if (text.contains("""class="task-list-item-checkbox" """)) { "