fix code blocks

Author: Tsche

.devcontainer/Dockerfile

@@ -21,6 +21,7 @@ RUN pip install pyyaml
 RUN pip install watchdog
 
 RUN yarn global add @antora/lunr-extension
+RUN yarn global add @antora/collector-extension
 
 RUN apk add --no-cache curl tar xz \
  && curl -L https://github.com/cppalliance/mrdocs/releases/download/v${MRDOCS_VERSION}/MrDocs-${MRDOCS_VERSION}-Linux.tar.xz \
@@ -30,5 +31,10 @@ RUN apk add --no-cache curl tar xz \
  && rm /tmp/mrdocs.tar.xz \
  && ln -s /opt/mrdocs/bin/mrdocs /usr/local/bin/mrdocs
 
+# Patch code blocks for use with rouge
+COPY .devcontainer/code-block.patch /opt/mrdocs/code-block.patch
+RUN patch -p1 -d /opt/mrdocs < /opt/mrdocs/code-block.patch
+RUN rm /opt/mrdocs/code-block.patch
+
 USER node
 

.devcontainer/code-block.patch

@@ -0,0 +1,10 @@
+diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs
+index 6037d1a7..71ba6ad3 100644
+--- a/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs
++++ b/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs
+@@ -1,4 +1,4 @@
+-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
++[source,cpp,subs="verbatim,-replacements,+macros,+callouts"]
+ ----
+ {{> @partial-block }}
+ 

tools/rehighlight.rb

@@ -107,13 +107,25 @@ class Cpp
     # Strip any "language-" prefix just in case
     lang = lang.sub(/^language-/, '')
 
-    source = code_node.text
+    source_html = code_node.inner_html
+
+    links = []
+    source = source_html.gsub(/<a[^>]*class="xref[^"]*"[^>]*>.*?<\/a>/) do |link|
+      token = "ROUGE_LINK_#{links.length}"
+      links << link
+      token
+    end
+    source = Nokogiri::HTML.fragment(source).text
 
     lexer = Rouge::Lexer.find_fancy(lang, source) || Rouge::Lexers::PlainText.new
     formatter = Rouge::Formatters::HTML.new
 
     if diff_enabled
       highlighted_html = formatter.format(lexer.lex(source))
+      links.each_with_index do |link, i|
+        highlighted_html.gsub!("ROUGE_LINK_#{i}", link)
+      end
+
       source_lines = source.lines.map(&:chomp)
       highlighted_lines = highlighted_html.lines.map(&:chomp)
 
@@ -140,6 +152,10 @@ class Cpp
       changed = true
     else
       highlighted = formatter.format(lexer.lex(source))
+      links.each_with_index do |link, i|
+        highlighted.gsub!("ROUGE_LINK_#{i}", link)
+      end
+
       frag = Nokogiri::HTML::DocumentFragment.parse(
         "<div class='rouge'><pre><code class='highlight #{lang}'>#{highlighted}</code></pre></div>"
       )