diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | niri-config/Cargo.toml | 1 | ||||
| -rw-r--r-- | niri-config/src/lib.rs | 101 |
3 files changed, 102 insertions, 1 deletions
@@ -2415,6 +2415,7 @@ version = "25.8.0" dependencies = [ "bitflags 2.9.3", "csscolorparser", + "diff", "insta", "knuffel", "miette", diff --git a/niri-config/Cargo.toml b/niri-config/Cargo.toml index b0a9a003..43580cad 100644 --- a/niri-config/Cargo.toml +++ b/niri-config/Cargo.toml @@ -21,3 +21,4 @@ tracy-client.workspace = true [dev-dependencies] insta.workspace = true pretty_assertions = "1.4.1" +diff = "0.1.13" diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index e795b46e..95ebc3cd 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -234,7 +234,7 @@ impl ConfigPath { #[cfg(test)] mod tests { - use insta::assert_debug_snapshot; + use insta::{assert_debug_snapshot, assert_snapshot}; use pretty_assertions::assert_eq; use super::*; @@ -1773,4 +1773,103 @@ mod tests { } "#); } + + fn diff_lines(expected: &str, actual: &str) -> String { + let mut output = String::new(); + let mut in_change = false; + + for change in diff::lines(expected, actual) { + match change { + diff::Result::Both(_, _) => { + in_change = false; + } + diff::Result::Left(line) => { + if !output.is_empty() && !in_change { + output.push('\n'); + } + output.push('-'); + output.push_str(line); + output.push('\n'); + in_change = true; + } + diff::Result::Right(line) => { + if !output.is_empty() && !in_change { + output.push('\n'); + } + output.push('+'); + output.push_str(line); + output.push('\n'); + in_change = true; + } + } + } + + output + } + + #[test] + fn diff_empty_to_default() { + // We try to write the config defaults in such a way that empty sections (and an empty + // config) give the same outcome as the default config bundled with niri. This test + // verifies the actual differences between the two. + let mut default_config = Config::default(); + let empty_config = Config::parse("empty.kdl", "").unwrap(); + + // Some notable omissions: the default config has some window rules, and an empty config + // will not have any binds. Clear them out so they don't spam the diff. + default_config.window_rules.clear(); + default_config.binds.0.clear(); + + assert_snapshot!( + diff_lines( + &format!("{empty_config:#?}"), + &format!("{default_config:#?}") + ), + @r#" + - numlock: false, + + numlock: true, + + - tap: false, + + tap: true, + + - natural_scroll: false, + + natural_scroll: true, + + - spawn_at_startup: [], + + spawn_at_startup: [ + + SpawnAtStartup { + + command: [ + + "waybar", + + ], + + }, + + ], + + - a: 0.4392157, + + a: 0.46666667, + + - preset_column_widths: [], + - default_column_width: None, + + preset_column_widths: [ + + Proportion( + + 0.33333, + + ), + + Proportion( + + 0.5, + + ), + + Proportion( + + 0.66667, + + ), + + ], + + default_column_width: Some( + + DefaultPresetSize( + + Some( + + Proportion( + + 0.5, + + ), + + ), + + ), + + ), + "# + ); + } } |