From 07fcccd8551c22763b6ba8aba2fb3ecd5210df4e Mon Sep 17 00:00:00 2001 From: Zinadin Zidan Date: Sat, 14 Nov 2026 21:58:34 +0600 Subject: [PATCH] engine: custom-list sort puts unlisted values A to Z after the list (#3949) A custom-list sort key compared only each value's position in the list. Every value outside the list got the same position, so the stable sort left them in their original order. Excel sorts them after the listed values in the usual order. Two unlisted values now compare as a sort without a list does (matchCase included). --- crates/engine/src/cmd/data/sort.rs | 21 ++++++++++++++++----- crates/engine/src/tests.rs | 11 +++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/crates/engine/src/cmd/data/sort.rs b/crates/engine/src/cmd/data/sort.rs index 491e3d51e..dc1763466 100644 --- a/crates/engine/src/cmd/data/sort.rs +++ b/crates/engine/src/cmd/data/sort.rs @@ -119,15 +119,26 @@ fn do_sort(s: &mut Session, sheet: usize, r: RangeRef, header: bool, keys: Vec a.cmp(&b), + (Some(_), None) => Ordering::Less, + (None, Some(_)) => Ordering::Greater, + // Values not in the list follow the listed ones in the usual order, as in Excel. + (None, None) => plain(), + } } else { - sort_compare(va, vb) + plain() }; // Blanks always sort last, whatever the order. let o = if k.desc && !(va.is_empty() || vb.is_empty()) { o.reverse() } else { o }; diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index f5c17ba16..347190d0e 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -1621,6 +1621,17 @@ fn case_sensitive_sort_puts_lowercase_first() { assert_eq!(col, ["a", "A", "aB", "Ab", "b", "B"].map(Value::from)); } +/// #3949: Excel sorts values that are not in the custom list A to Z after the listed ones. +#[test] +fn custom_list_sort_puts_unlisted_values_after_the_list_in_order() { + let mut s = s(); + s.execute("range.setValues", json!({"range": "A1", "values": [["Priority"], ["Zulu"], ["Alpha"], ["Low"], ["High"], ["Medium"]]})).unwrap(); + let key = json!({"column": "A", "order": "asc", "customList": ["High", "Medium", "Low"]}); + s.execute("data.sort", json!({"range": "A1:A6", "header": true, "keys": [key]})).unwrap(); + let col: Vec = (1..=6).map(|r| v(&s, &format!("A{r}"))).collect(); + assert_eq!(col, ["Priority", "High", "Medium", "Low", "Alpha", "Zulu"].map(Value::from)); +} + #[test] fn data_sort_orders_vowelled_arabic_by_letters() { let mut s = s();