From cb3ff111b59832f9da2fd3ecf01cf0ea26664a3e Mon Sep 17 00:00:00 2001 From: Mex <44814932+MMexicann@users.noreply.github.com> Date: Thu, 19 Nov 2026 22:15:16 +0100 Subject: [PATCH] fix(swatches): accept UTF-8 BOM JSON files (M8) Follow the existing command-file BOM convention while preserving the raw-byte size limit and GPL parser path. Add an exported-file round-trip regression. --- crates/engine/src/cmds_swatch.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/crates/engine/src/cmds_swatch.rs b/crates/engine/src/cmds_swatch.rs index 01697060..7c0d3afe 100644 --- a/crates/engine/src/cmds_swatch.rs +++ b/crates/engine/src/cmds_swatch.rs @@ -253,7 +253,8 @@ pub fn parse_file(text: &str) -> Result> { if text.trim_start_matches('\u{feff}').trim_start().starts_with("GIMP Palette") { return parse_gpl(text).map(|(_, v)| v).map_err(EngineError::Param); } - let v: Value = serde_json::from_str(text).map_err(|e| EngineError::Param(format!("this isn't a swatch file or a GIMP palette ({e})")))?; + let v: Value = serde_json::from_str(text.trim_start_matches('\u{feff}')) + .map_err(|e| EngineError::Param(format!("this isn't a swatch file or a GIMP palette ({e})")))?; if v.get("format").and_then(Value::as_str) != Some(FORMAT) { return Err(EngineError::Param(format!("this JSON isn't a swatch file (its \"format\" must be \"{FORMAT}\")"))); } @@ -300,3 +301,16 @@ fn export(s: &mut Session, p: &Value) -> Result { crate::vfs::write(&path, text.as_bytes())?; Ok(json!({"written": path.display().to_string(), "swatches": s.doc.swatches.len(), "bytes": text.len()})) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn json_swatch_files_accept_a_utf8_byte_order_mark() { + let text = file_json(&default_set()); + let expected = parse_file(&text).unwrap(); + assert!(!expected.is_empty()); + assert_eq!(parse_file(&format!("\u{feff}{text}")).unwrap(), expected); + } +}