Add internal flag on highlighted <pre>s, to prevent them from being processed twice

Author: woopsn

lib/yard/templates/helpers/html_helper.rb

@@ -54,7 +54,7 @@ def urlencode(text)
       # @param [Symbol] markup examples are +:markdown+, +:textile+, +:rdoc+.
       #   To add a custom markup type, see {MarkupHelper}
       # @return [String] the HTML
-      def htmlify(text, markup = options.markup)
+      def htmlify(text, markup = options.markup, internal = false)
         markup_meth = "html_markup_#{markup}"
         return text unless respond_to?(markup_meth)
         return "" unless text
@@ -66,7 +66,7 @@ def htmlify(text, markup = options.markup)
         end
         html = resolve_links(html)
         unless [:text, :none, :pre, :ruby].include?(markup)
-          html = parse_codeblocks(html)
+          html = parse_codeblocks(html, internal)
         end
         html
       end
@@ -202,6 +202,11 @@ def html_syntax_highlight(source, type = nil)
 
         new_type, source = parse_lang_for_codeblock(source)
         type ||= new_type || :ruby
+
+        if type.to_s == "ruby" && source =~ /<span\s+class=/
+          return source
+        end
+
         meth = "html_syntax_highlight_#{type}"
         respond_to?(meth) ? send(meth, source) : h(source)
       end
@@ -294,7 +299,7 @@ def link_include_object(obj)
 
       # Inserts an include link while respecting inlining
       def insert_include(text, markup = options.markup)
-        htmlify(text, markup).gsub(%r{\A\s*<p>|</p>\s*\Z}, '')
+        htmlify(text, markup, true).gsub(%r{\A\s*<p>|</p>\s*\Z}, '')
       end
 
       # (see BaseHelper#link_object)
@@ -637,20 +642,25 @@ def parse_lang_for_codeblock(source)
       # @param [String] html the html to search for code in
       # @return [String] highlighted html
       # @see #html_syntax_highlight
-      def parse_codeblocks(html)
+      def parse_codeblocks(html, internal = false)
         html.gsub(%r{<pre((?:\s+\w+="(?:.+?)")*)\s*>(?:\s*<code((?:\s+\w+="(?:.+?)")*)\s*>)?(.+?)(?:</code>\s*)?</pre>}m) do
-          string = $3
+          pre_match, code_match, string = $1, $2, $3
 
           # handle !!!LANG prefix to send to html_syntax_highlight_LANG
           language, = parse_lang_for_codeblock(string)
-          language ||= detect_lang_in_codeblock_attributes($1, $2)
+          language ||= detect_lang_in_codeblock_attributes(pre_match, code_match)
           language ||= object.source_type
 
-          if options.highlight
+          pre_attrs = [%(class="code #{language}")]
+
+          if options.highlight && /\bdata-highlighted="true"/ !~ pre_match
             string = html_syntax_highlight(CGI.unescapeHTML(string), language)
+            pre_attrs << 'data-highlighted="true"' if internal
           end
-          classes = ['code', language].compact.join(' ')
-          %(<pre class="#{classes}"><code class="#{language}">#{string}</code></pre>)
+
+          pre_attrs = pre_attrs.compact.join(' ')
+
+          %(<pre #{pre_attrs}><code class="#{language}">#{string}</code></pre>)
         end
       end
 

lib/yard/templates/helpers/html_syntax_highlight_helper.rb

@@ -39,7 +39,7 @@ def html_syntax_highlight_ruby_ripper(source)
           end
           output
         rescue Parser::ParserSyntaxError
-          source =~ /^<span\s+class=/ ? source : h(source)
+          h(source)
         end
 
         def html_syntax_highlight_ruby_legacy(source)