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

Fix showing doc of "nil.to_s", nil doesn't have #name

Browse source
This commit is contained in:
aycabta 2019-07-19 08:23:37 +09:00
parent d7fdf45a4a
commit c8ee44f44c
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/irb/completion.rb
View file

@ -237,7 +237,7 @@ module IRB
candidates.uniq! candidates.uniq!
end end
if doc_namespace if doc_namespace
"#{rec.name}#{sep}#{candidates.find{ |i| i == message }}" "#{rec.class.name}#{sep}#{candidates.find{ |i| i == message }}"
else else
select_message(receiver, message, candidates, sep) select_message(receiver, message, candidates, sep)
end end

7
lib/reline/line_editor.rb
View file

@ -255,12 +255,15 @@ class Reline::LineEditor
move_cursor_up(@highest_in_all - 1 - @first_line_started_from) move_cursor_up(@highest_in_all - 1 - @first_line_started_from)
@menu_info = nil @menu_info = nil
end end
special_prompt = nil
if @vi_arg if @vi_arg
prompt = "(arg: #{@vi_arg}) " prompt = "(arg: #{@vi_arg}) "
prompt_width = calculate_width(prompt) prompt_width = calculate_width(prompt)
special_prompt = prompt
elsif @searching_prompt elsif @searching_prompt
prompt = @searching_prompt prompt = @searching_prompt
prompt_width = calculate_width(prompt) prompt_width = calculate_width(prompt)
special_prompt = prompt
else else
prompt = @prompt prompt = @prompt
prompt_width = calculate_width(prompt, true) prompt_width = calculate_width(prompt, true)
@ -272,6 +275,7 @@ class Reline::LineEditor
prompt_list = nil prompt_list = nil
if @prompt_proc if @prompt_proc
prompt_list = @prompt_proc.(whole_lines) prompt_list = @prompt_proc.(whole_lines)
prompt_list[@line_index] = special_prompt if special_prompt
prompt = prompt_list[@line_index] prompt = prompt_list[@line_index]
prompt_width = calculate_width(prompt, true) prompt_width = calculate_width(prompt, true)
end end
@ -303,6 +307,7 @@ class Reline::LineEditor
prompt_list = nil prompt_list = nil
if @prompt_proc if @prompt_proc
prompt_list = @prompt_proc.(new_lines) prompt_list = @prompt_proc.(new_lines)
prompt_list[@line_index] = special_prompt if special_prompt
prompt = prompt_list[@line_index] prompt = prompt_list[@line_index]
prompt_width = calculate_width(prompt, true) prompt_width = calculate_width(prompt, true)
end end
@ -372,6 +377,7 @@ class Reline::LineEditor
prompt_list = nil prompt_list = nil
if @prompt_proc if @prompt_proc
prompt_list = @prompt_proc.(new_buffer) prompt_list = @prompt_proc.(new_buffer)
prompt_list[@line_index] = special_prompt if special_prompt
prompt = prompt_list[@line_index] prompt = prompt_list[@line_index]
prompt_width = calculate_width(prompt, true) prompt_width = calculate_width(prompt, true)
end end
@ -429,6 +435,7 @@ class Reline::LineEditor
prompt_list = nil prompt_list = nil
if @prompt_proc if @prompt_proc
prompt_list = @prompt_proc.(whole_lines) prompt_list = @prompt_proc.(whole_lines)
prompt_list[@line_index] = special_prompt if special_prompt
prompt = prompt_list[@line_index] prompt = prompt_list[@line_index]
prompt_width = calculate_width(prompt, true) prompt_width = calculate_width(prompt, true)
end end