system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb+Base: Fix An+B of foo parsing

Browse source 
When I wrote the An+B parser, it was guaranteed to have no
non-whitespace tokens after it. This is no longer true with the `of
foo` syntax, so this patch corrects the logic when there is no `+B`
segment.

This makes this case shown on Twitter work correctly. :^)
https://twitter.com/simevidas/status/1506657566012678151
This commit is contained in:
Sam Atkins 2022-03-24 16:38:34 +00:00 committed by Andreas Kling
parent 5aad32b504
commit c914e732d2
2 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Base/res/html/misc/nth-child.html
View file

@ -52,6 +52,9 @@
.acid3 > div:nth-child(-5n+3) {
background-color: lightblue;
}
.test-of-type > div:nth-child(2n of div) {
background-color: lightblue;
}
.test-of > div:nth-child(3n+1 of .special) {
background-color: lightblue;
}
@ -191,6 +194,22 @@
<div>15</div>
</div>
<h4>:nth-child(2n of div)</h4>
<div class="test-of-type">
<div>1</div>
<p>Paragraph</p>
<div>2 +</div>
<p>Paragraph</p>
<div>3</div>
<p>Paragraph</p>
<div>4 +</div>
<p>Paragraph</p>
<div>5</div>
<p>Paragraph</p>
<div>6 +</div>
<p>Paragraph</p>
</div>
<h4>:nth-child(3n+1 of .special)</h4>
<div class="test-of">
<div class="special">1 +</div>

30
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -4491,12 +4491,14 @@ Optional<Selector::SimpleSelector::ANPlusBPattern> Parser::parse_a_n_plus_b_patt
if (is_n_dimension(first_value)) {
a = first_value.token().dimension_value_int();
values.skip_whitespace();
auto& second_value = values.next_token();
if (second_value.is(Token::Type::EndOfFile)) {
if (!values.has_next_token() || values.peek_token().is(Token::Type::Whitespace)) {
// <n-dimension>
return make_return_value();
} else if (is_signed_integer(second_value)) {
}
values.skip_whitespace();
auto& second_value = values.next_token();
if (is_signed_integer(second_value)) {
// <n-dimension> <signed-integer>
b = second_value.token().to_integer();
return make_return_value();
@ -4552,12 +4554,14 @@ Optional<Selector::SimpleSelector::ANPlusBPattern> Parser::parse_a_n_plus_b_patt
// -n ['+' | '-'] <signless-integer>
if (is_dashn(first_value)) {
a = -1;
values.skip_whitespace();
auto& second_value = values.next_token();
if (second_value.is(Token::Type::EndOfFile)) {
if (!values.has_next_token() || values.peek_token().is(Token::Type::Whitespace)) {
// -n
return make_return_value();
} else if (is_signed_integer(second_value)) {
}
values.skip_whitespace();
auto& second_value = values.next_token();
if (is_signed_integer(second_value)) {
// -n <signed-integer>
b = second_value.token().to_integer();
return make_return_value();
@ -4605,12 +4609,14 @@ Optional<Selector::SimpleSelector::ANPlusBPattern> Parser::parse_a_n_plus_b_patt
// '+'?† n ['+' | '-'] <signless-integer>
if (is_n(first_after_plus)) {
a = 1;
values.skip_whitespace();
auto& second_value = values.next_token();
if (second_value.is(Token::Type::EndOfFile)) {
if (!values.has_next_token() || values.peek_token().is(Token::Type::Whitespace)) {
// '+'?† n
return make_return_value();
} else if (is_signed_integer(second_value)) {
}
values.skip_whitespace();
auto& second_value = values.next_token();
if (is_signed_integer(second_value)) {
// '+'?† n <signed-integer>
b = second_value.token().to_integer();
return make_return_value();