From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 28 Mar 2022 21:40:45 +0000 (+0200)
Subject: Fix code blocks processing
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8d6f3f8a379c8d552d2101cf35ae8f6fe956da53;p=mastodon.git

Fix code blocks processing
---

diff --git a/app/lib/advanced_text_formatter.rb b/app/lib/advanced_text_formatter.rb
index 5ce87d306..728400819 100644
--- a/app/lib/advanced_text_formatter.rb
+++ b/app/lib/advanced_text_formatter.rb
@@ -9,7 +9,7 @@ class AdvancedTextFormatter < TextFormatter
 
     def block_code(code, _language)
       <<~HTML.squish
-        <pre><code>#{h(code).gsub("\n", '<br/>')}</code></pre>
+        <pre><code>#{ERB::Util.h(code).gsub("\n", '<br/>')}</code></pre>
       HTML
     end
 
diff --git a/spec/lib/advanced_text_formatter_spec.rb b/spec/lib/advanced_text_formatter_spec.rb
index c097b86e1..4e859c93c 100644
--- a/spec/lib/advanced_text_formatter_spec.rb
+++ b/spec/lib/advanced_text_formatter_spec.rb
@@ -34,6 +34,14 @@ RSpec.describe AdvancedTextFormatter do
         end
       end
 
+      context 'given a block code' do
+        let(:text) { "test\n\n```\nint main(void) {\n  return 0;\n}\n```\n" }
+
+        it 'formats code using <pre> and <code>' do
+          is_expected.to include '<pre><code>int main'
+        end
+      end
+
       context 'given some quote' do
         let(:text) { "> foo\n\nbar" }