Skip to content

Commit 0f075f5

Browse files
committed
Change aliased methods to be parivete
1 parent 7fe9ecf commit 0f075f5

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

lib/reline/line_editor.rb

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,8 +1998,8 @@ def finish
19981998
@cursor += width
19991999
@cursor_max += width
20002000
end
2001-
alias_method :ed_digit, :ed_insert
2002-
alias_method :self_insert, :ed_insert
2001+
private alias_method :ed_digit, :ed_insert
2002+
private alias_method :self_insert, :ed_insert
20032003

20042004
private def ed_quoted_insert(str, arg: 1)
20052005
@waiting_proc = proc { |key|
@@ -2015,7 +2015,7 @@ def finish
20152015
@waiting_proc = nil
20162016
}
20172017
end
2018-
alias_method :quoted_insert, :ed_quoted_insert
2018+
private alias_method :quoted_insert, :ed_quoted_insert
20192019

20202020
private def ed_next_char(key, arg: 1)
20212021
byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
@@ -2035,7 +2035,7 @@ def finish
20352035
arg -= 1
20362036
ed_next_char(key, arg: arg) if arg > 0
20372037
end
2038-
alias_method :forward_char, :ed_next_char
2038+
private alias_method :forward_char, :ed_next_char
20392039

20402040
private def ed_prev_char(key, arg: 1)
20412041
if @cursor > 0
@@ -2055,7 +2055,7 @@ def finish
20552055
arg -= 1
20562056
ed_prev_char(key, arg: arg) if arg > 0
20572057
end
2058-
alias_method :backward_char, :ed_prev_char
2058+
private alias_method :backward_char, :ed_prev_char
20592059

20602060
private def vi_first_print(key)
20612061
@byte_pointer, @cursor = Reline::Unicode.vi_first_print(@line)
@@ -2064,7 +2064,7 @@ def finish
20642064
private def ed_move_to_beg(key)
20652065
@byte_pointer = @cursor = 0
20662066
end
2067-
alias_method :beginning_of_line, :ed_move_to_beg
2067+
private alias_method :beginning_of_line, :ed_move_to_beg
20682068

20692069
private def ed_move_to_end(key)
20702070
@byte_pointer = 0
@@ -2079,7 +2079,7 @@ def finish
20792079
@byte_pointer += byte_size
20802080
end
20812081
end
2082-
alias_method :end_of_line, :ed_move_to_end
2082+
private alias_method :end_of_line, :ed_move_to_end
20832083

20842084
private def generate_searcher
20852085
Fiber.new do |first_key|
@@ -2287,12 +2287,12 @@ def finish
22872287
private def vi_search_prev(key)
22882288
incremental_search_history(key)
22892289
end
2290-
alias_method :reverse_search_history, :vi_search_prev
2290+
private alias_method :reverse_search_history, :vi_search_prev
22912291

22922292
private def vi_search_next(key)
22932293
incremental_search_history(key)
22942294
end
2295-
alias_method :forward_search_history, :vi_search_next
2295+
private alias_method :forward_search_history, :vi_search_next
22962296

22972297
private def ed_search_prev_history(key, arg: 1)
22982298
history = nil
@@ -2339,7 +2339,7 @@ def finish
23392339
arg -= 1
23402340
ed_search_prev_history(key, arg: arg) if arg > 0
23412341
end
2342-
alias_method :history_search_backward, :ed_search_prev_history
2342+
private alias_method :history_search_backward, :ed_search_prev_history
23432343

23442344
private def ed_search_next_history(key, arg: 1)
23452345
substr = @line.slice(0, @byte_pointer)
@@ -2391,7 +2391,7 @@ def finish
23912391
arg -= 1
23922392
ed_search_next_history(key, arg: arg) if arg > 0
23932393
end
2394-
alias_method :history_search_forward, :ed_search_next_history
2394+
private alias_method :history_search_forward, :ed_search_next_history
23952395

23962396
private def ed_prev_history(key, arg: 1)
23972397
if @is_multiline and @line_index > 0
@@ -2442,7 +2442,7 @@ def finish
24422442
arg -= 1
24432443
ed_prev_history(key, arg: arg) if arg > 0
24442444
end
2445-
alias_method :previous_history, :ed_prev_history
2445+
private alias_method :previous_history, :ed_prev_history
24462446

