From 7922e2a940f91b587c70dfb3d41e0048bc93a19e Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 1 Nov 2016 20:31:16 +0300
Subject: Fix for GH #97 : Preserve language name of fenced code block for
 highlight

---
 core/src/main/kotlin/Formats/HtmlFormatService.kt | 8 +++++++-
 core/src/main/kotlin/Kotlin/ContentBuilder.kt     | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'core/src/main/kotlin')

diff --git a/core/src/main/kotlin/Formats/HtmlFormatService.kt b/core/src/main/kotlin/Formats/HtmlFormatService.kt
index de41d4c6..d73e4e62 100644
--- a/core/src/main/kotlin/Formats/HtmlFormatService.kt
+++ b/core/src/main/kotlin/Formats/HtmlFormatService.kt
@@ -31,7 +31,13 @@ open class HtmlOutputBuilder(to: StringBuilder,
         to.append("<span class=\"identifier\"$id>${text.htmlEscape()}</span>")
     }
 
-    override fun appendBlockCode(language: String, body: () -> Unit) = wrap("<pre><code>", "</code></pre>", body)
+    override fun appendBlockCode(language: String, body: () -> Unit) {
+        val openTags = if (language.isNotBlank())
+            "<pre><code class=\"lang-$language\">"
+        else
+            "<pre><code>"
+        wrap(openTags, "</code></pre>", body)
+    }
 
     override fun appendHeader(level: Int, body: () -> Unit) =
         wrapInTag("h$level", body, newlineBeforeOpen = true, newlineAfterClose = true)
diff --git a/core/src/main/kotlin/Kotlin/ContentBuilder.kt b/core/src/main/kotlin/Kotlin/ContentBuilder.kt
index 61c67787..53afebaf 100644
--- a/core/src/main/kotlin/Kotlin/ContentBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/ContentBuilder.kt
@@ -51,7 +51,10 @@ fun buildContentTo(tree: MarkdownNode, target: ContentBlock, linkResolver: (Stri
                 }
             }
             MarkdownElementTypes.CODE_BLOCK,
-            MarkdownElementTypes.CODE_FENCE -> appendNodeWithChildren(ContentBlockCode())
+            MarkdownElementTypes.CODE_FENCE -> {
+                val language = node.child(MarkdownTokenTypes.FENCE_LANG)?.text?.trim() ?: ""
+                appendNodeWithChildren(ContentBlockCode(language))
+            }
             MarkdownElementTypes.PARAGRAPH -> appendNodeWithChildren(ContentParagraph())
 
             MarkdownElementTypes.INLINE_LINK -> {
-- 
cgit