Skip to content

Fix comment_location for merged ClassModule #1531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tompng wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

Fix comment_location for merged ClassModule #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/rdoc/code_object/class_module.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,12 @@ def merge(class_module)
document = document.merge other_document

@comment = RDoc::Comment.from_document(document)
@comment_location = document

@comment_location = if document.parts.first.is_a?(RDoc::Markup::Document)
document.parts.map { |doc| [doc, doc.file] }
else
[[document, document.file]]
end
end

cm = class_module
Expand Down
6 changes: 6 additions & 0 deletions test/rdoc/code_object/class_module_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,8 +655,10 @@ def test_merge
tl = @store.add_file 'one.rb'
p1 = tl.add_class RDoc::NormalClass, 'Parent'
c1 = p1.add_class RDoc::NormalClass, 'Klass'
c1.add_comment 'comment1', tl

c2 = RDoc::NormalClass.new 'Klass'
c2.add_comment 'comment2', tl

c2.merge c1

Expand All @@ -665,6 +667,10 @@ def test_merge

assert c1.current_section, 'original current_section'
assert c2.current_section, 'merged current_section'

comment, location = c2.comment_location.first
assert_kind_of RDoc::Markup::Document, comment
assert_equal tl.relative_name, location
end

def test_merge_attributes
Expand Down