fix: fix entry path in Windows (#1710)

* fix: fix entry path in Windows Signed-off-by: he1pa <18012015693@163.com> * fix ut Signed-off-by: he1pa <18012015693@163.com> --------- Signed-off-by: he1pa <18012015693@163.com>
kcl-lang · Oct 23, 2024 · daa7b18 · daa7b18
1 parent fc64537
commit daa7b18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/kclvm/parser/src/lib.rs b/kclvm/parser/src/lib.rs
@@ -100,10 +100,11 @@ pub struct ParseFileResult {
 
 /// Parse a KCL file to the AST module with parse errors.
 pub fn parse_single_file(filename: &str, code: Option<String>) -> Result<ParseFileResult> {
+    let filename = filename.adjust_canonicalization();
     let sess = Arc::new(ParseSession::default());
     let mut loader = Loader::new(
         sess,
-        &[filename],
+        &[&filename],
         Some(LoadProgramOptions {
             load_packages: false,
             k_code_list: if let Some(code) = code {
@@ -789,7 +790,7 @@ pub fn parse_entry(
     let mut files = vec![];
     for (i, f) in k_files.iter().enumerate() {
         let file = PkgFile {
-            path: f.into(),
+            path: f.adjust_canonicalization().into(),
             pkg_path: MAIN_PKG.to_string(),
         };
         files.push((file.clone(), maybe_k_codes.get(i).unwrap_or(&None).clone()));

diff --git a/kclvm/query/src/tests.rs b/kclvm/query/src/tests.rs
@@ -859,7 +859,10 @@ fn test_list_variable_with_invalid_kcl() {
         result.parse_errors[0].messages[0].message,
         "expected one of [\"=\"] got eof",
     );
-    assert_eq!(result.parse_errors[0].messages[0].range.0.filename, file);
+    assert_eq!(
+        result.parse_errors[0].messages[0].range.0.filename,
+        file.adjust_canonicalization()
+    );
     assert_eq!(result.parse_errors[0].messages[0].range.0.line, 1);
     assert_eq!(result.parse_errors[0].messages[0].range.0.column, Some(8));
 }