git.delta.rocks / jrsonnet / refs/commits / 78734bcaf74c

--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -241,7 +241,6 @@
 					Minify => {}
 				};
 
-				buf.push_str(cur_padding);
 				State::push_description(
 					|| format!("elem <{i}> manifestification"),
 					|| manifest_json_ex_buf(&item, buf, cur_padding, options),
@@ -298,8 +297,8 @@
 						buf.push_str(options.newline);
 						buf.push_str(cur_padding);
 					}
-					ToString => buf.push(' '),
-					Minify => {}
+					ToString if i != 0 => buf.push(' '),
+					Minify | ToString => {}
 				}
 
 				escape_string_json_buf(&key, buf);

--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -164,7 +164,7 @@
 		("objectRemoveKey", builtin_object_remove_key::INST),
 		// Manifest
 		("escapeStringJson", builtin_escape_string_json::INST),
-		("escapeStringPython", builtin_escape_string_json::INST),
+		("escapeStringPython", builtin_escape_string_python::INST),
 		("escapeStringXML", builtin_escape_string_xml::INST),
 		("manifestJsonEx", builtin_manifest_json_ex::INST),
 		("manifestJson", builtin_manifest_json::INST),

18	Ok(escape_string_json(&str_))18	Ok(escape_string_json(&str_))
19}19}
20
21#[builtin]
22pub fn builtin_escape_string_python(str: IStr) -> Result<String> {
23	Ok(escape_string_json(&str))
24}
2025
21#[builtin]26#[builtin]
22pub fn builtin_manifest_json_ex(27pub fn builtin_manifest_json_ex(
164}169}
165#[builtin]170#[builtin]
166pub fn builtin_manifest_python_vars(171pub fn builtin_manifest_python_vars(
167	v: Val,172	conf: Val,
168173
169	#[default(false)]174	#[default(false)]
170	#[cfg(feature = "exp-preserve-order")]175	#[cfg(feature = "exp-preserve-order")]
171	preserve_order: bool,176	preserve_order: bool,
172) -> Result<String> {177) -> Result<String> {
173	v.manifest(PythonVarsFormat::std(178	conf.manifest(PythonVarsFormat::std(
174		#[cfg(feature = "exp-preserve-order")]179		#[cfg(feature = "exp-preserve-order")]
175		preserve_order,180		preserve_order,
176	))181	))

--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -37,8 +37,8 @@
 }
 
 #[builtin]
-pub fn builtin_escape_string_dollars(str: String) -> String {
-	str.replace('$', "$$")
+pub fn builtin_escape_string_dollars(str_: String) -> String {
+	str_.replace('$', "$$")
 }
 
 #[builtin]