kotovalexarian-likes-github
/
pry--pry
mirror of https://github.com/pry/pry.git
1
0
Fork 0
Code Releases Activity

refactored/improved show-doc code

This commit is contained in:
John Mair 2012-04-17 19:34:58 +12:00
parent 9c1ec53861
commit 39d8672579
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/pry/default_commands/introspection.rb
View File

@ -36,6 +36,10 @@ class Pry
mod.source_line_for_candidate(candidate) mod.source_line_for_candidate(candidate)
end end
end end
def use_line_numbers?
opts.present?(:b) || opts.present?(:l)
end
end end
Introspection = Pry::CommandSet.new do Introspection = Pry::CommandSet.new do
@ -70,8 +74,7 @@ class Pry
def normal_module(mod) def normal_module(mod)
# source_file reveals the underlying .c file in case of core # source_file reveals the underlying .c file in case of core
# classes on MRI. # classes on MRI. This is different to source_location, which
# This is different to source_location, which
# will return nil. # will return nil.
if mod.yard_docs? if mod.yard_docs?
file_name, line = mod.source_file, nil file_name, line = mod.source_file, nil
@ -85,15 +88,12 @@ class Pry
else else
set_file_and_dir_locals(file_name) if !mod.yard_docs? set_file_and_dir_locals(file_name) if !mod.yard_docs?
doc = "" doc = ""
doc << "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{line ? line : "N/A"}:\n\n"
doc << mod.doc doc << mod.doc
if opts.present?(:b) || opts.present?(:l) doc = Code.new(doc, module_start_line(mod), :text).
start_line = mod.source_location.nil? ? 1 : line - doc.lines.count with_line_numbers(use_line_numbers?).to_s
doc = Code.new(doc, start_line, :text).
with_line_numbers(true).to_s doc.insert(0, "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{line ? line : "N/A"}:\n\n")
end
doc
end end
end end
@ -123,7 +123,7 @@ class Pry
output.puts "#{text.bold("Signature:")} #{meth.signature}" output.puts "#{text.bold("Signature:")} #{meth.signature}"
output.puts output.puts
if opts.present?(:b) || opts.present?(:l) if use_line_numbers?
doc = Code.new(doc, start_line, :text). doc = Code.new(doc, start_line, :text).
with_line_numbers(true) with_line_numbers(true)
end end
@ -131,6 +131,14 @@ class Pry
doc doc
end end
def module_start_line(mod, candidate=0)
if opts.present?(:'base-one')
1
else
mod.source_line_for_candidate(candidate) - mod.doc_for_candidate(candidate).lines.count
end
end
def start_line def start_line
if opts.present?(:'base-one') if opts.present?(:'base-one')
1 1