24472447
private def ed_next_history(key, arg: 1)
24482448
if @is_multiline and @line_index < (@buffer_of_lines.size - 1)
@@ -2490,7 +2490,7 @@ def finish
24902490
arg -= 1
24912491
ed_next_history(key, arg: arg) if arg > 0
24922492
end
2493-
alias_method :next_history, :ed_next_history
2493+
private alias_method :next_history, :ed_next_history
24942494

24952495
private def ed_newline(key)
24962496
process_insert(force: true)
@@ -2546,7 +2546,7 @@ def finish
25462546
arg -= 1
25472547
em_delete_prev_char(key, arg: arg) if arg > 0
25482548
end
2549-
alias_method :backward_delete_char, :em_delete_prev_char
2549+
private alias_method :backward_delete_char, :em_delete_prev_char
25502550

25512551
# Editline:: +ed-kill-line+ (vi command: +D+, +Ctrl-K+; emacs: +Ctrl-K+,
25522552
# +Ctrl-U+) + Kill from the cursor to the end of the line.
@@ -2569,7 +2569,7 @@ def finish
25692569
@rest_height += 1
25702570
end
25712571
end
2572-
alias_method :kill_line, :ed_kill_line
2572+
private alias_method :kill_line, :ed_kill_line
25732573

25742574
# Editline:: +vi-kill-line-prev+ (vi: +Ctrl-U+) Delete the string from the
25752575
# beginning of the edit buffer to the cursor and save it to the
@@ -2585,7 +2585,7 @@ def finish
25852585
@cursor = 0
25862586
end
25872587
end
2588-
alias_method :unix_line_discard, :vi_kill_line_prev
2588+
private alias_method :unix_line_discard, :vi_kill_line_prev
25892589

25902590
# Editline:: +em-kill-line+ (not bound) Delete the entire contents of the
25912591
# edit buffer and save it to the cut buffer. +vi-kill-line-prev+
@@ -2600,7 +2600,7 @@ def finish
26002600
@cursor = 0
26012601
end
26022602
end
2603-
alias_method :kill_whole_line, :em_kill_line
2603+
private alias_method :kill_whole_line, :em_kill_line
26042604

26052605
private def em_delete(key)
26062606
if (not @is_multiline and @line.empty?) or (@is_multiline and @line.empty? and @buffer_of_lines.size == 1)
@@ -2627,7 +2627,7 @@ def finish
26272627
@rest_height += 1
26282628
end
26292629
end
2630-
alias_method :delete_char, :em_delete
2630+
private alias_method :delete_char, :em_delete
26312631

26322632
private def em_delete_or_list(key)
26332633
if @line.empty? or @byte_pointer < @line.bytesize
@@ -2639,7 +2639,7 @@ def finish
26392639
end
26402640
end
26412641
end
2642-
alias_method :delete_char_or_list, :em_delete_or_list
2642+
private alias_method :delete_char_or_list, :em_delete_or_list
26432643

26442644
private def em_yank(key)
26452645
yanked = @kill_ring.yank
@@ -2651,7 +2651,7 @@ def finish
26512651
@byte_pointer += yanked.bytesize
26522652
end
26532653
end
2654-
alias_method :yank, :em_yank
2654+
private alias_method :yank, :em_yank
26552655

26562656
private def em_yank_pop(key)
26572657
yanked, prev_yank = @kill_ring.yank_pop
@@ -2668,12 +2668,12 @@ def finish
26682668
@byte_pointer += yanked.bytesize
26692669
end
26702670
end
2671-
alias_method :yank_pop, :em_yank_pop
2671+
private alias_method :yank_pop, :em_yank_pop
26722672

26732673
private def ed_clear_screen(key)
26742674
@cleared = true
26752675
end
2676-
alias_method :clear_screen, :ed_clear_screen
2676+
private alias_method :clear_screen, :ed_clear_screen
26772677

26782678
private def em_next_word(key)
26792679
if @line.bytesize > @byte_pointer
@@ -2682,7 +2682,7 @@ def finish
26822682
@cursor += width
26832683
end
26842684
end
2685-
alias_method :forward_word, :em_next_word
2685+
private alias_method :forward_word, :em_next_word
26862686

