Merge pull request #15 from askonomm/fix-issue-14-and-issue-13

Implement Markdown correction mechanism

1 files changed, 9 insertions, 7 deletions

diff --git a/src/clarktown/parsers/code_block.clj b/src/clarktown/parsers/code_block.clj
index 388776f..c6ecfea 100644
--- a/src/clarktown/parsers/code_block.clj
+++ b/src/clarktown/parsers/code_block.clj
@@ -16,13 +16,15 @@
   (let [language (->> block
                       (re-find #"\`\`\`(\w+)")
                       second)
-        code (as-> block n
-                   (string/replace-first n #"\`\`\`(\w+)?\n" "")
-                   (subs n 0 (- (count n) 4))
-                   (string/replace n #"&" "&")
-                   (string/replace n #"<" "&lt;")
-                   (string/replace n #">" "&gt;")
-                   (string/trim n))]
+        lines (string/split-lines block)
+        block* (->> (next lines)
+                    (take (- (count lines) 2))
+                    (string/join \newline))
+        code (-> block*
+                 (string/replace #"&" "&amp;")
+                 (string/replace #"<" "&lt;")
+                 (string/replace #">" "&gt;")
+                 string/trim)]
     (if language
       (str "<pre><code class=\"language-" language "\">" code "</code></pre>")
       (str "<pre><code>" code "</code></pre>"))))