IIRR-34: Fix newlines around codeblocks for Redcarpet renderer (#94)

* IIRR-34: Fix newlines around codeblocks for Redcarpet renderer

* IIRR-34: Fix bug with regexp that fixes newlines eating last character

Author: arielj

app/assets/stylesheets/application.scss

@@ -125,6 +125,10 @@ td:last-child {
   width: 120px;
 }
 
+td pre {
+  margin-bottom: 1rem;
+}
+
 /* Banner styles - using styleguide colors where possible */
 .banner {
   position: fixed;

app/helpers/application_helper.rb

@@ -2,6 +2,14 @@ module ApplicationHelper
   def markdown(text)
     renderer = Redcarpet::Render::HTML.new(escape_html: true)
     markdown = Redcarpet::Markdown.new(renderer, fenced_code_blocks: true)
+
+    # Redcarpet needs the codeblocks to have 2 newlines before them
+    # fixing this at render because it's not really required by Discord
+    # it's just a quirk of Redcarpet
+    if text.match?(/[^\n]\n```(.*)\n```/m)
+      text = text.gsub(/([^\n])\n```(.*?)\n```/m, "\\1\n\n```\\2\n```")
+    end
+
     markdown.render(text.to_s).html_safe
   end
 end

test/helpers/markdown_helper_test.rb

@@ -24,4 +24,18 @@ class ACodeBlock
 
     assert_includes as_html, "<pre><code>class ACodeBlock"
   end
+
+  test "fixes newlines around code blocks" do
+    puzzle_content = <<~CONTENT
+    Some content with
+    ```
+    class ACodeBlock
+    end
+    ```
+    in it
+    CONTENT
+    as_html = markdown(puzzle_content)
+
+    assert_includes as_html, "with</p>\n\n<pre><code>class ACodeBlock"
+  end
 end