refactor(css_parser): flatten AnyCssDeclarationWithSemicolon (#6912) (#6879)

Author: denbezrukov

.changeset/chilly-lions-rule.md

@@ -0,0 +1,18 @@
+---
+"@biomejs/biome": patch
+---
+
+Refactor: remove one level of indirection for CSS declarations with semicolon
+Previously, accessing a declaration from a list required an extra step:
+
+```rust
+item
+.as_any_css_declaration_with_semicolon()
+.as_css_declaration_with_semicolon()
+```
+
+Now, it can be done directly with:
+
+```rust
+item.as_css_declaration_with_semicolon()
+```

crates/biome_css_analyze/src/assist/source/use_sorted_properties.rs

@@ -248,12 +248,8 @@ impl RecessOrderMember {
                 AnyCssRule::CssNestedQualifiedRule(_) => NodeKindOrder::NestedRuleOrAtRule,
                 AnyCssRule::CssQualifiedRule(_) => NodeKindOrder::UnknownKind,
             },
-            AnyCssDeclarationOrRule::AnyCssDeclarationWithSemicolon(any_decl_with_semicolon) => {
-                let Some(decl_with_semicolon) =
-                    any_decl_with_semicolon.as_css_declaration_with_semicolon()
-                else {
-                    return NodeKindOrder::UnknownKind;
-                };
+            AnyCssDeclarationOrRule::CssEmptyDeclaration(_) => NodeKindOrder::UnknownKind,
+            AnyCssDeclarationOrRule::CssDeclarationWithSemicolon(decl_with_semicolon) => {
                 let Some(decl) = decl_with_semicolon.declaration().ok() else {
                     return NodeKindOrder::UnknownKind;
                 };
@@ -284,8 +280,7 @@ impl RecessOrderMember {
     pub fn property_index(&self) -> usize {
         let Some(prop_text) = &self
             .0
-            .as_any_css_declaration_with_semicolon()
-            .and_then(|decl| decl.as_css_declaration_with_semicolon())
+            .as_css_declaration_with_semicolon()
             .and_then(css_declaration_to_prop_text)
         else {
             return usize::MAX;
@@ -300,8 +295,7 @@ impl RecessOrderMember {
     pub fn vendor_prefix_index(&self) -> usize {
         let Some(prop_text) = &self
             .0
-            .as_any_css_declaration_with_semicolon()
-            .and_then(|decl| decl.as_css_declaration_with_semicolon())
+            .as_css_declaration_with_semicolon()
             .and_then(css_declaration_to_prop_text)
         else {
             return usize::MAX;
@@ -408,8 +402,7 @@ fn contains_shorthand_after_longhand(nodes: &[AnyCssDeclarationOrRule]) -> bool
     // Starting from the bottom, when we see a shorthand property, record the set of longhand properties that are no longer allowed to appear above it.
     for node in nodes.iter().rev() {
         let Some(prop_text) = &node
-            .as_any_css_declaration_with_semicolon()
-            .and_then(|decl| decl.as_css_declaration_with_semicolon())
+            .as_css_declaration_with_semicolon()
             .and_then(css_declaration_to_prop_text)
         else {
             continue;
@@ -442,8 +435,7 @@ fn contains_shorthand_after_longhand(nodes: &[AnyCssDeclarationOrRule]) -> bool
 fn contains_unknown_property(nodes: &[AnyCssDeclarationOrRule]) -> bool {
     for node in nodes.iter() {
         let Some(prop_text) = &node
-            .as_any_css_declaration_with_semicolon()
-            .and_then(|decl| decl.as_css_declaration_with_semicolon())
+            .as_css_declaration_with_semicolon()
             .and_then(css_declaration_to_prop_text)
         else {
             continue;

crates/biome_css_analyze/src/lint/correctness/no_invalid_grid_areas.rs

@@ -91,7 +91,6 @@ impl Rule for NoInvalidGridAreas {
             .into_iter()
             .filter_map(|item| {
                 let binding = item
-                    .as_any_css_declaration_with_semicolon()?
                     .as_css_declaration_with_semicolon()?
                     .declaration()
                     .ok()?

crates/biome_css_factory/src/generated/node_factory.rs

@@ -0,0 +1,15 @@
+//! This is a generated file. Don't modify it by hand! Run 'cargo codegen formatter' to re-generate the file.
+
+use crate::prelude::*;
+use biome_css_syntax::AnyCssDeclaration;
+#[derive(Debug, Clone, Default)]
+pub(crate) struct FormatAnyCssDeclaration;
+impl FormatRule<AnyCssDeclaration> for FormatAnyCssDeclaration {
+    type Context = CssFormatContext;
+    fn fmt(&self, node: &AnyCssDeclaration, f: &mut CssFormatter) -> FormatResult<()> {
+        match node {
+            AnyCssDeclaration::CssDeclarationWithSemicolon(node) => node.format().fmt(f),
+            AnyCssDeclaration::CssEmptyDeclaration(node) => node.format().fmt(f),
+        }
+    }
+}

crates/biome_css_factory/src/generated/syntax_factory.rs

@@ -8,8 +8,9 @@ impl FormatRule<AnyCssDeclarationOrAtRule> for FormatAnyCssDeclarationOrAtRule {
     type Context = CssFormatContext;
     fn fmt(&self, node: &AnyCssDeclarationOrAtRule, f: &mut CssFormatter) -> FormatResult<()> {
         match node {
-            AnyCssDeclarationOrAtRule::AnyCssDeclarationWithSemicolon(node) => node.format().fmt(f),
             AnyCssDeclarationOrAtRule::CssAtRule(node) => node.format().fmt(f),
+            AnyCssDeclarationOrAtRule::CssDeclarationWithSemicolon(node) => node.format().fmt(f),
+            AnyCssDeclarationOrAtRule::CssEmptyDeclaration(node) => node.format().fmt(f),
         }
     }
 }

crates/biome_css_formatter/src/css/any/declaration.rs

@@ -8,9 +8,10 @@ impl FormatRule<AnyCssDeclarationOrRule> for FormatAnyCssDeclarationOrRule {
     type Context = CssFormatContext;
     fn fmt(&self, node: &AnyCssDeclarationOrRule, f: &mut CssFormatter) -> FormatResult<()> {
         match node {
-            AnyCssDeclarationOrRule::AnyCssDeclarationWithSemicolon(node) => node.format().fmt(f),
             AnyCssDeclarationOrRule::AnyCssRule(node) => node.format().fmt(f),
             AnyCssDeclarationOrRule::CssBogus(node) => node.format().fmt(f),
+            AnyCssDeclarationOrRule::CssDeclarationWithSemicolon(node) => node.format().fmt(f),
+            AnyCssDeclarationOrRule::CssEmptyDeclaration(node) => node.format().fmt(f),
             AnyCssDeclarationOrRule::CssMetavariable(node) => node.format().fmt(f),
         }
     }

crates/biome_css_formatter/src/css/any/declaration_or_at_rule.rs

@@ -14,13 +14,13 @@ pub(crate) mod container_style_in_parens;
 pub(crate) mod container_style_or_combinable_query;
 pub(crate) mod container_style_query;
 pub(crate) mod custom_identifier;
+pub(crate) mod declaration;
 pub(crate) mod declaration_block;
 pub(crate) mod declaration_name;
 pub(crate) mod declaration_or_at_rule;
 pub(crate) mod declaration_or_at_rule_block;
 pub(crate) mod declaration_or_rule;
 pub(crate) mod declaration_or_rule_block;
-pub(crate) mod declaration_with_semicolon;
 pub(crate) mod dimension;
 pub(crate) mod document_matcher;
 pub(crate) mod expression;