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

[ruby/reline] Refactored Default Key Bindings

Browse Source 
(https://github.com/ruby/reline/pull/678)

* Reduce duplicate method

* Configured default key mapping with Readline when the method exists

* Remove undefined methods

https://github.com/ruby/reline/commit/155f7047bb
This commit is contained in:
Mari Imaizumi 2024-04-15 02:33:48 +09:00 committed by git
parent 1648c4436e
commit 339128b190
4 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/reline/key_actor/emacs.rb
View File

@ -49,7 +49,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
# 23 ^W # 23 ^W
:em_kill_region, :em_kill_region,
# 24 ^X # 24 ^X
:ed_sequence_lead_in, :ed_unassigned,
# 25 ^Y # 25 ^Y
:em_yank, :em_yank,
# 26 ^Z # 26 ^Z
@ -319,9 +319,9 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
# 158 M-^^ # 158 M-^^
:ed_unassigned, :ed_unassigned,
# 159 M-^_ # 159 M-^_
:em_copy_prev_word,
# 160 M-SPACE
:ed_unassigned, :ed_unassigned,
# 160 M-SPACE
:em_set_mark,
# 161 M-! # 161 M-!
:ed_unassigned, :ed_unassigned,
# 162 M-" # 162 M-"
@ -415,7 +415,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
# 206 M-N # 206 M-N
:vi_search_next, :vi_search_next,
# 207 M-O # 207 M-O
:ed_sequence_lead_in, :ed_unassigned,
# 208 M-P # 208 M-P
:vi_search_prev, :vi_search_prev,
# 209 M-Q # 209 M-Q
@ -431,15 +431,15 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
# 214 M-V # 214 M-V
:ed_unassigned, :ed_unassigned,
# 215 M-W # 215 M-W
:em_copy_region,
# 216 M-X
:ed_command,
# 217 M-Y
:ed_unassigned, :ed_unassigned,
# 216 M-X
:ed_unassigned,
# 217 M-Y
:em_yank_pop,
# 218 M-Z # 218 M-Z
:ed_unassigned, :ed_unassigned,
# 219 M-[ # 219 M-[
:ed_sequence_lead_in, :ed_unassigned,
# 220 M-\ # 220 M-\
:ed_unassigned, :ed_unassigned,
# 221 M-] # 221 M-]
@ -495,9 +495,9 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
# 246 M-v # 246 M-v
:ed_unassigned, :ed_unassigned,
# 247 M-w # 247 M-w
:em_copy_region, :ed_unassigned,
# 248 M-x # 248 M-x
:ed_command, :ed_unassigned,
# 249 M-y # 249 M-y
:ed_unassigned, :ed_unassigned,
# 250 M-z # 250 M-z

46
lib/reline/key_actor/vi_command.rb
View File

@ -17,7 +17,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 7 ^G # 7 ^G
:ed_unassigned, :ed_unassigned,
# 8 ^H # 8 ^H
:ed_unassigned, :ed_prev_char,
# 9 ^I # 9 ^I
:ed_unassigned, :ed_unassigned,
# 10 ^J # 10 ^J
@ -41,7 +41,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 19 ^S # 19 ^S
:ed_ignore, :ed_ignore,
# 20 ^T # 20 ^T
:ed_unassigned, :ed_transpose_chars,
# 21 ^U # 21 ^U
:vi_kill_line_prev, :vi_kill_line_prev,
# 22 ^V # 22 ^V
@ -51,7 +51,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 24 ^X # 24 ^X
:ed_unassigned, :ed_unassigned,
# 25 ^Y # 25 ^Y
:ed_unassigned, :em_yank,
# 26 ^Z # 26 ^Z
:ed_unassigned, :ed_unassigned,
# 27 ^[ # 27 ^[
@ -75,7 +75,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 36 $ # 36 $
:ed_move_to_end, :ed_move_to_end,
# 37 % # 37 %
:vi_match, :ed_unassigned,
# 38 & # 38 &
:ed_unassigned, :ed_unassigned,
# 39 ' # 39 '
@ -89,11 +89,11 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 43 + # 43 +
:ed_next_history, :ed_next_history,
# 44 , # 44 ,
:vi_repeat_prev_char, :ed_unassigned,
# 45 - # 45 -
:ed_prev_history, :ed_prev_history,
# 46 . # 46 .
:vi_redo, :ed_unassigned,
# 47 / # 47 /
:vi_search_prev, :vi_search_prev,
# 48 0 # 48 0
@ -117,9 +117,9 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 57 9 # 57 9
:ed_argument_digit, :ed_argument_digit,
# 58 : # 58 :
:ed_command, :ed_unassigned,
# 59 ; # 59 ;
:vi_repeat_next_char, :ed_unassigned,
# 60 < # 60 <
:ed_unassigned, :ed_unassigned,
# 61 = # 61 =
@ -157,21 +157,21 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 77 M # 77 M
:ed_unassigned, :ed_unassigned,
# 78 N # 78 N
:vi_repeat_search_prev, :ed_unassigned,
# 79 O # 79 O
:ed_sequence_lead_in, :ed_unassigned,
# 80 P # 80 P
:vi_paste_prev, :vi_paste_prev,
# 81 Q # 81 Q
:ed_unassigned, :ed_unassigned,
# 82 R # 82 R
:vi_replace_mode, :ed_unassigned,
# 83 S # 83 S
:vi_substitute_line, :ed_unassigned,
# 84 T # 84 T
:vi_to_prev_char, :vi_to_prev_char,
# 85 U # 85 U
:vi_undo_line, :ed_unassigned,
# 86 V # 86 V
:ed_unassigned, :ed_unassigned,
# 87 W # 87 W
@ -179,11 +179,11 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 88 X # 88 X
:ed_delete_prev_char, :ed_delete_prev_char,
# 89 Y # 89 Y
:vi_yank_end, :ed_unassigned,
# 90 Z # 90 Z
:ed_unassigned, :ed_unassigned,
# 91 [ # 91 [
:ed_sequence_lead_in, :ed_unassigned,
# 92 \ # 92 \
:ed_unassigned, :ed_unassigned,
# 93 ] # 93 ]
@ -191,7 +191,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 94 ^ # 94 ^
:vi_first_print, :vi_first_print,
# 95 _ # 95 _
:vi_history_word, :ed_unassigned,
# 96 ` # 96 `
:ed_unassigned, :ed_unassigned,
# 97 a # 97 a
@ -221,7 +221,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 109 m # 109 m
:ed_unassigned, :ed_unassigned,
# 110 n # 110 n
:vi_repeat_search_next, :ed_unassigned,
# 111 o # 111 o
:ed_unassigned, :ed_unassigned,
# 112 p # 112 p
@ -231,11 +231,11 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 114 r # 114 r
:vi_replace_char, :vi_replace_char,
# 115 s # 115 s
:vi_substitute_char, :ed_unassigned,
# 116 t # 116 t
:vi_to_next_char, :vi_to_next_char,
# 117 u # 117 u
:vi_undo, :ed_unassigned,
# 118 v # 118 v
:vi_histedit, :vi_histedit,
# 119 w # 119 w
@ -253,9 +253,9 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 125 } # 125 }
:ed_unassigned, :ed_unassigned,
# 126 ~ # 126 ~
:vi_change_case,
# 127 ^?
:ed_unassigned, :ed_unassigned,
# 127 ^?
:em_delete_prev_char,
# 128 M-^@ # 128 M-^@
:ed_unassigned, :ed_unassigned,
# 129 M-^A # 129 M-^A
@ -415,7 +415,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 206 M-N # 206 M-N
:ed_unassigned, :ed_unassigned,
# 207 M-O # 207 M-O
:ed_sequence_lead_in, :ed_unassigned,
# 208 M-P # 208 M-P
:ed_unassigned, :ed_unassigned,
# 209 M-Q # 209 M-Q
@ -439,7 +439,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
# 218 M-Z # 218 M-Z
:ed_unassigned, :ed_unassigned,
# 219 M-[ # 219 M-[
:ed_sequence_lead_in, :ed_unassigned,
# 220 M-\ # 220 M-\
:ed_unassigned, :ed_unassigned,
# 221 M-] # 221 M-]

