From f4fffbe807e2c5821a055638d0dc8bd42ad5ad8f Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 20 Feb 2025 12:10:19 +0000
Subject: [PATCH 01/12] Extract page files variable to ivar

---
 lib/rdoc/generator/darkfish.rb                               | 1 +
 lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml    | 5 ++---
 lib/rdoc/generator/template/darkfish/table_of_contents.rhtml | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 45795eb78e..44ae47fe82 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -600,6 +600,7 @@ def setup
     @files   = @store.all_files.sort
     @methods = @classes.flat_map { |m| m.method_list }.sort
     @modsort = get_sorted_module_list @classes
+    @page_files = @files.select { |f| f.text? }
   end
 
   ##
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
index 3f68f0c0dc..25c3f49ca8 100644
--- a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
@@ -1,13 +1,12 @@
-<%- simple_files = @files.select { |f| f.text? } %>
 <%- if defined?(current) -%>
   <%- dir = current.full_name[%r{\A[^/]+(?=/)}] || current.page_name -%>
 <%- end -%>
-<%- unless simple_files.empty? then -%>
+<%- if @page_files.any? -%>
 <div id="fileindex-section" class="nav-section">
   <h3>Pages</h3>
 
   <ul class="link-list">
-  <%- simple_files.group_by do |f| -%>
+  <%- @page_files.group_by do |f| -%>
     <%- f.full_name[%r{\A[^/]+(?=/)}] || f.page_name -%>
   <%- end.each do |n, files| -%>
     <%- f = files.shift -%>
diff --git a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
index 2cd2207836..9860e3683e 100644
--- a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
+++ b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
@@ -13,11 +13,10 @@
 <main role="main">
 <h1 class="class"><%= h @title %></h1>
 
-<%- simple_files = @files.select { |f| f.text? } -%>
-<%- unless simple_files.empty? then -%>
+<%- if @page_files.any? -%>
 <h2 id="pages">Pages</h2>
 <ul>
-<%- simple_files.sort.each do |file| -%>
+<%- @page_files.sort.each do |file| -%>
   <li class="file">
     <a href="<%= h file.path %>"><%= h file.page_name %></a>
 <%

From 180771e2bc7242b44953f9e4734ac9126efd7fcb Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 20 Feb 2025 12:58:45 +0000
Subject: [PATCH 02/12] Extract sidebar pages logic into helper methods

---
 lib/rdoc/generator/darkfish.rb                | 37 +++++++++++++++++++
 .../template/darkfish/_sidebar_pages.rhtml    | 26 +------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 44ae47fe82..b6b0cf2531 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -800,6 +800,43 @@ def group_classes_by_namespace_for_sidebar(classes)
     grouped_classes
   end
 
