Skip to content

Commit 155f704

Browse files
ima1zumiima1zumi
authored
Refactored Default Key Bindings (#678)
* Reduce duplicate method * Configured default key mapping with Readline when the method exists * Remove undefined methods
1 parent 777dffa commit 155f704

4 files changed

Lines changed: 36 additions & 41 deletions

File tree

‎lib/reline/key_actor/emacs.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
4949
# 23 ^W
5050
:em_kill_region,
5151
# 24 ^X
52-
:ed_sequence_lead_in,
52+
:ed_unassigned,
5353
# 25 ^Y
5454
:em_yank,
5555
# 26 ^Z
@@ -319,9 +319,9 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
319319
# 158 M-^^
320320
:ed_unassigned,
321321
# 159 M-^_
322-
:em_copy_prev_word,
323-
# 160 M-SPACE
324322
:ed_unassigned,
323+
# 160 M-SPACE
324+
:em_set_mark,
325325
# 161 M-!
326326
:ed_unassigned,
327327
# 162 M-"
@@ -415,7 +415,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
415415
# 206 M-N
416416
:vi_search_next,
417417
# 207 M-O
418-
:ed_sequence_lead_in,
418+
:ed_unassigned,
419419
# 208 M-P
420420
:vi_search_prev,
421421
# 209 M-Q
@@ -431,15 +431,15 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
431431
# 214 M-V
432432
:ed_unassigned,
433433
# 215 M-W
434-
:em_copy_region,
434+
:ed_unassigned,
435435
# 216 M-X
436-
:ed_command,
437-
# 217 M-Y
438436
:ed_unassigned,
437+
# 217 M-Y
438+
:em_yank_pop,
439439
# 218 M-Z
440440
:ed_unassigned,
441441
# 219 M-[
442-
:ed_sequence_lead_in,
442+
:ed_unassigned,
443443
# 220 M-\
444444
:ed_unassigned,
445445
# 221 M-]
@@ -495,9 +495,9 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
495495
# 246 M-v
496496
:ed_unassigned,
497497
# 247 M-w
498-
:em_copy_region,
498+
:ed_unassigned,
499499
# 248 M-x
500-
:ed_command,
500+
:ed_unassigned,
501501
# 249 M-y
502502
:ed_unassigned,
503503
# 250 M-z

‎lib/reline/key_actor/vi_command.rb‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
1717
# 7 ^G
1818
:ed_unassigned,
1919
# 8 ^H
20-
:ed_unassigned,
20+
:ed_prev_char,
2121
# 9 ^I
2222
:ed_unassigned,
2323
# 10 ^J
@@ -41,7 +41,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
4141
# 19 ^S
4242
:ed_ignore,
4343
# 20 ^T
44-
:ed_unassigned,
44+
:ed_transpose_chars,
4545
# 21 ^U
4646
:vi_kill_line_prev,
4747
# 22 ^V
@@ -51,7 +51,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
5151
# 24 ^X
5252
:ed_unassigned,
5353
# 25 ^Y
54-
:ed_unassigned,
54+
:em_yank,
5555
# 26 ^Z
5656
:ed_unassigned,
5757
# 27 ^[
@@ -75,7 +75,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
7575
# 36 $
7676
:ed_move_to_end,
7777
# 37 %
78-
:vi_match,
78+
:ed_unassigned,
7979
# 38 &
8080
:ed_unassigned,
8181
# 39 '
@@ -89,11 +89,11 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
8989
# 43 +
9090
:ed_next_history,
9191
# 44 ,
92-
:vi_repeat_prev_char,
92+
:ed_unassigned,
9393
# 45 -
9494
:ed_prev_history,
9595
# 46 .
96-
:vi_redo,
96+
:ed_unassigned,
9797
# 47 /
9898
:vi_search_prev,
9999
# 48 0
@@ -117,9 +117,9 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
117117
# 57 9
118118
:ed_argument_digit,
119119
# 58 :
120-
:ed_command,
120+
:ed_unassigned,
121121
# 59 ;
122-
:vi_repeat_next_char,
122+
:ed_unassigned,
123123
# 60 <
124124
:ed_unassigned,
125125
# 61 =
@@ -157,41 +157,41 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
157157
# 77 M
158158
:ed_unassigned,
159159
# 78 N
160-
:vi_repeat_search_prev,
160+
:ed_unassigned,
161161
# 79 O
162-
:ed_sequence_lead_in,
162+
:ed_unassigned,
163163
# 80 P
164164
:vi_paste_prev,
165165
# 81 Q
166166
:ed_unassigned,
167167
# 82 R
168-
:vi_replace_mode,
168+
:ed_unassigned,
169169
# 83 S
170-
:vi_substitute_line,
170+
:ed_unassigned,
171171
# 84 T
172172
:vi_to_prev_char,
173173
# 85 U
174-
:vi_undo_line,
174+
:ed_unassigned,
175175
# 86 V
176176
:ed_unassigned,
177177
# 87 W
178178
:vi_next_big_word,
179179
# 88 X
180180
:ed_delete_prev_char,
181181
# 89 Y
182-
:vi_yank_end,
182+
:ed_unassigned,
183183
# 90 Z
184184
:ed_unassigned,
185185
# 91 [
186-
:ed_sequence_lead_in,
186+
:ed_unassigned,
187187
# 92 \
188188
:ed_unassigned,
189189
# 93 ]
190190
:ed_unassigned,
191191
# 94 ^
192192
:vi_first_print,
193193
# 95 _
194-
:vi_history_word,
194+
:ed_unassigned,
195195
# 96 `
196196
:ed_unassigned,
197197
# 97 a
@@ -221,7 +221,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
221221
# 109 m
222222
:ed_unassigned,
223223
# 110 n
224-
:vi_repeat_search_next,
224+
:ed_unassigned,
225225
# 111 o
226226
:ed_unassigned,
227227
# 112 p
@@ -231,11 +231,11 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
231231
# 114 r
232232
:vi_replace_char,
233233
# 115 s
234-
:vi_substitute_char,
234+
:ed_unassigned,
235235
# 116 t
236236
:vi_to_next_char,
237237
# 117 u
238-
:vi_undo,
238+
:ed_unassigned,
239239
# 118 v
240240
:vi_histedit,
241241
# 119 w
@@ -253,9 +253,9 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
253253
# 125 }
254254
:ed_unassigned,
255255
# 126 ~
256-
:vi_change_case,
257-
# 127 ^?
258256
:ed_unassigned,
257+
# 127 ^?
258+
:em_delete_prev_char,
259259
# 128 M-^@
260260
:ed_unassigned,
261261
# 129 M-^A
@@ -415,7 +415,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
415415
# 206 M-N
416416
:ed_unassigned,
417417
# 207 M-O
418-
:ed_sequence_lead_in,
418+
:ed_unassigned,
419419
# 208 M-P
420420
:ed_unassigned,
421421
# 209 M-Q
@@ -439,7 +439,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
439439
# 218 M-Z
440440
:ed_unassigned,
441441
# 219 M-[
442-
:ed_sequence_lead_in,
442+
:ed_unassigned,
443443
# 220 M-\
444444
:ed_unassigned,
445445
# 221 M-]

‎lib/reline/key_actor/vi_insert.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Reline::KeyActor::ViInsert < Reline::KeyActor::Base
4141
# 19 ^S
4242
:vi_search_next,
4343
# 20 ^T
44-
:ed_insert,
44+
:ed_transpose_chars,
4545
# 21 ^U
4646
:vi_kill_line_prev,
4747
# 22 ^V
@@ -51,7 +51,7 @@ class Reline::KeyActor::ViInsert < Reline::KeyActor::Base
5151
# 24 ^X
5252
:ed_insert,
5353
# 25 ^Y
54-
:ed_insert,
54+
:em_yank,
5555
# 26 ^Z
5656
:ed_insert,
5757
# 27 ^[

‎lib/reline/line_editor.rb‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class Reline::LineEditor
3333
vi_next_big_word
3434
vi_prev_big_word
3535
vi_end_big_word
36-
vi_repeat_next_char
37-
vi_repeat_prev_char
3836
}
3937

4038
module CompletionState
@@ -1538,6 +1536,7 @@ def finish
15381536
@byte_pointer = 0
15391537
end
15401538
alias_method :beginning_of_line, :ed_move_to_beg
1539+
alias_method :vi_zero, :ed_move_to_beg
15411540

15421541
private def ed_move_to_end(key)
15431542
@byte_pointer = 0
@@ -2323,10 +2322,6 @@ def finish
23232322
copy_for_vi(deleted)
23242323
end
23252324

2326-
private def vi_zero(key)
2327-
@byte_pointer = 0
2328-
end
2329-
23302325
private def vi_change_meta(key, arg: nil)
23312326
if @vi_waiting_operator
23322327
set_current_line('', 0) if @vi_waiting_operator == :vi_change_meta_confirm && arg.nil?

0 commit comments

Comments
 (0)