kotovalexarian-likes-github/pry--pry
1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00
Code Releases Activity

moved invoke_editor() and friends from introspection.rb helper to command_helpers.rb

Browse source
This commit is contained in:
John Mair 2011-08-02 08:29:08 +11:00
parent 164e99f7c6
commit 17aaff2154
2 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/pry/default_commands/introspection.rb
View file

@ -207,41 +207,6 @@ class Pry
end
end
helpers do
def invoke_editor(file, line)
if Pry.editor.respond_to?(:call)
editor_invocation = Pry.editor.call(file, line)
else
editor_invocation = "#{Pry.editor} #{start_line_syntax_for_editor(file, line)}"
end
run ".#{editor_invocation}"
end
def start_line_syntax_for_editor(file_name, line_number)
file_name = file_name.gsub(/\//, '\\') if RUBY_PLATFORM =~ /mswin|mingw/
case Pry.editor
when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
"+#{line_number} #{file_name}"
when /^mate/, /^geany/
"-l #{line_number} #{file_name}"
when /^uedit32/
"#{file_name}/#{line_number}"
when /^jedit/
"#{file_name} +line:#{line_number}"
else
if RUBY_PLATFORM =~ /mswin|mingw/
"#{file_name}"
else
"+#{line_number} #{file_name}"
end
end
end
end
end
end
end

37
lib/pry/helpers/command_helpers.rb
View file

@ -255,7 +255,11 @@ class Pry
end
language_detected = file_type if file_type
CodeRay.scan(contents, language_detected).term
if Pry.color
CodeRay.scan(contents, language_detected).term
else
contents
end
end
# convert negative line numbers to positive by wrapping around
@ -328,6 +332,37 @@ class Pry
code.sub(/\A\s*\/\*.*?\*\/\s*/m, '')
end
def invoke_editor(file, line)
if Pry.editor.respond_to?(:call)
editor_invocation = Pry.editor.call(file, line)
else
editor_invocation = "#{Pry.editor} #{start_line_syntax_for_editor(file, line)}"
end
run ".#{editor_invocation}"
end
def start_line_syntax_for_editor(file_name, line_number)
file_name = file_name.gsub(/\//, '\\') if RUBY_PLATFORM =~ /mswin|mingw/
case Pry.editor
when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
"+#{line_number} #{file_name}"
when /^mate/, /^geany/
"-l #{line_number} #{file_name}"
when /^uedit32/
"#{file_name}/#{line_number}"
when /^jedit/
"#{file_name} +line:#{line_number}"
else
if RUBY_PLATFORM =~ /mswin|mingw/
"#{file_name}"
else
"+#{line_number} #{file_name}"
end
end
end
def prompt(message, options="Yn")
opts = options.scan(/./)
optstring = opts.join("/") # case maintained