26872687
private def ed_prev_word(key)
26882688
if @byte_pointer > 0
@@ -2691,7 +2691,7 @@ def finish
26912691
@cursor -= width
26922692
end
26932693
end
2694-
alias_method :backward_word, :ed_prev_word
2694+
private alias_method :backward_word, :ed_prev_word
26952695

26962696
private def em_delete_next_word(key)
26972697
if @line.bytesize > @byte_pointer
@@ -2731,7 +2731,7 @@ def finish
27312731
end
27322732
end
27332733
end
2734-
alias_method :transpose_chars, :ed_transpose_chars
2734+
private alias_method :transpose_chars, :ed_transpose_chars
27352735

27362736
private def ed_transpose_words(key)
27372737
left_word_start, middle_start, right_word_start, after_start = Reline::Unicode.ed_transpose_words(@line, @byte_pointer)
@@ -2746,7 +2746,7 @@ def finish
27462746
@byte_pointer = from_head_to_left_word.bytesize
27472747
@cursor = calculate_width(from_head_to_left_word)
27482748
end
2749-
alias_method :transpose_words, :ed_transpose_words
2749+
private alias_method :transpose_words, :ed_transpose_words
27502750

27512751
private def em_capitol_case(key)
27522752
if @line.bytesize > @byte_pointer
@@ -2758,7 +2758,7 @@ def finish
27582758
@cursor += calculate_width(new_str)
27592759
end
27602760
end
2761-
alias_method :capitalize_word, :em_capitol_case
2761+
private alias_method :capitalize_word, :em_capitol_case
27622762

27632763
private def em_lower_case(key)
27642764
if @line.bytesize > @byte_pointer
@@ -2774,7 +2774,7 @@ def finish
27742774
@line += rest
27752775
end
27762776
end
2777-
alias_method :downcase_word, :em_lower_case
2777+
private alias_method :downcase_word, :em_lower_case
27782778

27792779
private def em_upper_case(key)
27802780
if @line.bytesize > @byte_pointer
@@ -2790,7 +2790,7 @@ def finish
27902790
@line += rest
27912791
end
27922792
end
2793-
alias_method :upcase_word, :em_upper_case
2793+
private alias_method :upcase_word, :em_upper_case
27942794

27952795
private def em_kill_region(key)
27962796
if @byte_pointer > 0
@@ -2802,7 +2802,7 @@ def finish
28022802
@kill_ring.append(deleted, true)
28032803
end
28042804
end
2805-
alias_method :unix_word_rubout, :em_kill_region
2805+
private alias_method :unix_word_rubout, :em_kill_region
28062806

28072807
private def copy_for_vi(text)
28082808
if @config.editing_mode_is?(:vi_insert) or @config.editing_mode_is?(:vi_command)
@@ -2823,7 +2823,7 @@ def finish
28232823
ed_prev_char(key)
28242824
@config.editing_mode = :vi_command
28252825
end
2826-
alias_method :vi_movement_mode, :vi_command_mode
2826+
private alias_method :vi_movement_mode, :vi_command_mode
28272827

28282828
private def vi_next_word(key, arg: 1)
28292829
if @line.bytesize > @byte_pointer
@@ -3012,8 +3012,8 @@ def finish
30123012
ed_newline(key)
30133013
end
30143014
end
3015-
alias_method :vi_end_of_transmission, :vi_list_or_eof
3016-
alias_method :vi_eof_maybe, :vi_list_or_eof
3015+
private alias_method :vi_end_of_transmission, :vi_list_or_eof
3016+
private alias_method :vi_eof_maybe, :vi_list_or_eof
30173017

30183018
private def ed_delete_next_char(key, arg: 1)
30193019
byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
@@ -3285,7 +3285,7 @@ def finish
32853285
private def em_set_mark(key)
32863286
@mark_pointer = [@byte_pointer, @line_index]
32873287
end
3288-
alias_method :set_mark, :em_set_mark
3288+
private alias_method :set_mark, :em_set_mark
32893289

32903290
private def em_exchange_mark(key)
32913291
return unless @mark_pointer
@@ -3296,5 +3296,5 @@ def finish
32963296
@cursor_max = calculate_width(@line)
32973297
@mark_pointer = new_pointer
32983298
end
3299-
alias_method :exchange_point_and_mark, :em_exchange_mark
3299+
private alias_method :exchange_point_and_mark, :em_exchange_mark
33003300
end

0 commit comments

Comments
 (0)