Update

Author: MatheusDS4

crates/parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mxmlextrema-as3parser"
-version = "1.5.1"
+version = "1.5.2"
 edition = "2021"
 authors = ["Matheus Dias de Souza <hydroperfox@gmail.com>"]
 repository = "https://github.com/mxmlextrema/as3parser"

crates/parser/compilation_unit/compilation_unit.rs

@@ -249,5 +249,5 @@ impl CompilationUnit {
 }
 
 fn canonicalize_path(path: &str) -> String {
-    std::path::Path::new(path).canonicalize().unwrap_or_else(|_| std::path::PathBuf::new()).to_string_lossy().into_owned()
+    realhydroper_path::canonicalize_inexistent_path(std::path::Path::new(path)).to_string_lossy().into_owned()
 }

crates/parser/parser/parser.rs

@@ -3692,11 +3692,11 @@ impl<'input> Parser<'input> {
             } else {
                 // Read included content
 
-                let sub_file_path_pathbuf = sub_flex_file_path.to_path_buf().canonicalize().unwrap_or(PathBuf::new());
+                let sub_file_path_pathbuf = realhydroper_path::canonicalize_inexistent_path(&sub_flex_file_path.to_path_buf());
                 let mut replaced = false;
 
                 for (replace_file_path, content) in self.replace_included_content.read().unwrap().iter() {
-                    if sub_file_path_pathbuf == replace_file_path.canonicalize().unwrap() {
+                    if sub_file_path_pathbuf == realhydroper_path::canonicalize_inexistent_path(&replace_file_path) {
                         nested_compilation_unit = Some(CompilationUnit::new(Some(sub_file_path_pathbuf.to_str().unwrap().to_owned()), content.clone()));
                         replaced = true;
                         break;

crates/parser_test/Cargo.toml

@@ -16,7 +16,7 @@ path = "main.rs"
 
 [dependencies]
 clap = { version = "4.4.8", features = ["derive"] }
-hydroperfox-filepaths = "1.0.0"
+realhydroper-path = "1"
 mxmlextrema-as3parser = { path = "../parser", version = "1" }
 maplit = "1.0.2"
 serde = { version = "1.0.192", features = ["rc", "derive"] }

crates/parser_test/main.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use hydroperfox_filepaths::FlexPath;
+use realhydroper_path::FlexPath;
 use std::{env, fs, io};
 use mxmlextrema_as3parser::ns::*;
 
@@ -21,13 +21,10 @@ struct Arguments {
 
 fn main() -> io::Result<()> {
     let arguments = Arguments::parse();
-    let source_path = FlexPath::from_n_native([env::current_dir().unwrap().to_string_lossy().into_owned().as_ref(), arguments.source_path.as_ref()]).to_string_with_flex_separator();
+    let source_path = FlexPath::from_n_native([env::current_dir().unwrap().to_string_lossy().into_owned().as_ref(), arguments.source_path.as_ref()]).to_string();
 
-    // Canonicalize path
-    // let source_path = std::path::Path::new(&source_path).canonicalize().unwrap().to_string_lossy().into_owned();
-
-    let source_path_ast_json = FlexPath::new_native(&source_path).change_extension(".tree").to_string_with_flex_separator();
-    let source_path_diagnostics = FlexPath::new_native(&source_path).change_extension(".diag").to_string_with_flex_separator();
+    let source_path_ast_json = FlexPath::new_native(&source_path).change_extension(".tree").to_string();
+    let source_path_diagnostics = FlexPath::new_native(&source_path).change_extension(".diag").to_string();
     let source_content = fs::read_to_string(&source_path)?;
     let compilation_unit = CompilationUnit::new(Some(source_path), source_content);
     if arguments.mxml {