+  def generate_page_link(file, rel_prefix)
+    %(<a href="#{rel_prefix}/#{h file.path}">#{h file.page_name}</a>)
+  end
+
+  def generate_pages_index_content(page_files, rel_prefix, current)
+    return '' if page_files.empty?
+
+    dir = current&.full_name&.[](/\A[^\/]+(?=\/)/) || current&.page_name
+
+    content = +'<ul class="link-list">'
+    page_files.group_by do |f|
+      f.full_name[/\A[^\/]+(?=\/)/] || f.page_name
+    end.each do |n, grouped_files|
+      f = grouped_files.shift
+      if grouped_files.empty?
+        content << %(<li>#{generate_page_link(f, rel_prefix)}</li>)
+        next
+      end
+
+      content << %(<li><details#{dir == n ? ' open' : ''}><summary>)
+      if n == f.page_name
+        content << generate_page_link(f, rel_prefix)
+      else
+        content << h(n)
+        grouped_files.unshift(f)
+      end
+      content << '</summary><ul class="link-list">'
+
+      grouped_files.each do |f|
+        content << %(<li>#{generate_page_link(f, rel_prefix)}</li>)
+      end
+
+      content << '</ul></details>'
+    end
+    content << '</ul>'
+  end
+
   private
 
   def nesting_namespaces_to_class_modules klass
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
index 25c3f49ca8..1ea53f14a3 100644
--- a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
@@ -1,31 +1,7 @@
-<%- if defined?(current) -%>
-  <%- dir = current.full_name[%r{\A[^/]+(?=/)}] || current.page_name -%>
-<%- end -%>
 <%- if @page_files.any? -%>
 <div id="fileindex-section" class="nav-section">
   <h3>Pages</h3>
 
-  <ul class="link-list">
-  <%- @page_files.group_by do |f| -%>
-    <%- f.full_name[%r{\A[^/]+(?=/)}] || f.page_name -%>
-  <%- end.each do |n, files| -%>
-    <%- f = files.shift -%>
-    <%- if files.empty? -%>
-    <li><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h f.page_name %></a>
-      <%- next -%>
-    <%- end -%>
-    <li><details<% if dir == n %> open<% end %>><summary><%
-    if n == f.page_name
-      %><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h n %></a><%
-    else
-      %><%= h n %><% files.unshift(f)
-    end %></summary>
-    <ul class="link-list">
-    <%- files.each do |f| -%>
-      <li><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h f.page_name %></a>
-    <%- end -%>
-    </ul></details>
-  <%- end -%>
-  </ul>
+  <%= generate_pages_index_content(@page_files, rel_prefix, current) %>
 </div>
 <%- end -%>

From f6756648caa50223719b92d2225faa5de8b84ad0 Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 20 Feb 2025 13:30:33 +0000
Subject: [PATCH 03/12] Refactor sidebar list generation methods

---
 lib/rdoc/generator/darkfish.rb | 103 ++++++++++++++++++++-------------
 1 file changed, 62 insertions(+), 41 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index b6b0cf2531..6c5397ca71 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -758,7 +758,7 @@ def generate_ancestor_list(ancestors, klass)
 
   def generate_class_link(klass, rel_prefix)
     if klass.display?
-      %(<code><a href="#{rel_prefix}/#{klass.path}">#{klass.name}</a></code>)
+      %(<code>#{generate_sidebar_link(klass.name, klass.path, rel_prefix)}</code>)
     else
       %(<code>#{klass.name}</code>)
     end
@@ -768,25 +768,21 @@ def generate_class_index_content(classes, rel_prefix)
     grouped_classes = group_classes_by_namespace_for_sidebar(classes)
     return '' unless top = grouped_classes[nil]
 
-    solo = top.one? { |klass| klass.display? }
-    traverse_classes(top, grouped_classes, rel_prefix, solo)
+    open = top.one? { |klass| klass.display? }
+    traverse_classes(top, grouped_classes, rel_prefix, open)
   end
 
-  def traverse_classes(klasses, grouped_classes, rel_prefix, solo = false)
-    content = +'<ul class="link-list">'
-
-    klasses.each do |index_klass|
-      if children = grouped_classes[index_klass.full_name]
-        content << %(<li><details#{solo ? ' open' : ''}><summary>#{generate_class_link(index_klass, rel_prefix)}</summary>)
-        content << traverse_classes(children, grouped_classes, rel_prefix)
-        content << '</details></li>'
-        solo = false
-      elsif index_klass.display?
-        content << %(<li>#{generate_class_link(index_klass, rel_prefix)}</li>)
+  def traverse_classes(klasses, grouped_classes, rel_prefix, open)
+    traverse_tree(klasses) do |index_klass|
+      {
+        label: generate_class_link(index_klass, rel_prefix),
+        children: grouped_classes[index_klass.full_name],
+        display: index_klass.display?,
+        open: open
+      }.tap do
+        open = false
       end
     end
-
-    "#{content}</ul>"
   end
 
   def group_classes_by_namespace_for_sidebar(classes)
@@ -800,41 +796,43 @@ def group_classes_by_namespace_for_sidebar(classes)
     grouped_classes
   end
 
-  def generate_page_link(file, rel_prefix)
-    %(<a href="#{rel_prefix}/#{h file.path}">#{h file.page_name}</a>)
+  def generate_sidebar_link(name, path, rel_prefix)
+    name = CGI.escapeHTML(name)
+    path = CGI.escapeHTML(path)
+    %(<a href="#{rel_prefix}/#{path}">#{name}</a>)
   end
 
   def generate_pages_index_content(page_files, rel_prefix, current)
     return '' if page_files.empty?
 
     dir = current&.full_name&.[](/\A[^\/]+(?=\/)/) || current&.page_name
+    grouped_files = page_files.group_by { |f| f.full_name[/\A[^\/]+(?=\/)/] || f.page_name }
 
-    content = +'<ul class="link-list">'
-    page_files.group_by do |f|
-      f.full_name[/\A[^\/]+(?=\/)/] || f.page_name
-    end.each do |n, grouped_files|
-      f = grouped_files.shift
-      if grouped_files.empty?
-        content << %(<li>#{generate_page_link(f, rel_prefix)}</li>)
-        next
-      end
-
-      content << %(<li><details#{dir == n ? ' open' : ''}><summary>)
-      if n == f.page_name
-        content << generate_page_link(f, rel_prefix)
+    traverse_tree(grouped_files) do |name, files|
+      f = files.shift
+      # If the group has only one file, we can just link to it
+      if files.empty?
+        { label: generate_sidebar_link(f.page_name, f.path, rel_prefix), display: true }
       else
-        content << h(n)
-        grouped_files.unshift(f)
-      end
-      content << '</summary><ul class="link-list">'
-
-      grouped_files.each do |f|
-        content << %(<li>#{generate_page_link(f, rel_prefix)}</li>)
+        label =
+          # If the group has multiple files and the current file matches the group name
+          # the label should be a link to the current file
+          if name == f.page_name
+            generate_sidebar_link(f.page_name, f.path, rel_prefix)
+          # Otherwise, the label should be the group name
+          else
+            files.unshift(f)
+            h(name)
+          end
+        {
+          label: label,
+          children: files,
+          display: true,
+          open: dir == name,
+          child_renderer: ->(f) { { label: generate_sidebar_link(f.page_name, f.path, rel_prefix), display: true } }
+        }
       end
-
-      content << '</ul></details>'
     end
-    content << '</ul>'
   end
 
   private
@@ -855,4 +853,27 @@ def generate_nesting_namespaces_breadcrumb klass, rel_prefix
       { name: namespace, path: path, self: klass.full_name == class_module&.full_name }
     end
   end
+
+  def traverse_tree(items, &block)
+    content = +'<ul class="link-list">'
+
+    items.each do |*args|
+      result = yield(*args)
+      next unless result[:display]
+
+      if result[:children]
+        content << %(<li><details#{result[:open] ? ' open' : ''}><summary>#{result[:label]}</summary>)
+        if result[:child_renderer]
+          content << traverse_tree(result[:children]) { |item| result[:child_renderer].call(item) }
+        else
+          content << traverse_tree(result[:children], &block)
+        end
+        content << '</details></li>'
+      else
+        content << %(<li>#{result[:label]}</li>)
+      end
+    end
+
+    "#{content}</ul>"
+  end
 end

From 0a517de4bf18255b8e67f91bdfe3c66cd6b1b9cf Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 27 Feb 2025 12:46:49 +0000
Subject: [PATCH 04/12] Simplify sidebar ToC's generation logic

---
 lib/rdoc/generator/darkfish.rb                      | 13 ++++++++++++-
 .../darkfish/_sidebar_table_of_contents.rhtml       | 10 ++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 6c5397ca71..2184962148 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -321,7 +321,7 @@ def generate_index
       # suppress 1.9.3 warning
       here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
       # some partials rely on the presence of current variable to render
-      here.local_variable_set(:current, @main_page) if @main_page
+      here.local_variable_set(:current, @main_page)
       here
     end
   rescue => e
@@ -738,6 +738,17 @@ def excerpt(comment)
     extracted_text[0...150].gsub(/\n/, " ").squeeze(" ")
   end
 
+  def generate_table_from_the_current_object(current)
+    return '' if current.nil?
+    comment =
+      if current.respond_to? :comment_location then
+        current.comment_location
+      else
+        current.comment
+      end
+    current.parse(comment).table_of_contents.dup
+  end
+
   def generate_ancestor_list(ancestors, klass)
     return '' if ancestors.empty?
 
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
index b1e047b5f7..192869e013 100644
--- a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
@@ -1,11 +1,5 @@
-<%- comment = if current.respond_to? :comment_location then
-               current.comment_location
-             else
-               current.comment
-             end
-   table = current.parse(comment).table_of_contents.dup
-
-   if table.length > 1 then %>
+<%- table = generate_table_from_the_current_object(current) -%>
+<%- if table.length > 1 %>
 <div class="nav-section">
   <h3>Table of Contents</h3>
 

From 8ebaa94c7fda525d530e3a0d086663b502bb719b Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 27 Feb 2025 13:08:26 +0000
Subject: [PATCH 05/12] Rename current local to target

---
 lib/rdoc/generator/darkfish.rb                | 47 ++++++++-----------
 .../template/darkfish/_sidebar_pages.rhtml    |  2 +-
 .../darkfish/_sidebar_table_of_contents.rhtml |  4 +-
 .../generator/template/darkfish/index.rhtml   |  2 +-
 4 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 2184962148..279e5214d6 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -318,10 +318,8 @@ def generate_index
 
     render_template template_file, out_file do |io|
       here = binding
-      # suppress 1.9.3 warning
       here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      # some partials rely on the presence of current variable to render
-      here.local_variable_set(:current, @main_page)
+      here.local_variable_set(:target, @main_page)
       here
     end
   rescue => e
@@ -336,7 +334,7 @@ def generate_index
   # Generates a class file for +klass+
 
   def generate_class klass, template_file = nil
-    current = klass
+    target = klass
 
     template_file ||= @template_dir + 'class.rhtml'
 
@@ -348,16 +346,15 @@ def generate_class klass, template_file = nil
 
     asset_rel_prefix = rel_prefix + @asset_rel_path
 
-    breadcrumb = # used in templates
-    breadcrumb = generate_nesting_namespaces_breadcrumb(current, rel_prefix)
+    breadcrumb = generate_nesting_namespaces_breadcrumb(target, rel_prefix)
 
     @title = "#{klass.type} #{klass.full_name} - #{@options.title}"
 
     debug_msg "  rendering #{out_file}"
     render_template template_file, out_file do |io|
       here = binding
-      # suppress 1.9.3 warning
       here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
+      here.local_variable_set(:breadcrumb, breadcrumb)
       here
     end
   end
@@ -372,16 +369,16 @@ def generate_class_files
     return unless template_file.exist?
     debug_msg "Generating class documentation in #{@outputdir}"
 
-    current = nil
+    target = nil
 
     @classes.each do |klass|
-      current = klass
+      target = klass
 
       generate_class klass, template_file
     end
   rescue => e
     error = RDoc::Error.new \
-      "error generating #{current.path}: #{e.message} (#{e.class})"
+      "error generating #{target.path}: #{e.message} (#{e.class})"
     error.set_backtrace e.backtrace
 
     raise error
@@ -404,10 +401,10 @@ def generate_file_files
     debug_msg "Generating file documentation in #{@outputdir}"
 
     out_file = nil
-    current = nil
+    target = nil
 
     @files.each do |file|
-      current = file
+      target = file
 
       if file.text? and page_file.exist? then
         generate_page file
@@ -440,9 +437,8 @@ def generate_file_files
 
       render_template template_file, out_file do |io|
         here = binding
-        # suppress 1.9.3 warning
         here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-        here.local_variable_set(:current, current)
+        here.local_variable_set(:target, target)
         here
       end
     end
@@ -466,7 +462,7 @@ def generate_page file
     search_index_rel_prefix = rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output
 
-    current          = file
+    target = file
     asset_rel_prefix = rel_prefix + @asset_rel_path
 
     @title = "#{file.page_name} - #{@options.title}"
@@ -474,8 +470,7 @@ def generate_page file
     debug_msg "  rendering #{out_file}"
     render_template template_file, out_file do |io|
       here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:current, current)
+      here.local_variable_set(:target, target)
       here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
       here
     end
@@ -500,7 +495,6 @@ def generate_servlet_not_found message
 
     render_template template_file do |io|
       here = binding
-      # suppress 1.9.3 warning
       here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
       here
     end
@@ -557,7 +551,6 @@ def generate_table_of_contents
 
     render_template template_file, out_file do |io|
       here = binding
-      # suppress 1.9.3 warning
       here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
       here
     end
@@ -738,15 +731,15 @@ def excerpt(comment)
     extracted_text[0...150].gsub(/\n/, " ").squeeze(" ")
   end
 
-  def generate_table_from_the_current_object(current)
-    return '' if current.nil?
+  def generate_table_from_target(target)
+    return '' if target.nil?
     comment =
-      if current.respond_to? :comment_location then
-        current.comment_location
+      if target.respond_to? :comment_location then
+        target.comment_location
       else
-        current.comment
+        target.comment
       end
-    current.parse(comment).table_of_contents.dup
+    target.parse(comment).table_of_contents.dup
   end
 
   def generate_ancestor_list(ancestors, klass)
@@ -813,10 +806,10 @@ def generate_sidebar_link(name, path, rel_prefix)
     %(<a href="#{rel_prefix}/#{path}">#{name}</a>)
   end
 
-  def generate_pages_index_content(page_files, rel_prefix, current)
+  def generate_pages_index_content(page_files, rel_prefix, target)
     return '' if page_files.empty?
 
-    dir = current&.full_name&.[](/\A[^\/]+(?=\/)/) || current&.page_name
+    dir = target&.full_name&.[](/\A[^\/]+(?=\/)/) || target&.page_name
     grouped_files = page_files.group_by { |f| f.full_name[/\A[^\/]+(?=\/)/] || f.page_name }
 
     traverse_tree(grouped_files) do |name, files|
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
index 1ea53f14a3..a6b82c84e5 100644
--- a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
@@ -2,6 +2,6 @@
 <div id="fileindex-section" class="nav-section">
   <h3>Pages</h3>
 
-  <%= generate_pages_index_content(@page_files, rel_prefix, current) %>
+  <%= generate_pages_index_content(@page_files, rel_prefix, target) %>
 </div>
 <%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
index 192869e013..f500e45bd3 100644
--- a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
@@ -1,10 +1,10 @@
-<%- table = generate_table_from_the_current_object(current) -%>
+<%- table = generate_table_from_target(target) -%>
 <%- if table.length > 1 %>
 <div class="nav-section">
   <h3>Table of Contents</h3>
 
     <%- display_link = proc do |heading| -%>
-      <a href="#<%= heading.label current %>"><%= heading.plain_html %></a>
+      <a href="#<%= heading.label target %>"><%= heading.plain_html %></a>
     <%- end -%>
 
     <%- list_siblings = proc do -%>
diff --git a/lib/rdoc/generator/template/darkfish/index.rhtml b/lib/rdoc/generator/template/darkfish/index.rhtml
index beaab9570f..e7545cb36e 100644
--- a/lib/rdoc/generator/template/darkfish/index.rhtml
+++ b/lib/rdoc/generator/template/darkfish/index.rhtml
@@ -7,7 +7,7 @@
     <%= render '_sidebar_search.rhtml' %>
   </div>
 
-  <%= render '_sidebar_table_of_contents.rhtml' if defined?(current) %>
+  <%= render '_sidebar_table_of_contents.rhtml' %>
   <%= render '_sidebar_pages.rhtml' %>
   <%= render '_sidebar_classes.rhtml' %>
 

From 5d0f26e5c02ff7e3b9905cbab4353e0b6aa2e69b Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 27 Feb 2025 13:17:03 +0000
Subject: [PATCH 06/12] Remove unnecessary class page sidebar partial
 extraction

---
 .../template/darkfish/_sidebar_extends.rhtml  | 15 ----
 .../template/darkfish/_sidebar_includes.rhtml | 15 ----
 .../template/darkfish/_sidebar_methods.rhtml  | 21 -----
 .../template/darkfish/_sidebar_parent.rhtml   |  6 --
 .../template/darkfish/_sidebar_sections.rhtml | 11 ---
 .../generator/template/darkfish/class.rhtml   | 78 +++++++++++++++++--
 6 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
 delete mode 100644 lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
 delete mode 100644 lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
 delete mode 100644 lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
 delete mode 100644 lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml

diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
deleted file mode 100644
index 7602076c96..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<%- unless klass.extends.empty? then %>
-<div id="extends-section" class="nav-section">
-  <h3>Extended With Modules</h3>
-
-  <ul class="link-list">
-    <%- klass.each_extend do |ext| -%>
-  <%- unless String === ext.module then -%>
-    <li><a class="extend" href="<%= klass.aref_to ext.module.path %>"><%= ext.module.full_name %></a>
-  <%- else -%>
-    <li><span class="extend"><%= ext.name %></span>
-  <%- end -%>
-  <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
deleted file mode 100644
index 5b600e5975..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<%- unless klass.includes.empty? then %>
-<div id="includes-section" class="nav-section">
-  <h3>Included Modules</h3>
-
-  <ul class="link-list">
-  <%- klass.each_include do |inc| -%>
-  <%- unless String === inc.module then -%>
-    <li><a class="include" href="<%= klass.aref_to inc.module.path %>"><%= inc.module.full_name %></a>
-  <%- else -%>
-    <li><span class="include"><%= inc.name %></span>
-  <%- end -%>
-  <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
deleted file mode 100644
index d09216a0f6..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<% if (class_methods = klass.class_method_list.sort).any? %>
-  <div class="nav-section">
-    <h3>Class Methods</h3>
-    <ul class="link-list" role="directory">
-      <%- class_methods.each do |meth| -%>
-      <li <%- if meth.calls_super %>class="calls-super" <%- end %>><a href="#<%= meth.aref %>"><%= h meth.name -%></a></li>
-      <%- end -%>
-    </ul>
-  </div>
-<% end %>
-
-<% if (instance_methods = klass.instance_methods.sort).any? %>
-  <div class="nav-section">
-    <h3>Instance Methods</h3>
-    <ul class="link-list" role="directory">
-      <%- instance_methods.each do |meth| -%>
-      <li <%- if meth.calls_super %>class="calls-super" <%- end %>><a href="#<%= meth.aref %>"><%= h meth.name -%></a></li>
-      <%- end -%>
-    </ul>
-  </div>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
deleted file mode 100644
index 6808b2bf87..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<%- if klass.type == 'class' && (ancestors = klass.super_classes).any? -%>
-<div id="parent-class-section" class="nav-section">
-  <h3>Ancestors</h3>
-  <%= generate_ancestor_list(ancestors, klass) %>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
deleted file mode 100644
index 6dcd2ae81f..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%- unless klass.sections.length == 1 then %>
-<div id="sections-section" class="nav-section">
-  <h3>Sections</h3>
-
-  <ul class="link-list" role="directory">
-    <%- klass.sort_sections.each do |section| -%>
-      <li><a href="#<%= section.aref %>"><%= h section.title %></a></li>
-    <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
index 628945d886..289750d660 100644
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ b/lib/rdoc/generator/template/darkfish/class.rhtml
@@ -8,11 +8,79 @@
   </div>
 
   <%= render '_sidebar_table_of_contents.rhtml' %>
-  <%= render '_sidebar_sections.rhtml' %>
-  <%= render '_sidebar_parent.rhtml' %>
-  <%= render '_sidebar_includes.rhtml' %>
-  <%= render '_sidebar_extends.rhtml' %>
-  <%= render '_sidebar_methods.rhtml' %>
+
+  <%- unless klass.sections.length == 1 then %>
+  <div id="sections-section" class="nav-section">
+    <h3>Sections</h3>
+
+    <ul class="link-list" role="directory">
+      <%- klass.sort_sections.each do |section| -%>
+        <li><a href="#<%= section.aref %>"><%= h section.title %></a></li>
+      <%- end -%>
+    </ul>
+  </div>
+  <%- end -%>
+
+  <%- if klass.type == 'class' && (ancestors = klass.super_classes).any? -%>
+  <div id="parent-class-section" class="nav-section">
+    <h3>Ancestors</h3>
+    <%= generate_ancestor_list(ancestors, klass) %>
+  </div>
+  <%- end -%>
+
+  <%- unless klass.includes.empty? then %>
+  <div id="includes-section" class="nav-section">
+    <h3>Included Modules</h3>
+
+    <ul class="link-list">
+    <%- klass.each_include do |inc| -%>
+    <%- unless String === inc.module then -%>
+      <li><a class="include" href="<%= klass.aref_to inc.module.path %>"><%= inc.module.full_name %></a>
+    <%- else -%>
+      <li><span class="include"><%= inc.name %></span>
+    <%- end -%>
+    <%- end -%>
+    </ul>
+  </div>
+  <%- end -%>
+
+  <%- unless klass.extends.empty? then %>
+  <div id="extends-section" class="nav-section">
+    <h3>Extended With Modules</h3>
+
+    <ul class="link-list">
+      <%- klass.each_extend do |ext| -%>
+    <%- unless String === ext.module then -%>
+      <li><a class="extend" href="<%= klass.aref_to ext.module.path %>"><%= ext.module.full_name %></a>
+    <%- else -%>
+      <li><span class="extend"><%= ext.name %></span>
+    <%- end -%>
+    <%- end -%>
+    </ul>
+  </div>
+  <%- end -%>
+
+  <% if (class_methods = klass.class_method_list.sort).any? %>
+    <div class="nav-section">
+      <h3>Class Methods</h3>
+      <ul class="link-list" role="directory">
+        <%- class_methods.each do |meth| -%>
+        <li <%- if meth.calls_super %>class="calls-super" <%- end %>><a href="#<%= meth.aref %>"><%= h meth.name -%></a></li>
+        <%- end -%>
+      </ul>
+    </div>
+  <% end %>
+
+  <% if (instance_methods = klass.instance_methods.sort).any? %>
+  <div class="nav-section">
+    <h3>Instance Methods</h3>
+    <ul class="link-list" role="directory">
+      <%- instance_methods.each do |meth| -%>
+      <li <%- if meth.calls_super %>class="calls-super" <%- end %>><a href="#<%= meth.aref %>"><%= h meth.name -%></a></li>
+      <%- end -%>
+    </ul>
+  </div>
+  <% end %>
 
   <%= render '_footer.rhtml' %>
 </nav>

From a5f0bf5bc35c816589d26bedf752426715d40f10 Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 27 Feb 2025 13:28:10 +0000
Subject: [PATCH 07/12] Simplify class page

---
 lib/rdoc/generator/darkfish.rb                | 11 +++++++
 .../generator/template/darkfish/class.rhtml   | 32 +++++++++----------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 279e5214d6..cf656aace1 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -350,11 +350,22 @@ def generate_class klass, template_file = nil
 
     @title = "#{klass.type} #{klass.full_name} - #{@options.title}"
 
+    klass_class_methods = klass.class_method_list.sort
+    klass_instance_methods = klass.instance_methods.sort
+    klass_extends = klass.extends
+    klass_includes = klass.includes
+    klass_sections = klass.sort_sections
+
     debug_msg "  rendering #{out_file}"
     render_template template_file, out_file do |io|
       here = binding
       here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
       here.local_variable_set(:breadcrumb, breadcrumb)
+      here.local_variable_set(:klass_class_methods, klass_class_methods)
+      here.local_variable_set(:klass_instance_methods, klass_instance_methods)
+      here.local_variable_set(:klass_extends, klass_extends)
+      here.local_variable_set(:klass_includes, klass_includes)
+      here.local_variable_set(:klass_sections, klass_sections)
       here
     end
   end
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
index 289750d660..2c6b4238fa 100644
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ b/lib/rdoc/generator/template/darkfish/class.rhtml
@@ -9,12 +9,12 @@
 
   <%= render '_sidebar_table_of_contents.rhtml' %>
 
-  <%- unless klass.sections.length == 1 then %>
+  <%- if klass_sections.any? %>
   <div id="sections-section" class="nav-section">
     <h3>Sections</h3>
 
     <ul class="link-list" role="directory">
-      <%- klass.sort_sections.each do |section| -%>
+      <%- klass_sections.each do |section| -%>
         <li><a href="#<%= section.aref %>"><%= h section.title %></a></li>
       <%- end -%>
     </ul>
@@ -28,54 +28,54 @@
   </div>
   <%- end -%>
 
-  <%- unless klass.includes.empty? then %>
+  <%- if klass_includes.any? %>
   <div id="includes-section" class="nav-section">
     <h3>Included Modules</h3>
 
     <ul class="link-list">
-    <%- klass.each_include do |inc| -%>
-    <%- unless String === inc.module then -%>
+    <%- klass_includes.each do |inc| -%>
+      <%- unless String === inc.module -%>
       <li><a class="include" href="<%= klass.aref_to inc.module.path %>"><%= inc.module.full_name %></a>
-    <%- else -%>
+      <%- else -%>
       <li><span class="include"><%= inc.name %></span>
-    <%- end -%>
+      <%- end -%>
     <%- end -%>
     </ul>
   </div>
   <%- end -%>
 
-  <%- unless klass.extends.empty? then %>
+  <%- if klass_extends.any? %>
   <div id="extends-section" class="nav-section">
     <h3>Extended With Modules</h3>
 
     <ul class="link-list">
-      <%- klass.each_extend do |ext| -%>
-    <%- unless String === ext.module then -%>
+    <%- klass_extends.each do |ext| -%>
+      <%- unless String === ext.module -%>
       <li><a class="extend" href="<%= klass.aref_to ext.module.path %>"><%= ext.module.full_name %></a>
-    <%- else -%>
+      <%- else -%>
       <li><span class="extend"><%= ext.name %></span>
-    <%- end -%>
+      <%- end -%>
     <%- end -%>
     </ul>
   </div>
   <%- end -%>
 
-  <% if (class_methods = klass.class_method_list.sort).any? %>
+  <% if klass_class_methods.any? %>
     <div class="nav-section">
       <h3>Class Methods</h3>
       <ul class="link-list" role="directory">
-        <%- class_methods.each do |meth| -%>
+        <%- klass_class_methods.each do |meth| -%>
         <li <%- if meth.calls_super %>class="calls-super" <%- end %>><a href="#<%= meth.aref %>"><%= h meth.name -%></a></li>
         <%- end -%>
       </ul>
     </div>
   <% end %>
 
-  <% if (instance_methods = klass.instance_methods.sort).any? %>
+  <% if klass_instance_methods.any? %>
   <div class="nav-section">
     <h3>Instance Methods</h3>
     <ul class="link-list" role="directory">
-      <%- instance_methods.each do |meth| -%>
+      <%- klass_instance_methods.each do |meth| -%>
       <li <%- if meth.calls_super %>class="calls-super" <%- end %>><a href="#<%= meth.aref %>"><%= h meth.name -%></a></li>
       <%- end -%>
     </ul>

From 4414b4f81ee8667b82a8e89e0637ef316250b969 Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 27 Feb 2025 13:40:33 +0000
Subject: [PATCH 08/12] Remove unnecessary ivars from darkfish

---
 lib/rdoc/generator/darkfish.rb                     | 14 --------------
 .../template/darkfish/table_of_contents.rhtml      |  2 +-
 test/rdoc/test_rdoc_generator_darkfish.rb          |  2 --
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index cf656aace1..6bf71e7e41 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -128,16 +128,6 @@ class RDoc::Generator::Darkfish
 
   attr_reader :json_index
 
-  ##
-  # Methods to be displayed by this generator
-
-  attr_reader :methods
-
-  ##
-  # Sorted list of classes and modules to be displayed by this generator
-
-  attr_reader :modsort
-
   ##
   # The RDoc::Store that is the source of the generated content
 
@@ -170,8 +160,6 @@ def initialize store, options
     @classes = nil
     @context = nil
     @files   = nil
-    @methods = nil
-    @modsort = nil
 
     @json_index = RDoc::Generator::JsonIndex.new self, options
   end
@@ -602,8 +590,6 @@ def setup
 
     @classes = @store.all_classes_and_modules.sort
     @files   = @store.all_files.sort
-    @methods = @classes.flat_map { |m| m.method_list }.sort
-    @modsort = get_sorted_module_list @classes
     @page_files = @files.select { |f| f.text? }
   end
 
diff --git a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
index 9860e3683e..a23ab1c38f 100644
--- a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
+++ b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
@@ -36,7 +36,7 @@
 
 <h2 id="classes">Classes and Modules</h2>
 <ul>
-<%- @modsort.each do |klass| -%>
+<%- get_sorted_module_list(@classes).each do |klass| -%>
   <li class="<%= klass.type %>">
     <a href="<%= klass.path %>"><%= klass.full_name %></a>
 <%- table = []
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
index ed84543ee1..a465b6f6c9 100644
--- a/test/rdoc/test_rdoc_generator_darkfish.rb
+++ b/test/rdoc/test_rdoc_generator_darkfish.rb
@@ -300,8 +300,6 @@ def test_setup
     assert_equal [@klass_alias, @ignored, @klass, @object],
                  @g.classes.sort_by { |klass| klass.full_name }
     assert_equal [@top_level],                           @g.files
-    assert_equal [@meth, @meth, @meth_bang, @meth_bang, @meth_with_html_tag_yield, @meth_with_html_tag_yield], @g.methods
-    assert_equal [@klass_alias, @klass, @object], @g.modsort
   end
 
   def test_template_for

From 1d8fff1f78d65b607c25f0bbbdc420e028307a97 Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Sat, 1 Mar 2025 22:02:42 +0000
Subject: [PATCH 09/12] Reuse @classes ivar in ToCs page

---
 lib/rdoc/generator/darkfish.rb                         | 10 ----------
 .../template/darkfish/table_of_contents.rhtml          |  6 ++----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 6bf71e7e41..bd4e570c15 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -275,16 +275,6 @@ def copy_static
     end
   end
 
-  ##
-  # Return a list of the documented modules sorted by salience first, then
-  # by name.
-
-  def get_sorted_module_list classes
-    classes.select do |klass|
-      klass.display?
-    end.sort
-  end
-
   ##
   # Generate an index page which lists all the classes which are documented.
 
diff --git a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
index a23ab1c38f..a6017d810a 100644
--- a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
+++ b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
@@ -36,7 +36,7 @@
 
 <h2 id="classes">Classes and Modules</h2>
 <ul>
-<%- get_sorted_module_list(@classes).each do |klass| -%>
+<%- @classes.select(&:display?).each do |klass| -%>
   <li class="<%= klass.type %>">
     <a href="<%= klass.path %>"><%= klass.full_name %></a>
 <%- table = []
@@ -57,9 +57,7 @@
 
 <h2 id="methods">Methods</h2>
 <ul>
-<%- @store.all_classes_and_modules.flat_map do |mod|
-     mod.method_list
-   end.sort.each do |method| %>
+<%- @classes.flat_map(&:method_list).sort.each do |method| %>
   <li class="method">
     <a href="<%= method.path %>"><%= h method.pretty_name %></a>
     &mdash;

From a8dee5790096da7d3cf50244aec89d72472b1f46 Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Sat, 1 Mar 2025 23:15:21 +0000
Subject: [PATCH 10/12] Avoid using block binding to capture template variables

Under the current implementation, the template variables are captured
through the `render_template` method's block. This makes it hard to
understand if a variable is intended to be used in the template or not.

This commit changes the `render_template` method to require passing
a hash of local variables to the template. This makes the variable
scope explicit and easier to reason about.
---
 lib/rdoc/generator/darkfish.rb | 95 ++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 45 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index bd4e570c15..5006ce6145 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -294,12 +294,11 @@ def generate_index
     @title = @options.title
     @main_page = @files.find { |f| f.full_name == @options.main_page }
 
-    render_template template_file, out_file do |io|
-      here = binding
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here.local_variable_set(:target, @main_page)
-      here
-    end
+    render_template template_file, out_file: out_file, locals: {
+      rel_prefix: rel_prefix,
+      asset_rel_prefix: asset_rel_prefix,
+      target: @main_page,
+    }
   rescue => e
     error = RDoc::Error.new \
       "error generating index.html: #{e.message} (#{e.class})"
@@ -335,17 +334,18 @@ def generate_class klass, template_file = nil
     klass_sections = klass.sort_sections
 
     debug_msg "  rendering #{out_file}"
-    render_template template_file, out_file do |io|
-      here = binding
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here.local_variable_set(:breadcrumb, breadcrumb)
-      here.local_variable_set(:klass_class_methods, klass_class_methods)
-      here.local_variable_set(:klass_instance_methods, klass_instance_methods)
-      here.local_variable_set(:klass_extends, klass_extends)
-      here.local_variable_set(:klass_includes, klass_includes)
-      here.local_variable_set(:klass_sections, klass_sections)
-      here
-    end
+    render_template template_file, out_file: out_file, locals: {
+      asset_rel_prefix: asset_rel_prefix,
+      rel_prefix: rel_prefix,
+      target: target,
+      klass: klass,
+      breadcrumb: breadcrumb,
+      klass_class_methods: klass_class_methods,
+      klass_instance_methods: klass_instance_methods,
+      klass_extends: klass_extends,
+      klass_includes: klass_includes,
+      klass_sections: klass_sections,
+    }
   end
 
   ##
@@ -424,12 +424,12 @@ def generate_file_files
       @title += " - #{@options.title}"
       template_file ||= filepage_file
 
-      render_template template_file, out_file do |io|
-        here = binding
-        here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-        here.local_variable_set(:target, target)
-        here
-      end
+      render_template template_file, out_file: out_file, locals: {
+        rel_prefix: rel_prefix,
+        asset_rel_prefix: asset_rel_prefix,
+        file: file,
+        target: target,
+      }
     end
   rescue => e
     error =
@@ -457,12 +457,12 @@ def generate_page file
     @title = "#{file.page_name} - #{@options.title}"
 
     debug_msg "  rendering #{out_file}"
-    render_template template_file, out_file do |io|
-      here = binding
-      here.local_variable_set(:target, target)
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
+    render_template template_file, out_file: out_file, locals: {
+      file: file,
+      target: target,
+      asset_rel_prefix: asset_rel_prefix,
+      rel_prefix: rel_prefix,
+    }
   end
 
   ##
@@ -482,11 +482,11 @@ def generate_servlet_not_found message
 
     @title = 'Not Found'
 
-    render_template template_file do |io|
-      here = binding
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
+    render_template template_file, locals: {
+      asset_rel_prefix: asset_rel_prefix,
+      rel_prefix: rel_prefix,
+      message: message
+    }
   rescue => e
     error = RDoc::Error.new \
       "error generating servlet_not_found: #{e.message} (#{e.class})"
@@ -511,7 +511,11 @@ def generate_servlet_root installed
 
     @title = 'Local RDoc Documentation'
 
-    render_template template_file do |io| binding end
+    render_template template_file, locals: {
+      asset_rel_prefix: asset_rel_prefix,
+      rel_prefix: rel_prefix,
+      installed: installed
+    }
   rescue => e
     error = RDoc::Error.new \
       "error generating servlet_root: #{e.message} (#{e.class})"
@@ -538,11 +542,10 @@ def generate_table_of_contents
 
     @title = "Table of Contents - #{@options.title}"
 
-    render_template template_file, out_file do |io|
-      here = binding
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
+    render_template template_file, out_file: out_file, locals: {
+      rel_prefix: rel_prefix,
+      asset_rel_prefix: asset_rel_prefix,
+    }
   rescue => e
     error = RDoc::Error.new \
       "error generating table_of_contents.html: #{e.message} (#{e.class})"
@@ -628,26 +631,28 @@ def render file_name
   #
   # An io will be yielded which must be captured by binding in the caller.
 
-  def render_template template_file, out_file = nil # :yield: io
+  def render_template template_file, out_file: nil, locals: {}
     io_output = out_file && !@dry_run && @file_output
     erb_klass = io_output ? RDoc::ERBIO : ERB
 
     template = template_for template_file, true, erb_klass
 
+    @context = binding
+    locals.each do |key, value|
+      @context.local_variable_set(key, value)
+    end
+
     if io_output then
       debug_msg "Outputting to %s" % [out_file.expand_path]
 
       out_file.dirname.mkpath
       out_file.open 'w', 0644 do |io|
         io.set_encoding @options.encoding
-
-        @context = yield io
+        @context.local_variable_set(:io, io)
 
         template_result template, @context, template_file
       end
     else
-      @context = yield nil
-
       output = template_result template, @context, template_file
 
       debug_msg "  would have written %d characters to %s" % [

From 56d7b6364f2d79067ceb4b6300bfea4610f4b616 Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Sat, 1 Mar 2025 23:19:47 +0000
Subject: [PATCH 11/12] Remove unused search_index_rel_prefix local

---
 lib/rdoc/generator/darkfish.rb | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 5006ce6145..5414dbc133 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -286,9 +286,6 @@ def generate_index
 
     out_file = @base_dir + @options.op_dir + 'index.html'
     rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
-
     asset_rel_prefix = rel_prefix + @asset_rel_path
 
     @title = @options.title
@@ -318,8 +315,6 @@ def generate_class klass, template_file = nil
     debug_msg "  working on %s (%s)" % [klass.full_name, klass.path]
     out_file   = @outputdir + klass.path
     rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
 
     asset_rel_prefix = rel_prefix + @asset_rel_path
 
@@ -404,8 +399,6 @@ def generate_file_files
       out_file = @outputdir + file.path
       debug_msg "  working on %s (%s)" % [file.full_name, out_file]
       rel_prefix = @outputdir.relative_path_from out_file.dirname
-      search_index_rel_prefix = rel_prefix
-      search_index_rel_prefix += @asset_rel_path if @file_output
 
       asset_rel_prefix = rel_prefix + @asset_rel_path
 
@@ -448,8 +441,6 @@ def generate_page file
     out_file = @outputdir + file.path
     debug_msg "  working on %s (%s)" % [file.full_name, out_file]
     rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
 
     target = file
     asset_rel_prefix = rel_prefix + @asset_rel_path
@@ -475,8 +466,6 @@ def generate_servlet_not_found message
     debug_msg "Rendering the servlet 404 Not Found page..."
 
     rel_prefix = rel_prefix = ''
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
 
     asset_rel_prefix = ''
 
@@ -506,8 +495,6 @@ def generate_servlet_root installed
 
     rel_prefix = '.'
     asset_rel_prefix = rel_prefix
-    search_index_rel_prefix = asset_rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
 
     @title = 'Local RDoc Documentation'
 
@@ -535,8 +522,6 @@ def generate_table_of_contents
 
     out_file = @outputdir + 'table_of_contents.html'
     rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
 
     asset_rel_prefix = rel_prefix + @asset_rel_path
 

From 8373d70946947637e2761600fc748b34f132c7cb Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Sat, 1 Mar 2025 23:25:35 +0000
Subject: [PATCH 12/12] Simplify rel_prefix locasls declaration

---
 lib/rdoc/generator/darkfish.rb | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 5414dbc133..b843ce8db6 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -286,14 +286,13 @@ def generate_index
 
     out_file = @base_dir + @options.op_dir + 'index.html'
     rel_prefix = @outputdir.relative_path_from out_file.dirname
-    asset_rel_prefix = rel_prefix + @asset_rel_path
 
     @title = @options.title
     @main_page = @files.find { |f| f.full_name == @options.main_page }
 
     render_template template_file, out_file: out_file, locals: {
       rel_prefix: rel_prefix,
-      asset_rel_prefix: asset_rel_prefix,
+      asset_rel_prefix: rel_prefix + @asset_rel_path,
       target: @main_page,
     }
   rescue => e
@@ -316,8 +315,6 @@ def generate_class klass, template_file = nil
     out_file   = @outputdir + klass.path
     rel_prefix = @outputdir.relative_path_from out_file.dirname
 
-    asset_rel_prefix = rel_prefix + @asset_rel_path
-
     breadcrumb = generate_nesting_namespaces_breadcrumb(target, rel_prefix)
 
     @title = "#{klass.type} #{klass.full_name} - #{@options.title}"
@@ -330,7 +327,7 @@ def generate_class klass, template_file = nil
 
     debug_msg "  rendering #{out_file}"
     render_template template_file, out_file: out_file, locals: {
-      asset_rel_prefix: asset_rel_prefix,
+      asset_rel_prefix: rel_prefix + @asset_rel_path,
       rel_prefix: rel_prefix,
       target: target,
       klass: klass,
@@ -400,8 +397,6 @@ def generate_file_files
       debug_msg "  working on %s (%s)" % [file.full_name, out_file]
       rel_prefix = @outputdir.relative_path_from out_file.dirname
 
-      asset_rel_prefix = rel_prefix + @asset_rel_path
-
       unless filepage_file then
         if file.text? then
           next unless page_file.exist?
@@ -419,7 +414,7 @@ def generate_file_files
 
       render_template template_file, out_file: out_file, locals: {
         rel_prefix: rel_prefix,
-        asset_rel_prefix: asset_rel_prefix,
+        asset_rel_prefix: rel_prefix + @asset_rel_path,
         file: file,
         target: target,
       }
@@ -443,7 +438,6 @@ def generate_page file
     rel_prefix = @outputdir.relative_path_from out_file.dirname
 
     target = file
-    asset_rel_prefix = rel_prefix + @asset_rel_path
 
     @title = "#{file.page_name} - #{@options.title}"
 
@@ -451,7 +445,7 @@ def generate_page file
     render_template template_file, out_file: out_file, locals: {
       file: file,
       target: target,
-      asset_rel_prefix: asset_rel_prefix,
+      asset_rel_prefix: rel_prefix + @asset_rel_path,
       rel_prefix: rel_prefix,
     }
   end
@@ -465,15 +459,11 @@ def generate_servlet_not_found message
 
     debug_msg "Rendering the servlet 404 Not Found page..."
 
-    rel_prefix = rel_prefix = ''
-
-    asset_rel_prefix = ''
-
     @title = 'Not Found'
 
     render_template template_file, locals: {
-      asset_rel_prefix: asset_rel_prefix,
-      rel_prefix: rel_prefix,
+      asset_rel_prefix: '',
+      rel_prefix: '',
       message: message
     }
   rescue => e
@@ -493,14 +483,11 @@ def generate_servlet_root installed
 
     debug_msg 'Rendering the servlet root page...'
 
-    rel_prefix = '.'
-    asset_rel_prefix = rel_prefix
-
     @title = 'Local RDoc Documentation'
 
     render_template template_file, locals: {
-      asset_rel_prefix: asset_rel_prefix,
-      rel_prefix: rel_prefix,
+      asset_rel_prefix: '.',
+      rel_prefix: '.',
       installed: installed
     }
   rescue => e
@@ -523,13 +510,11 @@ def generate_table_of_contents
     out_file = @outputdir + 'table_of_contents.html'
     rel_prefix = @outputdir.relative_path_from out_file.dirname
 
-    asset_rel_prefix = rel_prefix + @asset_rel_path
-
     @title = "Table of Contents - #{@options.title}"
 
     render_template template_file, out_file: out_file, locals: {
       rel_prefix: rel_prefix,
-      asset_rel_prefix: asset_rel_prefix,
+      asset_rel_prefix: rel_prefix + @asset_rel_path,
     }
   rescue => e
     error = RDoc::Error.new \