RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:57:44 +00:00
Code Issues Activity Actions

LibWeb: Clean up grid track placement shorthand parser

Browse source 
Use the implemented non-shorthand version of the GridTrackPlacement
parser to clean up the shorthand version and deduplicate code.
This commit is contained in:
martinfalisse 2022-10-01 13:50:11 +02:00 • committed by Andreas Kling
parent 56f50c9cde
commit 97230c4ddb
1 changed files with 22 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5489,59 +5489,35 @@ RefPtr<StyleValue> Parser::parse_grid_track_placement_shorthand_value(Vector<Com
auto tokens = TokenStream { component_values }; auto tokens = TokenStream { component_values };
auto current_token = tokens.next_token().token(); auto current_token = tokens.next_token().token();
if (!tokens.has_next_token()) { Vector<ComponentValue> track_start_placement_tokens;
if (current_token.is(Token::Type::Ident) && current_token.ident().equals_ignoring_case("auto"sv)) while (true) {
return GridTrackPlacementShorthandStyleValue::create(CSS::GridTrackPlacement::make_auto()); if (current_token.is(Token::Type::Delim) && current_token.delim() == "/"sv)
// https://drafts.csswg.org/css-grid/#grid-placement-span-int break;
// If the <integer> is omitted, it defaults to 1. track_start_placement_tokens.append(current_token);
if (current_token.is(Token::Type::Ident) && current_token.ident().equals_ignoring_case("span"sv)) if (!tokens.has_next_token())
return GridTrackPlacementShorthandStyleValue::create(CSS::GridTrackPlacement(1, true)); break;
// https://drafts.csswg.org/css-grid/#grid-placement-int current_token = tokens.next_token().token();
// [ <integer [−∞,−1]> | <integer [1,∞]> ] && <custom-ident>?
// An <integer> value of zero makes the declaration invalid.
if (current_token.is(Token::Type::Number) && current_token.number().is_integer() && current_token.number_value() != 0)
return GridTrackPlacementShorthandStyleValue::create(CSS::GridTrackPlacement(current_token.number_value()));
return {};
} }
auto calculate_grid_track_placement = [](auto& current_token, auto& tokens) -> Optional<CSS::GridTrackPlacement> { Vector<ComponentValue> track_end_placement_tokens;
auto is_span = false; if (tokens.has_next_token()) {
if (current_token.is(Token::Type::Ident) && current_token.ident().equals_ignoring_case("span"sv)) { current_token = tokens.next_token().token();
is_span = true; while (true) {
tokens.skip_whitespace(); track_end_placement_tokens.append(current_token);
if (!tokens.has_next_token())
break;
current_token = tokens.next_token().token(); current_token = tokens.next_token().token();
} }
if (current_token.is(Token::Type::Number) && current_token.number().is_integer() && current_token.number_value() != 0) { }
// https://drafts.csswg.org/css-grid/#grid-placement-span-int
// Negative integers or zero are invalid.
if (is_span && static_cast<int>(current_token.number_value()) < 1)
return CSS::GridTrackPlacement(1, true);
return CSS::GridTrackPlacement(static_cast<int>(current_token.number_value()), is_span);
}
// https://drafts.csswg.org/css-grid/#grid-placement-int
// [ <integer [−∞,−1]> | <integer [1,∞]> ] && <custom-ident>?
// An <integer> value of zero makes the declaration invalid.
if (current_token.is(Token::Type::Number) && current_token.number().is_integer() && current_token.number_value() == 0)
return {};
// https://drafts.csswg.org/css-grid/#grid-placement-span-int
// If the <integer> is omitted, it defaults to 1.
if (is_span && current_token.is(Token::Type::Delim) && current_token.delim() == "/"sv)
return CSS::GridTrackPlacement(1, true);
return CSS::GridTrackPlacement();
};
auto first_grid_track_placement = calculate_grid_track_placement(current_token, tokens); auto parsed_start_value = parse_grid_track_placement(track_start_placement_tokens);
if (!tokens.has_next_token() && first_grid_track_placement.has_value()) if (parsed_start_value && track_end_placement_tokens.is_empty())
return GridTrackPlacementShorthandStyleValue::create(CSS::GridTrackPlacement(first_grid_track_placement.value())); return GridTrackPlacementShorthandStyleValue::create(parsed_start_value.release_nonnull()->as_grid_track_placement().grid_track_placement());
tokens.skip_whitespace(); auto parsed_end_value = parse_grid_track_placement(track_end_placement_tokens);
current_token = tokens.next_token().token(); if (parsed_start_value && parsed_end_value)
tokens.skip_whitespace(); return GridTrackPlacementShorthandStyleValue::create(parsed_start_value.release_nonnull()->as_grid_track_placement(), parsed_end_value.release_nonnull()->as_grid_track_placement());
current_token = tokens.next_token().token();
auto second_grid_track_placement = calculate_grid_track_placement(current_token, tokens);
if (!tokens.has_next_token() && first_grid_track_placement.has_value() && second_grid_track_placement.has_value())
return GridTrackPlacementShorthandStyleValue::create(GridTrackPlacementStyleValue::create(first_grid_track_placement.value()), GridTrackPlacementStyleValue::create(second_grid_track_placement.value()));
return {}; return {};
} }