diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/rdoc/code_objects.rb | 23 |
2 files changed, 24 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Tue Dec 30 12:30:30 2003 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): If a + class and a method have the same name, finding Xxx.abc was trying + to find 'abc' in method 'Xxx', not class 'Xxx'. + + Tue Dec 30 08:32:32 2003 Dave Thomas <dave@pragprog.com> * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method): diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb index bfacff1321..f5b4e81853 100644 --- a/lib/rdoc/code_objects.rb +++ b/lib/rdoc/code_objects.rb @@ -320,17 +320,28 @@ module RDoc end end else - result = find_local_symbol(symbol) - if result.nil? - if symbol =~ /^[A-Z]/ - result = parent - while result && result.name != symbol - result = result.parent + # if a method is specified, then we're definitely looking for + # a module, otherwise it could be any symbol + if method + result = find_module_named(symbol) + else + result = find_local_symbol(symbol) + if result.nil? + if symbol =~ /^[A-Z]/ + result = parent + while result && result.name != symbol + result = result.parent + end end end end end if result && method + if !result.respond_to?(:find_local_symbol) + p result.name + p method + fail + end result = result.find_local_symbol(method) end result |