kotovalexarian-likes-github/teamcapybara--capybara
1
0
Fork 0
mirror of https://github.com/teamcapybara/capybara.git synced 2022-11-09 12:08:07 -05:00
Code Releases Activity

Use nil as regexp disassembler separator rather than empty string

Browse source
This commit is contained in:
Thomas Walpole 2018-11-05 11:49:53 -08:00
parent be89e624dd
commit 671f87177d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/capybara/selector/regexp_disassembler.rb
View file

@ -25,7 +25,7 @@ module Capybara
private
def process(alternation:)
strs = extract_strings(Regexp::Parser.parse(@regexp), [''], alternation: alternation)
strs = extract_strings(Regexp::Parser.parse(@regexp), alternation: alternation)
strs = collapse(combine(strs).map(&:flatten))
strs.each { |str| str.map!(&:upcase) } if @regexp.casefold?
strs
@ -63,14 +63,14 @@ module Capybara
def collapse(strs)
strs.map do |substrings|
substrings.slice_before(&:empty?).map(&:join).reject(&:empty?).uniq
substrings.slice_before(&:nil?).map(&:join).reject(&:empty?).uniq
end
end
def extract_strings(expression, strings, alternation: false)
def extract_strings(expression, strings = [], alternation: false)
expression.each do |exp|
if optional?(exp)
strings.push('')
strings.push(nil)
next
end
@ -80,7 +80,7 @@ module Capybara
end
if %i[meta set].include?(exp.type)
strings.push('')
strings.push(nil)
next
end
@ -91,22 +91,22 @@ module Capybara
when :escape
strings.push(exp.char * min_repeat(exp))
else
strings.push('')
strings.push(nil)
end
else
min_repeat(exp).times { extract_strings(exp, strings, alternation: alternation) }
end
strings.push('') unless fixed_repeat?(exp)
strings.push(nil) unless fixed_repeat?(exp)
end
strings
end
def alternative_strings(expression)
alternatives = expression.alternatives.map { |sub_exp| extract_strings(sub_exp, [], alternation: true) }
if alternatives.all? { |alt| alt.any? { |a| !a.empty? } }
alternatives = expression.alternatives.map { |sub_exp| extract_strings(sub_exp, alternation: true) }
if alternatives.all?(&:any?)
Set.new(alternatives)
else
strings.push('')
nil
end
end
end