mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[ruby/reline] Use expanded method definitions instead of refinements
@jhawthorn said, "this will make Ruby's integer comparisons slower globally." It looks like "binding.irb" is going to cause serious problems in Rails applications. https://github.com/ruby/reline/commit/ee8d6c6a82
This commit is contained in:
parent
a8fe7c9e2a
commit
8de53fb31c
1 changed files with 66 additions and 66 deletions
|
@ -1,90 +1,90 @@
|
||||||
class Reline::KeyStroke
|
class Reline::KeyStroke
|
||||||
using Module.new {
|
using Module.new {
|
||||||
refine Integer do
|
|
||||||
def ==(other)
|
|
||||||
if other.is_a?(Reline::Key)
|
|
||||||
if other.combined_char == "\e".ord
|
|
||||||
false
|
|
||||||
else
|
|
||||||
other.combined_char == self
|
|
||||||
end
|
|
||||||
else
|
|
||||||
super
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
refine Array do
|
|
||||||
def start_with?(other)
|
|
||||||
compressed_me = compress_meta_key
|
|
||||||
compressed_other = other.compress_meta_key
|
|
||||||
i = 0
|
|
||||||
loop do
|
|
||||||
my_c = compressed_me[i]
|
|
||||||
other_c = compressed_other[i]
|
|
||||||
other_is_last = (i + 1) == compressed_other.size
|
|
||||||
me_is_last = (i + 1) == compressed_me.size
|
|
||||||
if my_c != other_c
|
|
||||||
if other_c == "\e".ord and other_is_last and my_c.is_a?(Reline::Key) and my_c.with_meta
|
|
||||||
return true
|
|
||||||
else
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
elsif other_is_last
|
|
||||||
return true
|
|
||||||
elsif me_is_last
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
i += 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def ==(other)
|
|
||||||
compressed_me = compress_meta_key
|
|
||||||
compressed_other = other.compress_meta_key
|
|
||||||
compressed_me.size == compressed_other.size and [compressed_me, compressed_other].transpose.all?{ |i| i[0] == i[1] }
|
|
||||||
end
|
|
||||||
|
|
||||||
def compress_meta_key
|
|
||||||
inject([]) { |result, key|
|
|
||||||
if result.size > 0 and result.last == "\e".ord
|
|
||||||
result[result.size - 1] = Reline::Key.new(key, key | 0b10000000, true)
|
|
||||||
else
|
|
||||||
result << key
|
|
||||||
end
|
|
||||||
result
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def bytes
|
|
||||||
self
|
|
||||||
end
|
|
||||||
end
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def initialize(config)
|
def initialize(config)
|
||||||
@config = config
|
@config = config
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def compress_meta_key(ary)
|
||||||
|
ary.inject([]) { |result, key|
|
||||||
|
if result.size > 0 and result.last == "\e".ord
|
||||||
|
result[result.size - 1] = Reline::Key.new(key, key | 0b10000000, true)
|
||||||
|
else
|
||||||
|
result << key
|
||||||
|
end
|
||||||
|
result
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
def start_with?(me, other)
|
||||||
|
compressed_me = compress_meta_key(me)
|
||||||
|
compressed_other = compress_meta_key(other)
|
||||||
|
i = 0
|
||||||
|
loop do
|
||||||
|
my_c = compressed_me[i]
|
||||||
|
other_c = compressed_other[i]
|
||||||
|
other_is_last = (i + 1) == compressed_other.size
|
||||||
|
me_is_last = (i + 1) == compressed_me.size
|
||||||
|
if my_c != other_c
|
||||||
|
if other_c == "\e".ord and other_is_last and my_c.is_a?(Reline::Key) and my_c.with_meta
|
||||||
|
return true
|
||||||
|
else
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
elsif other_is_last
|
||||||
|
return true
|
||||||
|
elsif me_is_last
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
i += 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def equal?(me, other)
|
||||||
|
case me
|
||||||
|
when Array
|
||||||
|
compressed_me = compress_meta_key(me)
|
||||||
|
compressed_other = compress_meta_key(other)
|
||||||
|
compressed_me.size == compressed_other.size and [compressed_me, compressed_other].transpose.all?{ |i| equal?(i[0], i[1]) }
|
||||||
|
when Integer
|
||||||
|
if other.is_a?(Reline::Key)
|
||||||
|
if other.combined_char == "\e".ord
|
||||||
|
false
|
||||||
|
else
|
||||||
|
other.combined_char == me
|
||||||
|
end
|
||||||
|
else
|
||||||
|
me == other
|
||||||
|
end
|
||||||
|
when Reline::Key
|
||||||
|
if other.is_a?(Integer)
|
||||||
|
me.combined_char == other
|
||||||
|
else
|
||||||
|
me == other
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def match_status(input)
|
def match_status(input)
|
||||||
key_mapping.keys.select { |lhs|
|
key_mapping.keys.select { |lhs|
|
||||||
lhs.start_with? input
|
start_with?(lhs, input)
|
||||||
}.tap { |it|
|
}.tap { |it|
|
||||||
return :matched if it.size == 1 && (it[0] == input)
|
return :matched if it.size == 1 && equal?(it[0], input)
|
||||||
return :matching if it.size == 1 && (it[0] != input)
|
return :matching if it.size == 1 && !equal?(it[0], input)
|
||||||
return :matched if it.max_by(&:size)&.size&.< input.size
|
return :matched if it.max_by(&:size)&.size&.< input.size
|
||||||
return :matching if it.size > 1
|
return :matching if it.size > 1
|
||||||
}
|
}
|
||||||
key_mapping.keys.select { |lhs|
|
key_mapping.keys.select { |lhs|
|
||||||
input.start_with? lhs
|
start_with?(input, lhs)
|
||||||
}.tap { |it|
|
}.tap { |it|
|
||||||
return it.size > 0 ? :matched : :unmatched
|
return it.size > 0 ? :matched : :unmatched
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
def expand(input)
|
def expand(input)
|
||||||
input = input.compress_meta_key
|
input = compress_meta_key(input)
|
||||||
lhs = key_mapping.keys.select { |item| input.start_with? item }.sort_by(&:size).last
|
lhs = key_mapping.keys.select { |item| start_with?(input, item) }.sort_by(&:size).last
|
||||||
return input unless lhs
|
return input unless lhs
|
||||||
rhs = key_mapping[lhs]
|
rhs = key_mapping[lhs]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue