Fix sections not displaying their text

There were a few things wrong that made this not work:
* Formatting expects `@comment` but there is only `@comments`
* The parse method used for marshaling overwrote the markdown parse method
* `@store` was not present, which the formatter requires

Author: Earlopain

lib/rdoc/code_object/context.rb

@@ -587,7 +587,7 @@ def add_section(title, comment = nil)
     if section = @sections[title] then
       section.add_comment comment if comment
     else
-      section = Section.new self, title, comment
+      section = Section.new self, title, comment, @store
       @sections[title] = section
     end
 

lib/rdoc/code_object/context/section.rb

@@ -37,12 +37,18 @@ class RDoc::Context::Section
 
   attr_reader :title
 
+  ##
+  # The RDoc::Store for this object.
+
+  attr_reader :store
+
   ##
   # Creates a new section with +title+ and +comment+
 
-  def initialize(parent, title, comment)
+  def initialize(parent, title, comment, store = nil)
     @parent = parent
     @title = title ? title.strip : title
+    @store = store
 
     @comments = []
 
@@ -67,6 +73,7 @@ def add_comment(comment)
       extracted_comment = extract_comment(c)
       @comments << extracted_comment unless extracted_comment.empty?
     end
+    set_comment!
   end
 
   ##
@@ -151,7 +158,7 @@ def marshal_dump
     [
       MARSHAL_VERSION,
       @title,
-      parse,
+      to_document,
     ]
   end
 
@@ -163,13 +170,14 @@ def marshal_load(array)
 
     @title    = array[1]
     @comments = array[2].parts.map { |doc| RDoc::Comment.from_document(doc) }
+    set_comment!
   end
 
   ##
   # Parses +comment_location+ into an RDoc::Markup::Document composed of
   # multiple RDoc::Markup::Documents with their file set.
 
-  def parse
+  def to_document
     RDoc::Markup::Document.new(*@comments.map(&:parse))
   end
 
@@ -182,6 +190,12 @@ def plain_html
     @title || 'Top Section'
   end
 
+  def markup(comment)
+    # Don't try to format the default section. We don't have a store yet.
+    return "" if comment.nil? || comment.empty?
+    super(normalize_comment(comment.text))
+  end
+
   ##
   # Removes a comment from this section if it is from the same file as
   # +comment+
@@ -190,6 +204,18 @@ def remove_comment(target_comment)
     @comments.delete_if do |stored_comment|
       stored_comment.file == target_comment.file
     end
+    set_comment!
   end
 
+  private
+
+  def set_comment!
+    if @comments.any?
+      donor = @comments[0]
+      @language = donor.language
+      @comment = RDoc::Comment.new(@comments.map(&:text).join, donor.location)
+    else
+      @comment = nil
+    end
+  end
 end

test/rdoc/rdoc_context_section_test.rb

@@ -26,18 +26,41 @@ def test_add_comment
     s = @S.new klass, 'section', c1
 
     assert_empty s.comments
+    assert_nil s.comment
 
     s.add_comment nil
 
     assert_empty s.comments
+    assert_nil s.comment
 
     s.add_comment c2
 
     assert_equal [c2], s.comments
+    assert_equal c2, s.comment
 
     s.add_comment c3
 
     assert_equal [c2, c3], s.comments
+    assert_equal comment(c2.text + c3.text, file1), s.comment
+  end
+
+  def test_description
+    file1 = @store.add_file 'file1.rb'
+    klass = file1.add_class RDoc::NormalClass, 'Klass'
+
+
+    c1 = comment "# :section: section\n", file1, :ruby
+    c2 = comment "# hello\n",             file1, :ruby
+    c3 = comment "# <tt>world</tt>\n",             file1, :ruby
+
+    s = @S.new klass, 'section', c1, @store
+    assert_equal '', s.description
+
+    s.add_comment c2
+    assert_equal "\n<p>hello</p>\n", s.description
+
+    s.add_comment c3
+    assert_equal "\n<p>hello <code>world</code></p>\n", s.description
   end
 
   def test_aref
@@ -86,7 +109,7 @@ def test_marshal_dump
     expected = doc RDoc::Comment.new('comment', @top_level).parse
 
     assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.parse
+    assert_equal expected,  loaded.to_document
     assert_nil              loaded.parent, 'parent is set manually'
   end
 
@@ -112,7 +135,7 @@ def test_marshal_load_version_0
     expected = doc RDoc::Comment.new('comment', @top_level).parse
 
     assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.parse
+    assert_equal expected,  loaded.to_document
     assert_nil              loaded.parent, 'parent is set manually'
   end
 
@@ -139,7 +162,7 @@ def test_remove_comment_document
 
     loaded.remove_comment comment('bogus', @top_level)
 
-    assert_equal doc(other_comment.parse), loaded.parse
+    assert_equal doc(other_comment.parse), loaded.to_document
   end
 
 end