Several updates

Author: MatheusDS4

crates/parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mxmlextrema-as3parser"
-version = "1.3.5"
+version = "1.4.0"
 edition = "2021"
 authors = ["Matheus Dias de Souza <[email protected]>"]
 repository = "https://github.com/mxmlextrema/as3parser"
@@ -17,10 +17,10 @@ path = "lib.rs"
 [dependencies]
 bitflags = { version = "2.4.1", features = ["serde"] }
 bytes = "1"
-hydroperfox-filepaths = "1.0.0"
+realhydroper-path = "1.0.0"
 conv = "0.3.3"
 htmlentity = "1.3.1"
-hydroperfox-lateformat = "1"
+realhydroper-lateformat = "1"
 maplit = "1.0.2"
 num-bigint = "0.4"
 num-derive = "0.4.1"
@@ -31,4 +31,4 @@ unicode-general-category = "0.6.0"
 by_address = "1.1.0"
 serde = { version = "1.0.192", features = ["rc", "derive"] }
 serde_json = "1.0.108"
-hydroperfox-sourcetext = "1"
+realhydroper-sourcetext = "1"

crates/parser/compilation_unit/compilation_unit.rs

@@ -1,7 +1,7 @@
 use std::{any::Any, cell::RefMut};
 use std::fmt::{Debug, Formatter};
 use crate::ns::*;
-use hydroperfox_sourcetext::SourceText;
+use realhydroper_sourcetext::SourceText;
 
 /// `CompilationUnit` identifies an AS3 compilation unit and contains
 /// a source text.
@@ -249,5 +249,5 @@ impl CompilationUnit {
 }
 
 fn canonicalize_path(path: &str) -> String {
-    std::path::Path::new(path).canonicalize().unwrap_or(std::path::PathBuf::new()).to_string_lossy().into_owned()
+    std::path::Path::new(path).canonicalize().unwrap_or_else(|_| std::path::PathBuf::new()).to_string_lossy().into_owned()
 }

crates/parser/compilation_unit/location.rs

@@ -144,6 +144,16 @@ impl Location {
         self.compilation_unit.get_column(self.last_offset)
     }
 
+    /// Zero based first column offset of the location.
+    pub fn first_column_offset(&self) -> usize {
+        self.first_offset - self.compilation_unit.get_line_offset_from_offset(self.first_offset)
+    }
+
+    /// Zero based last column offset of the location.
+    pub fn last_column_offset(&self) -> usize {
+        self.last_offset - self.compilation_unit.get_line_offset_from_offset(self.last_offset)
+    }
+
     pub fn character_count(&self) -> usize {
         self.compilation_unit.text()[self.first_offset..self.last_offset].chars().count()
     }
@@ -170,7 +180,7 @@ impl Location {
         Self::with_offsets(&self.compilation_unit, self.first_offset + ch.index(), self.last_offset)
     }
 
-    /// Shifts the count of whitespace characters in a text off this location.
+    /// Shifts the count of first whitespace characters in a text off this location.
     pub fn shift_whitespace(&self, text: &str) -> Location {
         self.shift_until_eof(count_first_whitespace_characters(text))
     }

crates/parser/diagnostics/diagnostic_kind.rs

@@ -70,6 +70,7 @@ pub enum DiagnosticKind {
     XmlClosingTagNameMustBeEquals = 1090,
     UnexpectedIncludeExtension = 1091,
     UnallowedExpression = 1092,
+    ExpectingCssSelector = 1093,
 }
 
 impl DiagnosticKind {

crates/parser/diagnostics/diagnostics.rs

@@ -1,6 +1,6 @@
 use std::any::Any;
 
-use hydroperfox_filepaths::FlexPath;
+use realhydroper_path::FlexPath;
 use maplit::hashmap;
 use crate::ns::*;
 
@@ -168,12 +168,12 @@ impl Diagnostic {
             string_arguments.insert(i.to_string(), argument.to_string());
             i += 1;
         }
-        use hydroperfox_lateformat::LateFormat;
+        use realhydroper_lateformat::LateFormat;
         let Some(msg) = messages.get(&self.id()) else {
             let id = self.id();
             panic!("Message resource is missing for ID {id}");
         };
-        msg.hydroperfox_lateformat(string_arguments)
+        msg.realhydroper_lateformat(string_arguments)
     }
 }
 

crates/parser/diagnostics/diagnostics_english_resources.rs

@@ -73,6 +73,7 @@ lazy_static! {
         DiagnosticKind::XmlClosingTagNameMustBeEquals.id() => "Closing tag name must be equals '{1}'.".into(),
         DiagnosticKind::UnexpectedIncludeExtension.id() => "Unexpected include extension. Expected the file extension '.include.as'.".into(),
         DiagnosticKind::UnallowedExpression.id() => "Unallowed expression.".into(),
+        DiagnosticKind::ExpectingCssSelector.id() => "Expecting selector here.".into(),
         // DiagnosticKind::K.id() => ".".into(),
     };
 }

crates/parser/parser/css_parser.rs

@@ -183,7 +183,7 @@ impl<'input> CssParser<'input> {
         }))
     }
 
