git.delta.rocks / jrsonnet / refs/commits / e1e1d4b4fac9

difftreelog

fix make import trace line not show absolute path

Yaroslav Bolyukin2022-05-26parent: #cf772cc.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -649,15 +649,15 @@
 					p
 				})
 				.unwrap_or_default();
-			let path = s.resolve_file(&import_location, path as &str)?;
+			let resolved_path = s.resolve_file(&import_location, path as &str)?;
 			match i {
 				Import(_) => s.push(
 					CallLocation::new(loc),
 					|| format!("import {:?}", path.clone()),
-					|| s.import(path.clone()),
+					|| s.import(resolved_path.clone()),
 				)?,
-				ImportStr(_) => Val::Str(s.import_str(path)?),
-				ImportBin(_) => Val::Arr(ArrValue::Bytes(s.import_bin(path)?)),
+				ImportStr(_) => Val::Str(s.import_str(resolved_path)?),
+				ImportBin(_) => Val::Arr(ArrValue::Bytes(s.import_bin(resolved_path)?)),
 				_ => unreachable!(),
 			}
 		}
modifiedcrates/jrsonnet-evaluator/tests/golden/issue23.jsonnet.goldendiffbeforeafterboth
1infinite recursion detected1infinite recursion detected
2 issue23.jsonnet:1:1-26: import "/home/lach/build/jrsonnet/crates/jrsonnet-evaluator/tests/golden/issue23.jsonnet"2 issue23.jsonnet:1:1-26: import "issue23.jsonnet"