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

[ruby/reline] Add support for overwriting dialog proc with the same name

Browse source 
https://github.com/ruby/reline/commit/16aa20c380
This commit is contained in:
aycabta 2021-12-20 14:36:37 +09:00 • committed by git
parent c462e07a5c
commit 145c1e0691
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/reline.rb
View file

@ -60,7 +60,7 @@ module Reline
def initialize def initialize
self.output = STDOUT self.output = STDOUT
@dialog_proc_list = [] @dialog_proc_list = {}
yield self yield self
@completion_quote_character = nil @completion_quote_character = nil
@bracketed_paste_finished = false @bracketed_paste_finished = false
@ -155,16 +155,15 @@ module Reline
@dig_perfect_match_proc = p @dig_perfect_match_proc = p
end end
DialogProc = Struct.new(:dialog_proc, :context)
def add_dialog_proc(name_sym, p, context = nil) def add_dialog_proc(name_sym, p, context = nil)
raise ArgumentError unless p.respond_to?(:call) or p.nil? raise ArgumentError unless p.respond_to?(:call) or p.nil?
raise ArgumentError unless name_sym.instance_of?(Symbol) raise ArgumentError unless name_sym.instance_of?(Symbol)
@dialog_proc_list << [name_sym, p, context] @dialog_proc_list[name_sym] = DialogProc.new(p, context)
end end
def dialog_proc(name_sym) def dialog_proc(name_sym)
dialog = @dialog_proc_list.find { |d| d[0] == name_sym } @dialog_proc_list[name_sym]
dialog.nil? ? nil : dialog[1]
#@dialog_proc_list[name_sym]
end end
def input=(val) def input=(val)
@ -307,9 +306,8 @@ module Reline
line_editor.auto_indent_proc = auto_indent_proc line_editor.auto_indent_proc = auto_indent_proc
line_editor.dig_perfect_match_proc = dig_perfect_match_proc line_editor.dig_perfect_match_proc = dig_perfect_match_proc
line_editor.pre_input_hook = pre_input_hook line_editor.pre_input_hook = pre_input_hook
@dialog_proc_list.each do |d| @dialog_proc_list.each_pair do |name_sym, d|
name_sym, dialog_proc, context = d line_editor.add_dialog_proc(name_sym, d.dialog_proc, d.context)
line_editor.add_dialog_proc(name_sym, dialog_proc, context)
end end
unless config.test_mode unless config.test_mode

8
lib/reline/line_editor.rb
View file

@ -634,8 +634,12 @@ class Reline::LineEditor
end end
def add_dialog_proc(name, p, context = nil) def add_dialog_proc(name, p, context = nil)
return if @dialogs.any? { |d| d.name == name } dialog = Dialog.new(name, @config, DialogProcScope.new(self, @config, p, context))
@dialogs << Dialog.new(name, @config, DialogProcScope.new(self, @config, p, context)) if index = @dialogs.find_index { |d| d.name == name }
@dialogs[index] = dialog
else
@dialogs << dialog
end
end end
DIALOG_DEFAULT_HEIGHT = 20 DIALOG_DEFAULT_HEIGHT = 20

9
test/reline/test_reline.rb
View file

@ -313,11 +313,13 @@ class Reline::Test < Reline::TestCase
def test_add_dialog_proc def test_add_dialog_proc
p = proc {} p = proc {}
Reline.add_dialog_proc(:test_proc, p) Reline.add_dialog_proc(:test_proc, p)
assert_equal(p, Reline.dialog_proc(:test_proc)) d = Reline.dialog_proc(:test_proc)
assert_equal(p, d.dialog_proc)
l = lambda {} l = lambda {}
Reline.add_dialog_proc(:test_lambda, l) Reline.add_dialog_proc(:test_lambda, l)
assert_equal(l, Reline.dialog_proc(:test_lambda)) d = Reline.dialog_proc(:test_lambda)
assert_equal(l, d.dialog_proc)
assert_equal(nil, Reline.dialog_proc(:test_nothing)) assert_equal(nil, Reline.dialog_proc(:test_nothing))
@ -327,7 +329,8 @@ class Reline::Test < Reline::TestCase
dummy = DummyCallbackObject.new dummy = DummyCallbackObject.new
Reline.add_dialog_proc(:dummy, dummy) Reline.add_dialog_proc(:dummy, dummy)
assert_equal(dummy, Reline.dialog_proc(:dummy)) d = Reline.dialog_proc(:dummy)
assert_equal(dummy, d.dialog_proc)
end end
def test_readmultiline def test_readmultiline