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

Remove an unnecessary argument

Browse Source
This commit is contained in:
aycabta 2019-06-01 15:07:22 +09:00
parent 3034d666e8
commit 34727475d0
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/reline/line_editor.rb
View File

@ -641,7 +641,12 @@ class Reline::LineEditor
end end
end end
private def process_key(key, method_symbol, method_obj) private def process_key(key, method_symbol)
if method_symbol and respond_to?(method_symbol, true)
method_obj = method(method_symbol)
else
method_obj = nil
end
if @vi_arg if @vi_arg
if key.chr =~ /[0-9]/ if key.chr =~ /[0-9]/
ed_argument_digit(key) ed_argument_digit(key)
@ -682,7 +687,7 @@ class Reline::LineEditor
@multibyte_buffer << key.combined_char @multibyte_buffer << key.combined_char
if @multibyte_buffer.size > 1 if @multibyte_buffer.size > 1
if @multibyte_buffer.dup.force_encoding(@encoding).valid_encoding? if @multibyte_buffer.dup.force_encoding(@encoding).valid_encoding?
process_key(@multibyte_buffer.dup.force_encoding(@encoding), nil, nil) process_key(@multibyte_buffer.dup.force_encoding(@encoding), nil)
@multibyte_buffer.clear @multibyte_buffer.clear
else else
# invalid # invalid
@ -694,20 +699,11 @@ class Reline::LineEditor
if key.with_meta and method_symbol == :ed_unassigned if key.with_meta and method_symbol == :ed_unassigned
# split ESC + key # split ESC + key
method_symbol = @config.editing_mode.get_method("\e".ord) method_symbol = @config.editing_mode.get_method("\e".ord)
if method_symbol and respond_to?(method_symbol, true) process_key("\e".ord, method_symbol)
method_obj = method(method_symbol)
end
process_key("\e".ord, method_symbol, method_obj)
method_symbol = @config.editing_mode.get_method(key.char) method_symbol = @config.editing_mode.get_method(key.char)
if method_symbol and respond_to?(method_symbol, true) process_key(key.char, method_symbol)
method_obj = method(method_symbol)
end
process_key(key.char, method_symbol, method_obj)
else else
if method_symbol and respond_to?(method_symbol, true) process_key(key.combined_char, method_symbol)
method_obj = method(method_symbol)
end
process_key(key.combined_char, method_symbol, method_obj)
end end
@multibyte_buffer.clear @multibyte_buffer.clear
end end
@ -747,7 +743,7 @@ class Reline::LineEditor
move_completed_list(result, "\C-p".ord == key.char ? :up : :down) move_completed_list(result, "\C-p".ord == key.char ? :up : :down)
end end
elsif Symbol === key.char and respond_to?(key.char, true) elsif Symbol === key.char and respond_to?(key.char, true)
process_key(key.char, key.char, method(key.char)) process_key(key.char, key.char)
else else
normal_char(key) normal_char(key)
end end