Skip to content

Commit

Permalink
Change aliased methods to be parivete
Browse files Browse the repository at this point in the history
  • Loading branch information
@aycabta
aycabta committed Oct 3, 2021
1 parent 7fe9ecf commit 0f075f5
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions lib/reline/line_editor.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1998,8 +1998,8 @@ def finish
@cursor += width
@cursor_max += width
end
alias_method :ed_digit, :ed_insert
alias_method :self_insert, :ed_insert
private alias_method :ed_digit, :ed_insert
private alias_method :self_insert, :ed_insert

private def ed_quoted_insert(str, arg: 1)
@waiting_proc = proc { |key|
Expand All @@ -2015,7 +2015,7 @@ def finish
@waiting_proc = nil
}
end
alias_method :quoted_insert, :ed_quoted_insert
private alias_method :quoted_insert, :ed_quoted_insert

private def ed_next_char(key, arg: 1)
byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
Expand All @@ -2035,7 +2035,7 @@ def finish
arg -= 1
ed_next_char(key, arg: arg) if arg > 0
end
alias_method :forward_char, :ed_next_char
private alias_method :forward_char, :ed_next_char

private def ed_prev_char(key, arg: 1)
if @cursor > 0
Expand All @@ -2055,7 +2055,7 @@ def finish
arg -= 1
ed_prev_char(key, arg: arg) if arg > 0
end
alias_method :backward_char, :ed_prev_char
private alias_method :backward_char, :ed_prev_char

private def vi_first_print(key)
@byte_pointer, @cursor = Reline::Unicode.vi_first_print(@line)
Expand All @@ -2064,7 +2064,7 @@ def finish
private def ed_move_to_beg(key)
@byte_pointer = @cursor = 0
end
alias_method :beginning_of_line, :ed_move_to_beg
private alias_method :beginning_of_line, :ed_move_to_beg

private def ed_move_to_end(key)
@byte_pointer = 0
Expand All @@ -2079,7 +2079,7 @@ def finish
@byte_pointer += byte_size
end
end
alias_method :end_of_line, :ed_move_to_end
private alias_method :end_of_line, :ed_move_to_end

private def generate_searcher
Fiber.new do |first_key|
Expand Down Expand Up @@ -2287,12 +2287,12 @@ def finish
private def vi_search_prev(key)
incremental_search_history(key)
end
alias_method :reverse_search_history, :vi_search_prev
private alias_method :reverse_search_history, :vi_search_prev

private def vi_search_next(key)
incremental_search_history(key)
end
alias_method :forward_search_history, :vi_search_next
private alias_method :forward_search_history, :vi_search_next

private def ed_search_prev_history(key, arg: 1)
history = nil
Expand Down Expand Up @@ -2339,7 +2339,7 @@ def finish
arg -= 1
ed_search_prev_history(key, arg: arg) if arg > 0
end
alias_method :history_search_backward, :ed_search_prev_history
private alias_method :history_search_backward, :ed_search_prev_history

private def ed_search_next_history(key, arg: 1)
substr = @line.slice(0, @byte_pointer)
Expand Down Expand Up @@ -2391,7 +2391,7 @@ def finish
arg -= 1
ed_search_next_history(key, arg: arg) if arg > 0
end
alias_method :history_search_forward, :ed_search_next_history
private alias_method :history_search_forward, :ed_search_next_history

private def ed_prev_history(key, arg: 1)
if @is_multiline and @line_index > 0
Expand Down Expand Up @@ -2442,7 +2442,7 @@ def finish
arg -= 1
ed_prev_history(key, arg: arg) if arg > 0
end
alias_method :previous_history, :ed_prev_history
private alias_method :previous_history, :ed_prev_history

private def ed_next_history(key, arg: 1)
if @is_multiline and @line_index < (@buffer_of_lines.size - 1)
Expand Down Expand Up @@ -2490,7 +2490,7 @@ def finish
arg -= 1
ed_next_history(key, arg: arg) if arg > 0
end
alias_method :next_history, :ed_next_history
private alias_method :next_history, :ed_next_history

private def ed_newline(key)
process_insert(force: true)
Expand Down Expand Up @@ -2546,7 +2546,7 @@ def finish
arg -= 1
em_delete_prev_char(key, arg: arg) if arg > 0
end
alias_method :backward_delete_char, :em_delete_prev_char
private alias_method :backward_delete_char, :em_delete_prev_char

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

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

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

private def em_delete(key)
if (not @is_multiline and @line.empty?) or (@is_multiline and @line.empty? and @buffer_of_lines.size == 1)
Expand All @@ -2627,7 +2627,7 @@ def finish
@rest_height += 1
end
end
alias_method :delete_char, :em_delete
private alias_method :delete_char, :em_delete

