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

Suppress "shadowing outer local variable" warning in 2.5

Browse Source
This commit is contained in:
aycabta 2019-11-08 16:17:53 +09:00
parent 83c563cfa4
commit 6e72b72881
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/reline.rb
View File

@ -260,7 +260,10 @@ module Reline
result = key_stroke.match_status(buffer) result = key_stroke.match_status(buffer)
case result case result
when :matched when :matched
block.(key_stroke.expand(buffer).map{ |c| Reline::Key.new(c, c, false) }) expanded = key_stroke.expand(buffer).map{ |expanded_c|
Reline::Key.new(expanded_c, expanded_c, false)
}
block.(expanded)
break break
when :matching when :matching
if buffer.size == 1 if buffer.size == 1
@ -289,7 +292,10 @@ module Reline
if buffer.size == 1 and c == "\e".ord if buffer.size == 1 and c == "\e".ord
read_escaped_key(keyseq_timeout, c, block) read_escaped_key(keyseq_timeout, c, block)
else else
block.(buffer.map{ |c| Reline::Key.new(c, c, false) }) expanded = buffer.map{ |expanded_c|
Reline::Key.new(expanded_c, expanded_c, false)
}
block.(expanded)
end end
break break
end end

2
lib/reline/key_stroke.rb
View File

@ -32,7 +32,7 @@ class Reline::KeyStroke
end end
def expand(input) def expand(input)
lhs = key_mapping.keys.select { |lhs| input.start_with? lhs }.sort_by(&:size).reverse.first lhs = key_mapping.keys.select { |item| input.start_with? item }.sort_by(&:size).reverse.first
return input unless lhs return input unless lhs
rhs = key_mapping[lhs] rhs = key_mapping[lhs]

24
lib/reline/line_editor.rb
View File

@ -652,9 +652,9 @@ class Reline::LineEditor
else else
old_waiting_proc = @waiting_proc old_waiting_proc = @waiting_proc
old_waiting_operator_proc = @waiting_operator_proc old_waiting_operator_proc = @waiting_operator_proc
@waiting_proc = proc { |key| @waiting_proc = proc { |k|
old_cursor, old_byte_pointer = @cursor, @byte_pointer old_cursor, old_byte_pointer = @cursor, @byte_pointer
old_waiting_proc.(key) old_waiting_proc.(k)
cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
@cursor, @byte_pointer = old_cursor, old_byte_pointer @cursor, @byte_pointer = old_cursor, old_byte_pointer
@waiting_operator_proc.(cursor_diff, byte_pointer_diff) @waiting_operator_proc.(cursor_diff, byte_pointer_diff)
@ -996,8 +996,8 @@ class Reline::LineEditor
end end
width width
else else
str.encode(Encoding::UTF_8).grapheme_clusters.inject(0) { |width, gc| str.encode(Encoding::UTF_8).grapheme_clusters.inject(0) { |w, gc|
width + Reline::Unicode.get_mbchar_width(gc) w + Reline::Unicode.get_mbchar_width(gc)
} }
end end
end end
@ -1187,8 +1187,8 @@ class Reline::LineEditor
end end
searcher.resume searcher.resume
@searching_prompt = "(reverse-i-search)`': " @searching_prompt = "(reverse-i-search)`': "
@waiting_proc = ->(key) { @waiting_proc = ->(k) {
case key case k
when "\C-j".ord, "\C-?".ord when "\C-j".ord, "\C-?".ord
if @history_pointer if @history_pointer
@line = Reline::HISTORY[@history_pointer] @line = Reline::HISTORY[@history_pointer]
@ -1208,9 +1208,9 @@ class Reline::LineEditor
@cursor_max = calculate_width(@line) @cursor_max = calculate_width(@line)
@cursor = @byte_pointer = 0 @cursor = @byte_pointer = 0
else else
chr = key.is_a?(String) ? key : key.chr(Encoding::ASCII_8BIT) chr = k.is_a?(String) ? k : k.chr(Encoding::ASCII_8BIT)
if chr.match?(/[[:print:]]/) or key == "\C-h".ord or key == 127 if chr.match?(/[[:print:]]/) or k == "\C-h".ord or k == 127
searcher.resume(key) searcher.resume(k)
else else
if @history_pointer if @history_pointer
line = Reline::HISTORY[@history_pointer] line = Reline::HISTORY[@history_pointer]
@ -1863,13 +1863,13 @@ class Reline::LineEditor
end end
private def vi_replace_char(key, arg: 1) private def vi_replace_char(key, arg: 1)
@waiting_proc = ->(key) { @waiting_proc = ->(k) {
if arg == 1 if arg == 1
byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer) byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
before = @line.byteslice(0, @byte_pointer) before = @line.byteslice(0, @byte_pointer)
remaining_point = @byte_pointer + byte_size remaining_point = @byte_pointer + byte_size
after = @line.byteslice(remaining_point, @line.size - remaining_point) after = @line.byteslice(remaining_point, @line.size - remaining_point)
@line = before + key.chr + after @line = before + k.chr + after
@cursor_max = calculate_width(@line) @cursor_max = calculate_width(@line)
@waiting_proc = nil @waiting_proc = nil
elsif arg > 1 elsif arg > 1
@ -1880,7 +1880,7 @@ class Reline::LineEditor
before = @line.byteslice(0, @byte_pointer) before = @line.byteslice(0, @byte_pointer)
remaining_point = @byte_pointer + byte_size remaining_point = @byte_pointer + byte_size
after = @line.byteslice(remaining_point, @line.size - remaining_point) after = @line.byteslice(remaining_point, @line.size - remaining_point)
replaced = key.chr * arg replaced = k.chr * arg
@line = before + replaced + after @line = before + replaced + after
@byte_pointer += replaced.bytesize @byte_pointer += replaced.bytesize
@cursor += calculate_width(replaced) @cursor += calculate_width(replaced)