cleanup of the css3 crate

Author: jaytaph

Cargo.lock

@@ -11,18 +11,17 @@ gosub_shared = { version = "0.1.1", registry = "gosub", path = "../gosub_shared"
 gosub_interface = { version = "0.1.1", registry = "gosub", path = "../gosub_interface", features = [] }
 lazy_static = { workspace = true }
 log = { workspace = true }
-simple_logger = { workspace = true }
 anyhow = { workspace = true, features = [] }
 colors-transform = "0.2.11"
-rand = { workspace = true }
-itertools = "0.15.0"
 serde_json = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-thiserror = { workspace = true }
 nom = { workspace = true }
 cow-utils = { workspace = true }
 indexmap = { version = "2.13.0", optional = true }
 
+[dev-dependencies]
+simple_logger = { workspace = true }
+
 [features]
 default = []
 unresolved_syntax = ["dep:indexmap"]

crates/gosub_css3/Cargo.toml

@@ -3,7 +3,6 @@ use gosub_interface::config::HasDocument;
 use gosub_interface::document::Document;
 use gosub_shared::node::NodeId;
 
-#[allow(dead_code)]
 pub fn resolve_attr<C: HasDocument>(values: &[CssValue], doc: &C::Document, id: NodeId) -> Vec<CssValue> {
     let Some(attr_name) = values.first().map(std::string::ToString::to_string) else {
         return vec![];

crates/gosub_css3/src/errors.rs

@@ -1,4 +1,7 @@
-extern crate core;
+//! CSS3 parser for Gosub.
+//!
+//! This parser is heavily based on the MIT-licensed `CssTree` parser written by Roman Dvornov
+//! (<https://github.com/lahmatiy>). The original can be found at <https://github.com/csstree/csstree>.
 
 use crate::ast::convert_ast_to_stylesheet;
 use crate::stylesheet::CssStylesheet;
@@ -12,13 +15,8 @@ use gosub_shared::errors::{CssError, CssResult};
 use gosub_shared::{timing_start, timing_stop};
 
 pub mod ast;
-/// This CSS3 parser is heavily based on the MIT licensed `CssTree` parser written by
-/// Roman Dvornov (<https://github.com/lahmatiy>).
-/// The original version can be found at <https://github.com/csstree/csstree>
 pub mod colors;
-pub mod errors;
 mod functions;
-#[allow(dead_code)]
 pub mod matcher;
 // The as_* accessors panic by contract when called on the wrong node type;
 // callers are expected to check the matching is_* predicate first.
@@ -117,10 +115,6 @@ impl<'stream> Css3<'stream> {
 
         let t_id = timing_start!("css3.parse", self.config.source.as_deref().unwrap_or(""));
 
-        // let mut stream = ByteStream::new(Encoding::UTF8, None);
-        // stream.read_from_str(data, Some(Encoding::UTF8));
-        // stream.close();
-
         let node_tree = match self.config.context {
             Context::Stylesheet => self.parse_stylesheet_internal(),
             Context::Rule => self.parse_rule(),
@@ -158,7 +152,6 @@ pub fn load_default_useragent_stylesheet() -> CssStylesheet {
 #[cfg(test)]
 mod tests {
     use super::*;
-    // use crate::walker::Walker;
     use simple_logger::SimpleLogger;
 
     #[test]
@@ -179,9 +172,5 @@ mod tests {
         if res.is_err() {
             println!("{:?}", res.err().unwrap());
         }
-
-        // let binding = res.unwrap();
-        // let w = Walker::new(&binding);
-        // w.walk_stdout();
     }
 }

crates/gosub_css3/src/functions/attr.rs

@@ -390,20 +390,6 @@ impl CssValue {
 mod test {
     use super::*;
 
-    // #[test]
-    // fn test_css_value_to_color() {
-    //     assert_eq!(CssValue::from_str("color(#ff0000)").unwrap().to_color().unwrap(), RgbColor::from("#ff0000"));
-    //     assert_eq!(CssValue::from_str("'Hello'").unwrap().to_color().unwrap(), RgbColor::from("#000000"));
-    // }
-    //
-    // #[test]
-    // fn test_css_value_unit_to_px() {
-    //     assert_eq!(CssValue::from_str("10px").unwrap().unit_to_px(), 10.0);
-    //     assert_eq!(CssValue::from_str("10em").unwrap().unit_to_px(), 160.0);
-    //     assert_eq!(CssValue::from_str("10rem").unwrap().unit_to_px(), 160.0);
-    //     assert_eq!(CssValue::from_str("10").unwrap().unit_to_px(), 0.0);
-    // }
-
     #[test]
     fn test_css_rule() {
         let rule = CssRule {

crates/gosub_css3/src/lib.rs

@@ -3,4 +3,3 @@ pub mod shorthands;
 pub mod styling;
 pub mod syntax;
 mod syntax_matcher;
-mod walker;

crates/gosub_css3/src/logging.rs

@@ -132,23 +132,6 @@ impl PropertyDefinition {
         }
     }
 
-    #[must_use]
-    pub fn check_expanded_properties(&self, _values: &[CssValue]) -> bool {
-        // if values.len() != self.expanded_properties.len() {
-        //     return false;
-        // }
-        //
-        // for (i, value) in values.iter().enumerate() {
-        //     let prop = self.expanded_properties.get(i).unwrap();
-        //     let prop_def = parse_definition_file().find(prop).unwrap();
-        //     if !prop_def.matches(&[value.clone()]) {
-        //         return false;
-        //     }
-        // }
-
-        true
-    }
-
     #[must_use]
     pub fn is_shorthand(&self) -> bool {
         self.computed.len() > 1
@@ -552,12 +535,6 @@ fn parse_property_file<M: Map<String, PropertyDefinition>>(json: serde_json::Val
 
         let initial_value = if obj["initial_value"].is_array() {
             warn!("Initial value is an array, not supported {obj:?}");
-            // obj["initial_value"]
-            //     .as_array()
-            //     .unwrap()
-            //     .iter()
-            //     .map(|v| CssValue::from(v))
-            //     .collect()
             None
         } else if obj["initial_value"].is_string() {
             match CssValue::parse_str(obj["initial_value"].as_str().unwrap()) {
@@ -568,7 +545,6 @@ fn parse_property_file<M: Map<String, PropertyDefinition>>(json: serde_json::Val
                 }
             }
         } else {
-            // warn!("Initial value is not a string or array {:?}", obj);
             None
         };
 
@@ -744,7 +720,6 @@ mod tests {
         let definitions = get_css_definitions();
         let def = definitions.find_property("background-color").unwrap();
 
-        // assert_some!(def.clone().matches(&CssValue::Inherit));
         assert_true!(def.clone().matches(&[str!("transparent")]));
 
         assert_true!(def.clone().matches(&[str!("red")]));
@@ -766,7 +741,6 @@ mod tests {
         let definitions = get_css_definitions();
         let def = definitions.find_property("background-attachment").unwrap();
 
-        // assert_true!(def.clone().matches(&CssValue::Inherit));
         assert_true!(def.clone().matches(&[str!("scroll")]));
         assert_true!(def.clone().matches(&[str!("fixed")]));
 

crates/gosub_css3/src/matcher.rs

@@ -671,18 +671,6 @@ impl CssDefinitions {
             }
         }
 
-        // if !found_props.is_empty() {
-        //     println!("Found partial expanded properties for shorthand: {}", name);
-        // } else {
-        // println!("Missing properties for shorthand: {}", name);
-        // }
-        // let missing = computed
-        //     .iter()
-        //     .filter(|computed| !found_props.iter().any(|p| p.name == **computed))
-        //     .collect::<Vec<_>>();
-        //
-        // println!("Missing properties: {:?}", missing);
-
         None
     }
 }

crates/gosub_css3/src/matcher/property_definitions.rs

@@ -1,6 +1,5 @@
 use core::fmt::Debug;
 use cow_utils::CowUtils;
-use itertools::Itertools;
 use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::fmt::Display;
@@ -293,7 +292,7 @@ fn match_selector_part<C: HasDocument>(
 
                 let children = doc.children(parent_id);
 
-                let Some(my_index) = children.iter().find_position(|&&c| c == current_id).map(|(i, _)| i) else {
+                let Some(my_index) = children.iter().position(|&c| c == current_id) else {
                     return false;
                 };