From f3a6f0c274c57debb54f1f9a501a33f584d69fc9 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 8 Dec 2023 13:32:29 -0600 Subject: [PATCH 1/2] test: Make it quick to iterate on diffs --- crates/snapbox/Cargo.toml | 4 ++++ crates/snapbox/examples/diff.rs | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 crates/snapbox/examples/diff.rs diff --git a/crates/snapbox/Cargo.toml b/crates/snapbox/Cargo.toml index 7128d0ac..c4adad79 100644 --- a/crates/snapbox/Cargo.toml +++ b/crates/snapbox/Cargo.toml @@ -97,3 +97,7 @@ windows-sys = { version = "0.52.0", features = ["Win32_Foundation"], optional = [target.'cfg(unix)'.dependencies] libc = { version = "0.2.137", optional = true } + +[[example]] +name = "diff" +required-features = ["diff"] diff --git a/crates/snapbox/examples/diff.rs b/crates/snapbox/examples/diff.rs new file mode 100644 index 00000000..ab56ba3f --- /dev/null +++ b/crates/snapbox/examples/diff.rs @@ -0,0 +1,24 @@ +fn main() { + let mut args = std::env::args(); + let _ = args.next().expect("expects `$ diff `"); + let old_path = args.next().expect("expects `$ diff `"); + let new_path = args.next().expect("expects `$ diff `"); + if args.next().is_some() { + panic!("expects `$ diff `"); + } + + let old = snapbox::Data::text(std::fs::read_to_string(&old_path).unwrap()); + let new = snapbox::Data::text(std::fs::read_to_string(&new_path).unwrap()); + + let mut output = String::new(); + snapbox::report::write_diff( + &mut output, + &old, + &new, + Some(&old_path), + Some(&new_path), + snapbox::report::Palette::color(), + ) + .unwrap(); + println!("{output}"); +} From 648d390e09d108a29cc4698bca0e23eb99e86963 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 8 Dec 2023 13:32:48 -0600 Subject: [PATCH 2/2] fix(snap): Finish swapping colors This was left out of 9dddde704072a4370bddeb7b831945633f611800 --- crates/snapbox/src/report/color.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/snapbox/src/report/color.rs b/crates/snapbox/src/report/color.rs index 38f4f8fc..3df14402 100644 --- a/crates/snapbox/src/report/color.rs +++ b/crates/snapbox/src/report/color.rs @@ -16,8 +16,8 @@ impl Palette { warn: anstyle::AnsiColor::Yellow.on_default(), error: anstyle::AnsiColor::Red.on_default(), hint: anstyle::Effects::DIMMED.into(), - expected: anstyle::AnsiColor::Green.on_default() | anstyle::Effects::UNDERLINE, - actual: anstyle::AnsiColor::Red.on_default() | anstyle::Effects::UNDERLINE, + expected: anstyle::AnsiColor::Red.on_default() | anstyle::Effects::UNDERLINE, + actual: anstyle::AnsiColor::Green.on_default() | anstyle::Effects::UNDERLINE, } } else { Self::plain()