From 5854537f117042d6a26b75d00284b9b37b6b8130 Mon Sep 17 00:00:00 2001
From: Guillaume Grossetie <ggrossetie@gmail.com>
Date: Wed, 19 Jun 2019 08:37:48 +0200
Subject: Enable AsciiDoc syntax highlighting (using Rouge)

---
 lib/banzai/filter/syntax_highlight_filter.rb              |  2 +-
 lib/banzai/pipeline/ascii_doc_pipeline.rb                 |  1 +
 lib/gitlab/asciidoc.rb                                    |  3 ++-
 .../asciidoc/syntax_highlighter/html_pipeline_adapter.rb  | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 lib/gitlab/asciidoc/syntax_highlighter/html_pipeline_adapter.rb

(limited to 'lib')

diff --git a/lib/banzai/filter/syntax_highlight_filter.rb b/lib/banzai/filter/syntax_highlight_filter.rb
index fe56f9a1e33..9b66759a5fb 100644
--- a/lib/banzai/filter/syntax_highlight_filter.rb
+++ b/lib/banzai/filter/syntax_highlight_filter.rb
@@ -14,7 +14,7 @@ module Banzai
       LANG_PARAMS_ATTR = 'data-lang-params'.freeze
 
       def call
-        doc.search('pre > code').each do |node|
+        doc.search('pre:not([data-math-style]) > code').each do |node|
           highlight_node(node)
         end
 
diff --git a/lib/banzai/pipeline/ascii_doc_pipeline.rb b/lib/banzai/pipeline/ascii_doc_pipeline.rb
index cc4af280872..6be489c6572 100644
--- a/lib/banzai/pipeline/ascii_doc_pipeline.rb
+++ b/lib/banzai/pipeline/ascii_doc_pipeline.rb
@@ -6,6 +6,7 @@ module Banzai
       def self.filters
         FilterArray[
           Filter::SanitizationFilter,
+          Filter::SyntaxHighlightFilter,
           Filter::ExternalLinkFilter,
           Filter::PlantumlFilter,
           Filter::AsciiDocPostProcessingFilter
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb
index 7f8300a0c2f..00c87cce7b6 100644
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
@@ -4,6 +4,7 @@ require 'asciidoctor'
 require 'asciidoctor-plantuml'
 require 'asciidoctor/extensions'
 require 'gitlab/asciidoc/html5_converter'
+require 'gitlab/asciidoc/syntax_highlighter/html_pipeline_adapter'
 
 module Gitlab
   # Parser/renderer for the AsciiDoc format that uses Asciidoctor and filters
@@ -16,7 +17,7 @@ module Gitlab
         'idseparator' => '-',
         'env' => 'gitlab',
         'env-gitlab' => '',
-        'source-highlighter' => 'html-pipeline',
+        'source-highlighter' => 'gitlab-html-pipeline',
         'icons' => 'font',
         'outfilesuffix' => '.adoc',
         'max-include-depth' => MAX_INCLUDE_DEPTH
diff --git a/lib/gitlab/asciidoc/syntax_highlighter/html_pipeline_adapter.rb b/lib/gitlab/asciidoc/syntax_highlighter/html_pipeline_adapter.rb
new file mode 100644
index 00000000000..5fc3323f0fd
--- /dev/null
+++ b/lib/gitlab/asciidoc/syntax_highlighter/html_pipeline_adapter.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Asciidoc
+    module SyntaxHighlighter
+      class HtmlPipelineAdapter < Asciidoctor::SyntaxHighlighter::Base
+        register_for 'gitlab-html-pipeline'
+
+        def format(node, lang, opts)
+          %(<pre><code #{lang ? %[ lang="#{lang}"] : ''}>#{node.content}</code></pre>)
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3