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] Support oneshot key bindings config for key_trap of dialog callbacks

Browse source 
https://github.com/ruby/reline/commit/5f1141b693
This commit is contained in:
aycabta 2021-09-05 23:33:59 +09:00 • committed by git
parent bb6d45cfee
commit 544cd3fb91
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/reline/config.rb
View file

@ -50,6 +50,7 @@ class Reline::Config
@additional_key_bindings[:emacs] = {}
@additional_key_bindings[:vi_insert] = {}
@additional_key_bindings[:vi_command] = {}
@oneshot_key_bindings = {}
@skip_section = nil
@if_stack = nil
@editing_mode_label = :emacs
@ -75,6 +76,7 @@ class Reline::Config
@additional_key_bindings.keys.each do |key|
@additional_key_bindings[key].clear
end
@oneshot_key_bindings.clear
reset_default_key_bindings
end
@ -149,7 +151,15 @@ class Reline::Config
def key_bindings
# override @key_actors[@editing_mode_label].default_key_bindings with @additional_key_bindings[@editing_mode_label]
@key_actors[@editing_mode_label].default_key_bindings.merge(@additional_key_bindings[@editing_mode_label])
@key_actors[@editing_mode_label].default_key_bindings.merge(@additional_key_bindings[@editing_mode_label]).merge(@oneshot_key_bindings)
end
def add_oneshot_key_binding(keystroke, target)
@oneshot_key_bindings[keystroke] = target
end
def reset_oneshot_key_bindings
@oneshot_key_bindings.clear
end
def add_default_key_binding_by_keymap(keymap, keystroke, target)

19
lib/reline/line_editor.rb
View file

@ -550,8 +550,9 @@ class Reline::LineEditor
attr_reader :name, :contents, :width
attr_accessor :scroll_top, :column, :vertical_offset, :lines_backup, :trap_key
def initialize(name, proc_scope)
def initialize(name, config, proc_scope)
@name = name
@config = config
@proc_scope = proc_scope
@width = nil
@scroll_top = 0
@ -575,13 +576,21 @@ class Reline::LineEditor
def call(key)
@proc_scope.set_dialog(self)
@proc_scope.set_key(key)
@proc_scope.call
dialog_render_info = @proc_scope.call
if @trap_key
if @trap_key.is_a?(Array)
@config.add_oneshot_key_binding(@trap_key, @name)
elsif @trap_key.is_a?(Integer) or @trap_key.is_a?(Reline::Key)
@config.add_oneshot_key_binding([@trap_key], @name)
end
end
dialog_render_info
end
end
def add_dialog_proc(name, p, context = nil)
return if @dialogs.any? { |d| d.name == name }
@dialogs << Dialog.new(name, DialogProcScope.new(self, @config, p, context))
@dialogs << Dialog.new(name, @config, DialogProcScope.new(self, @config, p, context))
end
DIALOG_HEIGHT = 20
@ -1497,9 +1506,9 @@ class Reline::LineEditor
def input_key(key)
@last_key = key
@config.reset_oneshot_key_bindings
@dialogs.each do |dialog|
# The dialog will intercept the key if trap_key is set.
if dialog.trap_key and dialog.trap_key.match?(key)
if key.char.instance_of?(Symbol) and key.char == dialog.name
return
end
end