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

workspace.rb: fix SCRIPT_LINES__

Browse source 
* lib/irb/workspace.rb (code_around_binding): `SCRIPT_LINES__`
  values are arrays of lines.  get file and line at once.  moved
  loop-invariant format string.  join without extra strings by
  `$,`.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-11-24 05:00:56 +00:00
parent 8fb87e43c6
commit 8b6e9aa792
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/irb/workspace.rb
View file

@ -108,23 +108,21 @@ EOF
end end
def code_around_binding def code_around_binding
file = @binding.eval('__FILE__') file, pos = @binding.eval('[__FILE__, __LINE__]')
pos = @binding.eval('__LINE__') - 1
return nil unless File.exist?(file)
if defined?(SCRIPT_LINES__) && SCRIPT_LINES__.key?(file) unless defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
lines = SCRIPT_LINES__[file].split(/^/) return unless File.exist?(file)
else
lines = File.readlines(file) lines = File.readlines(file)
end end
pos -= 1
start_pos = [pos - 5, 0].max start_pos = [pos - 5, 0].max
end_pos = [pos + 5, lines.size - 1].min end_pos = [pos + 5, lines.size - 1].min
fmt = "%2s %#{end_pos.to_s.length}d: %s"
body = (start_pos..end_pos).map do |current_pos| body = (start_pos..end_pos).map do |current_pos|
lineno = "%#{end_pos.to_s.length}d" % (current_pos + 1) sprintf(fmt, pos == current_pos ? '=>' : '', current_pos + 1, lines[current_pos])
" #{pos == current_pos ? '=>' : ' '} #{lineno}: #{lines[current_pos]}" end.join("")
end.join
"\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}\n" "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}\n"
end end