Simplify sidebar ToC's generation logic

Author: st0012

lib/rdoc/generator/darkfish.rb

@@ -323,7 +323,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
@@ -807,6 +807,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?
 

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>