-    fn _create_invalidated_selector(&self, location: &Location) -> Rc<CssSelector> {
+    fn create_invalidated_selector(&self, location: &Location) -> Rc<CssSelector> {
         Rc::new(CssSelector::Invalidated(InvalidatedNode {
             location: location.clone(),
         }))
@@ -248,6 +248,8 @@ impl<'input> CssParser<'input> {
             self.parse_media_query()
         } else if self.peek(Token::CssAtFontFace) {
             self.parse_font_face()
+        } else if self.peek(Token::CssAtImport) {
+            self.parse_import()
         } else {
             self.add_syntax_error(&self.token.1, DiagnosticKind::ExpectingDirective, diagarg![self.token.0.clone()]);
             let d = self.create_invalidated_directive(&self.tokenizer.cursor_location());
@@ -317,6 +319,25 @@ impl<'input> CssParser<'input> {
         }))
     }
 
+    fn parse_import(&mut self) -> Rc<CssDirective> {
+        self.mark_location();
+        self.next();
+
+        let mut url: Option<String> = None;
+        if self.consume_keyword("url") {
+            if let Ok(facade) = self.parse_arguments() {
+                url = Some(facade.parse_text().0);
+            }
+        }
+
+        self.expect(Token::Semicolon);
+
+        Rc::new(CssDirective::Import(CssImport {
+            location: self.pop_location(),
+            url,
+        }))
+    }
+
     fn parse_opt_media_query_condition(&mut self) -> Option<Rc<CssMediaQueryCondition>> {
         let mut base: Option<Rc<CssMediaQueryCondition>> = None;
         if self.peek_keyword("only") {
@@ -407,20 +428,46 @@ impl<'input> CssParser<'input> {
     fn parse_opt_selector(&mut self) -> Option<Rc<CssSelector>> {
         let mut base = self.parse_opt_base_selector()?;
 
-        // Parse descendant combinators
-        while let Some(right) = self.parse_opt_base_selector() {
-            self.push_location(&base.location());
-            base = Rc::new(CssSelector::Combinator(CssCombinatorSelector {
-                location: self.pop_location(),
-                left: base,
-                right,
-                combinator_type: CssCombinatorType::Descendant,
-            }));
+        // Parse combinators
+        loop {
+            // CssCombinatorType::Child
+            if self.consume(Token::Gt) {
+                self.push_location(&base.location());
+                let right: Rc<CssSelector> = self.parse_base_selector();
+                base = Rc::new(CssSelector::Combinator(CssCombinatorSelector {
+                    location: self.pop_location(),
+                    left: base,
+                    right,
+                    combinator_type: CssCombinatorType::Child,
+                }));
+            // CssCombinatorType::Descendant
+            } else if let Some(right) = self.parse_opt_base_selector() {
+                self.push_location(&base.location());
+                base = Rc::new(CssSelector::Combinator(CssCombinatorSelector {
+                    location: self.pop_location(),
+                    left: base,
+                    right,
+                    combinator_type: CssCombinatorType::Descendant,
+                }));
+            } else {
+                break;
+            }
         }
 
         Some(base)
     }
 
+    fn parse_base_selector(&mut self) -> Rc<CssSelector> {
+        let s = self.tokenizer.cursor_location();
+        let r = self.parse_opt_base_selector();
+        if let Some(r) = r {
+            r
+        } else {
+            self.add_syntax_error(&s, DiagnosticKind::ExpectingCssSelector, diagarg![]);
+            self.create_invalidated_selector(&s)
+        }
+    }
+
     fn parse_opt_base_selector(&mut self) -> Option<Rc<CssSelector>> {
         self.mark_location();
         let mut namespace_prefix: Option<(String, Location)> = None;
@@ -473,7 +520,14 @@ impl<'input> CssParser<'input> {
         if self.peek(Token::Colon) {
             self.mark_location();
             self.next();
-            if self.consume_keyword("not") {
+            if self.consume_keyword("nth-child") {
+                let condition = if let Ok(a) = self.parse_arguments() {
+                    a.parse_nth_child_kind()
+                } else {
+                    CssNthChildKind::Invalidated
+                };
+                return Some(Rc::new(CssSelectorCondition::NthChild((condition, self.pop_location()))));
+            } else if self.consume_keyword("not") {
                 let condition = if let Ok(a) = self.parse_arguments() {
                     a.parse_selector_condition()
                 } else {
@@ -844,4 +898,21 @@ impl<'input> CssParserFacade<'input> {
         parser.expect_eof();
         entries
     }
+
+    pub fn parse_nth_child_kind(&self) -> CssNthChildKind {
+        let mut parser = self.create_parser();
+        parser.next();
+        if parser.consume_keyword("odd") {
+            return CssNthChildKind::Odd;
+        }
+        if parser.consume_keyword("even") {
+            return CssNthChildKind::Even;
+        }
+        if let Token::CssNumber { value, .. } = parser.token.0.clone() {
+            parser.next();
+            return CssNthChildKind::Number(value.round().to_u32().unwrap_or(0));
+        }
+        parser.expect_eof();
+        CssNthChildKind::Invalidated
+    }
 }

crates/parser/parser/css_tokenizer.rs

@@ -130,6 +130,11 @@ impl<'input> CssTokenizer<'input> {
                 self.characters.skip_count_in_place(10);
                 return (Token::CssAtFontFace, start.combine_with(self.cursor_location()));
             }
+            // @import
+            if self.characters.peek_seq(10) == "@import" {
+                self.characters.skip_count_in_place(10);
+                return (Token::CssAtImport, start.combine_with(self.cursor_location()));
+            }
             // @media
             if self.characters.peek_seq(6) == "@media" {
                 self.characters.skip_count_in_place(6);