fix ast file abs path

Signed-off-by: he1pa <[email protected]>
kcl-lang · Sep 20, 2024 · 4e19fb2 · 4e19fb2
1 parent 5e4d764
commit 4e19fb2
Show file tree

Hide file tree

Showing 5 changed files with 236 additions and 146 deletions.
diff --git a/kclvm/api/src/capi_test.rs b/kclvm/api/src/capi_test.rs
@@ -101,8 +101,14 @@ fn test_c_api_get_schema_type_mapping() {
         "get-schema-type-mapping.json",
         "get-schema-type-mapping.response.json",
         |r| {
+            let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+            let root = root.to_str().unwrap();
             for (_, s_ty) in &mut r.schema_type_mapping {
-                s_ty.filename = s_ty.filename.replace('/', "").replace('\\', "")
+                let filename = match s_ty.filename.strip_prefix(root) {
+                    Some(f) => f.to_string(),
+                    None => s_ty.filename.clone(),
+                };
+                s_ty.filename = filename.replace('.', "").replace('/', "").replace('\\', "")
             }
         },
     );

diff --git a/kclvm/parser/src/file_graph.rs b/kclvm/parser/src/file_graph.rs
@@ -12,6 +12,15 @@ pub struct PkgFile {
     pub pkg_root: String,
 }
 
+impl PkgFile {
+    pub fn canonicalize(&self) -> PathBuf {
+        match self.path.canonicalize() {
+            Ok(p) => p.clone(),
+            _ => self.path.clone(),
+        }
+    }
+}
+
 /// A graph of files, where each file depends on zero or more other files.
 #[derive(Default)]
 pub struct PkgFileGraph {