private def em_delete_or_list(key)
if @line.empty? or @byte_pointer < @line.bytesize
Expand All @@ -2639,7 +2639,7 @@ def finish
end
end
end
alias_method :delete_char_or_list, :em_delete_or_list
private alias_method :delete_char_or_list, :em_delete_or_list

private def em_yank(key)
yanked = @kill_ring.yank
Expand All @@ -2651,7 +2651,7 @@ def finish
@byte_pointer += yanked.bytesize
end
end
alias_method :yank, :em_yank
private alias_method :yank, :em_yank

private def em_yank_pop(key)
yanked, prev_yank = @kill_ring.yank_pop
Expand All @@ -2668,12 +2668,12 @@ def finish
@byte_pointer += yanked.bytesize
end
end
alias_method :yank_pop, :em_yank_pop
private alias_method :yank_pop, :em_yank_pop

private def ed_clear_screen(key)
@cleared = true
end
alias_method :clear_screen, :ed_clear_screen
private alias_method :clear_screen, :ed_clear_screen

private def em_next_word(key)
if @line.bytesize > @byte_pointer
Expand All @@ -2682,7 +2682,7 @@ def finish
@cursor += width
end
end
alias_method :forward_word, :em_next_word
private alias_method :forward_word, :em_next_word

private def ed_prev_word(key)
if @byte_pointer > 0
Expand All @@ -2691,7 +2691,7 @@ def finish
@cursor -= width
end
end
alias_method :backward_word, :ed_prev_word
private alias_method :backward_word, :ed_prev_word

private def em_delete_next_word(key)
if @line.bytesize > @byte_pointer
Expand Down Expand Up @@ -2731,7 +2731,7 @@ def finish
end
end
end
alias_method :transpose_chars, :ed_transpose_chars
private alias_method :transpose_chars, :ed_transpose_chars

private def ed_transpose_words(key)
left_word_start, middle_start, right_word_start, after_start = Reline::Unicode.ed_transpose_words(@line, @byte_pointer)
Expand All @@ -2746,7 +2746,7 @@ def finish
@byte_pointer = from_head_to_left_word.bytesize
@cursor = calculate_width(from_head_to_left_word)
end
alias_method :transpose_words, :ed_transpose_words
private alias_method :transpose_words, :ed_transpose_words

private def em_capitol_case(key)
if @line.bytesize > @byte_pointer
Expand All @@ -2758,7 +2758,7 @@ def finish
@cursor += calculate_width(new_str)
end
end
alias_method :capitalize_word, :em_capitol_case
private alias_method :capitalize_word, :em_capitol_case

private def em_lower_case(key)
if @line.bytesize > @byte_pointer
Expand All @@ -2774,7 +2774,7 @@ def finish
@line += rest
end
end
alias_method :downcase_word, :em_lower_case
private alias_method :downcase_word, :em_lower_case

private def em_upper_case(key)
if @line.bytesize > @byte_pointer
Expand All @@ -2790,7 +2790,7 @@ def finish
@line += rest
end
end
alias_method :upcase_word, :em_upper_case
private alias_method :upcase_word, :em_upper_case

private def em_kill_region(key)
if @byte_pointer > 0
Expand All @@ -2802,7 +2802,7 @@ def finish
@kill_ring.append(deleted, true)
end
end
alias_method :unix_word_rubout, :em_kill_region
private alias_method :unix_word_rubout, :em_kill_region

private def copy_for_vi(text)
if @config.editing_mode_is?(:vi_insert) or @config.editing_mode_is?(:vi_command)
Expand All @@ -2823,7 +2823,7 @@ def finish
ed_prev_char(key)
@config.editing_mode = :vi_command
end
alias_method :vi_movement_mode, :vi_command_mode
private alias_method :vi_movement_mode, :vi_command_mode

private def vi_next_word(key, arg: 1)
if @line.bytesize > @byte_pointer
Expand Down Expand Up @@ -3012,8 +3012,8 @@ def finish
ed_newline(key)
end
end
alias_method :vi_end_of_transmission, :vi_list_or_eof
alias_method :vi_eof_maybe, :vi_list_or_eof
private alias_method :vi_end_of_transmission, :vi_list_or_eof
private alias_method :vi_eof_maybe, :vi_list_or_eof

private def ed_delete_next_char(key, arg: 1)
byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
Expand Down Expand Up @@ -3285,7 +3285,7 @@ def finish
private def em_set_mark(key)
@mark_pointer = [@byte_pointer, @line_index]
end
alias_method :set_mark, :em_set_mark
private alias_method :set_mark, :em_set_mark

private def em_exchange_mark(key)
return unless @mark_pointer
Expand All @@ -3296,5 +3296,5 @@ def finish
@cursor_max = calculate_width(@line)
@mark_pointer = new_pointer
end
alias_method :exchange_point_and_mark, :em_exchange_mark
private alias_method :exchange_point_and_mark, :em_exchange_mark
end

0 comments on commit 0f075f5

Please sign in to comment.