4
lib/reline/key_actor/vi_insert.rb
View File

@ -41,7 +41,7 @@ class Reline::KeyActor::ViInsert < Reline::KeyActor::Base
# 19 ^S # 19 ^S
:vi_search_next, :vi_search_next,
# 20 ^T # 20 ^T
:ed_insert, :ed_transpose_chars,
# 21 ^U # 21 ^U
:vi_kill_line_prev, :vi_kill_line_prev,
# 22 ^V # 22 ^V
@ -51,7 +51,7 @@ class Reline::KeyActor::ViInsert < Reline::KeyActor::Base
# 24 ^X # 24 ^X
:ed_insert, :ed_insert,
# 25 ^Y # 25 ^Y
:ed_insert, :em_yank,
# 26 ^Z # 26 ^Z
:ed_insert, :ed_insert,
# 27 ^[ # 27 ^[

7
lib/reline/line_editor.rb
View File

@ -33,8 +33,6 @@ class Reline::LineEditor
vi_next_big_word vi_next_big_word
vi_prev_big_word vi_prev_big_word
vi_end_big_word vi_end_big_word
vi_repeat_next_char
vi_repeat_prev_char
} }
module CompletionState module CompletionState
@ -1538,6 +1536,7 @@ class Reline::LineEditor
@byte_pointer = 0 @byte_pointer = 0
end end
alias_method :beginning_of_line, :ed_move_to_beg alias_method :beginning_of_line, :ed_move_to_beg
alias_method :vi_zero, :ed_move_to_beg
private def ed_move_to_end(key) private def ed_move_to_end(key)
@byte_pointer = 0 @byte_pointer = 0
@ -2323,10 +2322,6 @@ class Reline::LineEditor
copy_for_vi(deleted) copy_for_vi(deleted)
end end
private def vi_zero(key)
@byte_pointer = 0
end
private def vi_change_meta(key, arg: nil) private def vi_change_meta(key, arg: nil)
if @vi_waiting_operator if @vi_waiting_operator
set_current_line('', 0) if @vi_waiting_operator == :vi_change_meta_confirm && arg.nil? set_current_line('', 0) if @vi_waiting_operator == :vi_change_meta_confirm && arg.nil?