Small fixes for HybridMarkdown support

Author: lsegal

lib/yard/templates/helpers/markup/hybrid_markdown.rb

@@ -1,5 +1,9 @@
-require 'cgi'
-require 'uri'
+# frozen_string_literal: true
+if RUBY_VERSION < '3.5'
+  require 'cgi/util'
+else
+  require 'cgi/escape'
+end
 
 module YARD
   module Templates
@@ -265,7 +269,7 @@ def parse_table(lines, index)
               index += 1
             end
 
-            html = "<table>\n<thead>\n<tr>\n"
+            html = "<table>\n<thead>\n<tr>\n".dup
             header.each_with_index do |cell, i|
               attrs = alignments[i] ? %( align="#{alignments[i]}") : ""
               html << "<th#{attrs}>#{format_inline(cell)}</th>\n"
@@ -290,7 +294,6 @@ def parse_list(lines, index)
             start_attr = ordered && marker[:start] != 1 ? %( start="#{marker[:start]}") : ''
             items = []
             tight = true
-            loose_by_separator = false
             list_indent = marker[:indent]
 
             while index < lines.length
@@ -322,7 +325,6 @@ def parse_list(lines, index)
                     (next_marker[:indent] == item_marker[:indent] || (blank_seen && next_marker[:indent] <= list_indent + 3))
                   if blank_seen
                     tight = false
-                    loose_by_separator = true
                   end
                   break
                 end
@@ -534,7 +536,7 @@ def format_inline(text)
           end
 
           def protect_code_spans(text, placeholders)
-            output = ''
+            output = String.new
             index = 0
 
             while index < text.length
@@ -661,8 +663,8 @@ def format_emphasis(text)
                   :position => output.length,
                   :left_consumed => 0,
                   :right_consumed => 0,
-                  :opening_html => '',
-                  :closing_html => '',
+                  :opening_html => String.new,
+                  :closing_html => String.new,
                   :can_open => can_open,
                   :can_close => can_close
                 }
@@ -1071,7 +1073,7 @@ def parse_reference_definition(label, definition)
               if delimiter == '"' || delimiter == "'" || delimiter == '('
                 index += 1
                 start = index
-                buffer = ''
+                buffer = String.new
                 while index < definition.length
                   char = definition[index, 1]
                   if char == '\\' && index + 1 < definition.length
@@ -1100,7 +1102,7 @@ def parse_reference_definition(label, definition)
           end
 
           def replace_inline_constructs(text, placeholders, prefix)
-            output = ''
+            output = String.new
             index = 0
 
             while index < text.length
@@ -1148,7 +1150,7 @@ def replace_inline_constructs(text, placeholders, prefix)
           end
 
           def scan_reference_constructs(text, placeholders, kind)
-            output = ''
+            output = String.new
             index = 0
 
             while index < text.length
@@ -1298,7 +1300,7 @@ def parse_inline_destination(text, index, placeholders = nil)
             if text[index, 1] == '"' || text[index, 1] == "'"
               delimiter = text[index, 1]
               index += 1
-              buffer = ''
+              buffer = String.new
               while index < text.length
                 char = text[index, 1]
                 if char == '\\' && index + 1 < text.length
@@ -1315,7 +1317,7 @@ def parse_inline_destination(text, index, placeholders = nil)
               index += 1
             elsif text[index, 1] == '('
               index += 1
-              buffer = ''
+              buffer = String.new
               depth = 1
               while index < text.length
                 char = text[index, 1]
@@ -1375,10 +1377,6 @@ def decode_entities(text)
             end
           end
 
-          def unescape_markdown_punctuation(text)
-            text.to_s.gsub(/\\([\\`*_{}\[\]()#+\-.!<>~|])/, '\1')
-          end
-
           def reference_definition_continuation?(line)
             return true if line =~ /^(?: {1,3}|\t)(.*)$/
             return true if line =~ /\A<(?:[^>\n]*)>\s*\z/
@@ -1479,8 +1477,8 @@ def strip_list_item_indent(line, content_indent)
           end
 
           def escape_list_marker_text(line)
-            source = line.to_s
-            newline = source.sub!(/\n\z/, '') ? "\n" : ''
+            source = line.to_s.sub(/\n\z/, '')
+            newline = source.length == line.to_s.length ? '' : "\n"
 
             if source =~ /\A([*+-])([ \t].*)\z/
               "\\#{$1}#{$2}#{newline}"
@@ -1579,7 +1577,7 @@ def reference_definition_context?(previous_line)
           end
 
           def split_reference_container_prefix(line)
-            prefix = ''
+            prefix = String.new
             content = line.chomp
 
             while (split = split_blockquote_prefix(content))
@@ -1656,7 +1654,7 @@ def unclosed_reference_title?(text)
           end
 
           def percent_encode_url(text, allowed_re)
-            encoded = ''
+            encoded = String.new
 
             each_char_compat(text.to_s) do |char|
               if ascii_only_compat?(char) && char =~ /\A#{allowed_re.source}\z/
@@ -1951,7 +1949,7 @@ def utf8_bytes(char)
 
           def unicode_casefold_compat(text)
             codepoints = text.to_s.unpack('U*')
-            folded = ''
+            folded = String.new
 
             codepoints.each do |codepoint|
               append_folded_codepoint(folded, codepoint)

spec/templates/helpers/html_helper_spec.rb

@@ -169,7 +169,7 @@ def options
       expect(html).to match %r{<td>NC</td>}
     end
 
-    it "handles fenced code blocks (Redcarpet specific)" do
+    it "handles fenced code blocks" do
       markdown = "Introduction:\n```ruby\nputs\n\nputs\n```"
       html = htmlify(markdown, :markdown)
       expect(html).to match %r{^<p>Introduction:</p>.*<code class="ruby">}m