1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/irb] Avoid using Reline as a module

Browse Source 
(https://github.com/ruby/irb/pull/633)

Using it as a module makes it harder to understand methods' source.
This commit is contained in:
Stan Lo 2023-07-09 07:24:56 +01:00 committed by git
parent acd9c208d5
commit 4e2f98be39
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/irb/input-method.rb
View File

@ -256,8 +256,6 @@ module IRB
end end
class RelineInputMethod < InputMethod class RelineInputMethod < InputMethod
include Reline
# Creates a new input method object using Reline # Creates a new input method object using Reline
def initialize def initialize
IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false) IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false)
@ -401,10 +399,10 @@ module IRB
mod_key = RUBY_PLATFORM.match?(/darwin/) ? "Option" : "Alt" mod_key = RUBY_PLATFORM.match?(/darwin/) ? "Option" : "Alt"
message = "Press #{mod_key}+d to read the full document" message = "Press #{mod_key}+d to read the full document"
contents = [message] + doc.accept(formatter).split("\n") contents = [message] + doc.accept(formatter).split("\n")
contents = contents.take(preferred_dialog_height) if respond_to?(:preferred_dialog_height) contents = contents.take(Reline.preferred_dialog_height) if Reline.respond_to?(:preferred_dialog_height)
y = cursor_pos_to_render.y y = cursor_pos_to_render.y
DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: '49') Reline::DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: '49')
} }
# Reads the next line from this input method. # Reads the next line from this input method.
@ -415,8 +413,8 @@ module IRB
Reline.output = @stdout Reline.output = @stdout
Reline.prompt_proc = @prompt_proc Reline.prompt_proc = @prompt_proc
Reline.auto_indent_proc = @auto_indent_proc if @auto_indent_proc Reline.auto_indent_proc = @auto_indent_proc if @auto_indent_proc
if l = readmultiline(@prompt, false, &@check_termination_proc) if l = Reline.readmultiline(@prompt, false, &@check_termination_proc)
HISTORY.push(l) if !l.empty? Reline::HISTORY.push(l) if !l.empty?
@line[@line_no += 1] = l + "\n" @line[@line_no += 1] = l + "\n"
else else
@eof = true @eof = true