summaryrefslogtreecommitdiff
path: root/lib/rdoc/ri
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rdoc/ri')
-rw-r--r--lib/rdoc/ri/driver.rb20
-rw-r--r--lib/rdoc/ri/paths.rb3
2 files changed, 7 insertions, 16 deletions
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index d3620d4817..9083f6c67a 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -657,21 +657,13 @@ Options may also be set in the 'RI' environment variable.
end
out << RDoc::Markup::Rule.new(1)
- if method.call_seq then
- call_seq = method.call_seq.chomp.split "\n"
- call_seq = call_seq.map { |line| [' ', line, "\n"] }
- out << RDoc::Markup::Verbatim.new(*call_seq.flatten)
+ if method.arglists then
+ arglists = method.arglists.chomp.split "\n"
+ arglists = arglists.map { |line| [' ', line, "\n"] }
+ out << RDoc::Markup::Verbatim.new(*arglists.flatten)
+ out << RDoc::Markup::Rule.new(1)
end
- if method.block_params then
- out << RDoc::Markup::BlankLine.new if method.call_seq
- params = "yields: #{method.block_params}"
- out << RDoc::Markup::Verbatim.new(' ', params, "\n")
- end
-
- out << RDoc::Markup::Rule.new(1) if
- method.call_seq or method.block_params
-
out << RDoc::Markup::BlankLine.new
out << method.comment
out << RDoc::Markup::BlankLine.new
@@ -793,7 +785,7 @@ Options may also be set in the 'RI' environment variable.
end
methods.each do |item|
- yield(*item)
+ yield(*item) # :yields: store, klass, ancestor, types, method
end
self
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index 8ea260891b..df12045203 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -13,8 +13,7 @@ module RDoc::RI::Paths
base = File.join RbConfig::CONFIG['ridir'], version
SYSDIR = File.join base, "system"
SITEDIR = File.join base, "site"
- HOMEDIR = (File.expand_path("~/.rdoc") rescue nil)
-
+ HOMEDIR = (File.expand_path('~/.rdoc') rescue nil)
#:startdoc:
@gemdirs = nil