Improve wiki rendering. Fix pygemnt + markdown invalid html

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index bd590f92734..3c5ca1ce9da 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -11,14 +11,13 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
 
   def block_code(code, language)
     options = { options: {encoding: 'utf-8'} }
+    options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language)
 
-    h.content_tag :div, class: h.user_color_scheme_class do
-      if Pygments::Lexer.find(language)
-        Pygments.highlight(code, options.merge(lexer: language.downcase))
-      else
-        Pygments.highlight(code, options)
-      end.html_safe
-    end
+    <<-HTML
+       <div class="#{h.user_color_scheme_class}">
+         #{Pygments.highlight(code, options)}
+       </div>
+    HTML
   end
 
   def postprocess(full_document)