(refs #54) Fix Markdown fragment rendering

Author: takezoe

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -58,7 +58,7 @@ trait GistControllerBase extends ControllerBase {
       val files = getGistFiles(userName, repoName)
       val (fileName, source) = files.head
 
-      (gist, GistInfo(fileName, getLines(source), files.length, getForkedCount(userName, repoName), getCommentCount(userName, repoName)))
+      (gist, GistInfo(fileName, getLines(fileName, source), files.length, getForkedCount(userName, repoName), getCommentCount(userName, repoName)))
     }
 
     html.list(None, gists, page, page * Limit < count)
@@ -351,8 +351,9 @@ trait GistControllerBase extends ControllerBase {
     val repoName = params("repoName")
 
     contentType = "text/html"
-    helpers.markdown(params("content"),
-      RepositoryInfo(
+    helpers.markdown(
+      markdown   = params("content"),
+      repository = RepositoryInfo(
         owner       = userName,
         name        = repoName,
         repository  = null,
@@ -362,7 +363,13 @@ trait GistControllerBase extends ControllerBase {
         branchList  = Nil,
         tags        = Nil,
         managers    = Nil
-      ), false, false, false, false)
+      ),
+      branch           = "master",
+      enableWikiLink   = false,
+      enableRefsLink   = false,
+      enableLineBreaks = false,
+      enableAnchor     = false
+    )
   }
 
   post("/gist/:userName/:repoName/_comment", commentForm)(usersOnly { form =>
@@ -399,7 +406,15 @@ trait GistControllerBase extends ControllerBase {
         } getOrElse {
           contentType = formats("json")
           org.json4s.jackson.Serialization.write(
-            Map("content" -> gitbucket.core.view.Markdown.toHtml(comment.content, gist.toRepositoryInfo, false, true, true, true))
+            Map("content" -> gitbucket.core.view.Markdown.toHtml(
+              markdown         = comment.content,
+              repository       = gist.toRepositoryInfo,
+              branch           = "master",
+              enableWikiLink   = false,
+              enableRefsLink   = true,
+              enableAnchor     = true,
+              enableLineBreaks = true
+            ))
           )
         }
       }
@@ -441,7 +456,7 @@ trait GistControllerBase extends ControllerBase {
           val repoName = gist.repositoryName
           val files = getGistFiles(userName, repoName, revision)
           val (fileName, source) = files.head
-          (gist, GistInfo(fileName, getLines(source), files.length, getForkedCount(userName, repoName), getCommentCount(userName, repoName)))
+          (gist, GistInfo(fileName, getLines(fileName, source), files.length, getForkedCount(userName, repoName), getCommentCount(userName, repoName)))
         }
 
         val fullName = getAccountByUserName(userName).get.fullName

src/main/scala/gitbucket/gist/util/GistUtils.scala

@@ -38,7 +38,15 @@ object GistUtils {
     commitId
   }
 
-  def getLines(source: String): String = source.split("\n").take(10).mkString("\n")
+  def getLines(fileName: String, source: String): String = {
+    val lines = source.split("\n").map(_.trim).take(10)
+
+    (if((fileName.endsWith(".md") || fileName.endsWith(".markdown")) && lines.count(_ == "```") % 2 != 0) {
+      lines :+ "```"
+    } else {
+      lines
+    }).mkString("\n")
+  }
 
   def isGistFile(fileName: String): Boolean = fileName.matches("gistfile[0-9]+\\.txt")
 

src/main/twirl/gitbucket/gist/commentlist.scala.html

@@ -20,7 +20,7 @@
       </span>
     </div>
     <div class="panel-body issue-content markdown-body" id="commentContent-@comment.commentId">
-      @helpers.markdown(comment.content, repository, false, true, true, hasWritePermission)
+      @helpers.markdown(comment.content, repository, "master", false, true, true, hasWritePermission)
     </div>
   </div>
 }

src/main/twirl/gitbucket/gist/list.scala.html

@@ -56,9 +56,9 @@ <h1 style="margin-top: 0px;">Discover Snippets</h1>
             <div class="panel-body">
               <div style="margin-bottom: 10px;">@gist.description</div>
               <div>
-                @if(helpers.isRenderable(gistInfo.fileName)){
+                @if(gistInfo.fileName.toLowerCase.endsWith(".md") || gistInfo.fileName.toLowerCase.endsWith(".markdown")){
                   <div class="list-markup box-content markdown-body">
-                    @helpers.renderMarkup(List(gistInfo.fileName), gistInfo.source, "master", gist.toRepositoryInfo, false, false, false)
+                    @helpers.markdown(gistInfo.source, gist.toRepositoryInfo, "master", false, false, false)
                   </div>
                 } else {
                   <pre class="list-code box-content prettyprint linenums">@gistInfo.source</pre>