From 51ff2d439b8378e9641a1aa7d011fb95ebeb2800 Mon Sep 17 00:00:00 2001 From: Simon Klee Date: Wed, 18 Nov 2026 20:39:02 +0100 Subject: [PATCH] test(cli-rs): check local config edits at the file boundary cli_config_files_match_typescript covers ordered edits, merging, legacy tabs and preservation of neighboring settings in the saved file. decode_and_resolve_match_typescript checks default values. Keep reloading_keeps_the_initial_tabs_environment for the reload-only case. jsonc_edits_and_parse_match_typescript covers parsing and number formatting with an independent implementation. Exercise escaped surrogates, nested values, and both sides of the decimal/exponent boundary through the edit result instead of a second formatter table. --- .../cli-rs/crates/local/src/cli_config.rs | 39 +---------------- packages/cli-rs/crates/local/src/jsonc.rs | 42 ------------------- .../crates/local/tests/config_interop.rs | 11 +++++ 3 files changed, 12 insertions(+), 80 deletions(-) diff --git a/packages/cli-rs/crates/local/src/cli_config.rs b/packages/cli-rs/crates/local/src/cli_config.rs index f7eee8c1026..17906c2d9e4 100644 --- a/packages/cli-rs/crates/local/src/cli_config.rs +++ b/packages/cli-rs/crates/local/src/cli_config.rs @@ -709,47 +709,10 @@ impl Resolved { #[cfg(test)] mod tests { use super::*; - use serde_json::json; #[test] - fn merge_overlays_and_normalizes_tabs() { - let merged = merge(&[ - Some(json!({"tabs": {"enabled": true, "scope": "global"}, "theme": {"name": "a", "mode": "dark"}})), - Some(json!({"theme": {"name": "b"}})), - ]); - assert_eq!( - merged.to_value(), - json!({"theme": {"name": "b", "mode": "dark"}, "tabs": {"mode": "on", "scope": "global"}}) - ); - assert_eq!(merge(&[Some(json!({"mouse": 1}))]), Info::default()); - } - - #[test] - fn changes_diff_like_typescript() { - let mut edits = Vec::new(); - changes( - Some(&json!({"a": {"b": 1, "c": [1]}, "d": true})), - Some(&json!({"a": {"b": 2, "c": [1]}, "e": "x"})), - &mut Vec::new(), - &mut edits, - ); - let key = |k: &str| Segment::Key(k.into()); - assert_eq!( - edits, - vec![ - (vec![key("a"), key("b")], Some(json!(2))), - (vec![key("d")], None), - (vec![key("e")], Some(json!("x"))), - ] - ); - } - - #[test] - fn resolve_applies_defaults() { + fn reloading_keeps_the_initial_tabs_environment() { let resolved = Resolved::new(Info::default(), |_| None); - assert_eq!(resolved.leader_timeout, Duration::from_millis(2000)); - assert_eq!(resolved.attention.volume, 0.4); - assert!(resolved.tabs.enabled && resolved.mouse && resolved.tps); let herdr = Resolved::new(Info::default(), |name| (name == "HERDR_ENV").then(|| "1".to_string())); assert!(!herdr.tabs.enabled); // A reload keeps the environment of the first resolve. diff --git a/packages/cli-rs/crates/local/src/jsonc.rs b/packages/cli-rs/crates/local/src/jsonc.rs index 58a8b87faf4..bcf89bd30ea 100644 --- a/packages/cli-rs/crates/local/src/jsonc.rs +++ b/packages/cli-rs/crates/local/src/jsonc.rs @@ -1047,45 +1047,3 @@ fn format_range(document: &str, range_start: usize, range_end: usize) -> Vec