From 8108dbccc645f64a7fe5f67b7da886c85c4cd662 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 13 Oct 2026 01:21:57 -0400 Subject: [PATCH] Fix-up: close the passthrough tests the merges left open; rustfmt Co-Authored-By: Claude Opus 5.5 --- crates/ui-egui/src/grid.rs | 3 +-- crates/xlsx/src/tests/passthrough_tests.rs | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/grid.rs b/crates/ui-egui/src/grid.rs index c607d97..085b113 100644 --- a/crates/ui-egui/src/grid.rs +++ b/crates/ui-egui/src/grid.rs @@ -1240,8 +1240,7 @@ pub(crate) fn paint_quadrant( // Overflow into empty neighbours for text (not upright text, whose width is its line height). let mut clip = *rect; let overflows = !numeric && !matches!(v, Value::Number(_)) && st.align.rotation.abs() != 90 && w > rect.width() - 2.0 * pad; - if filter_space == 0.0 && (overflows || across_end > c.col) && in_merge(c).is_none() - { + if filter_space == 0.0 && (overflows || across_end > c.col) && in_merge(c).is_none() { let mut right = rect.right(); let mut left = rect.left(); if across_end > c.col { diff --git a/crates/xlsx/src/tests/passthrough_tests.rs b/crates/xlsx/src/tests/passthrough_tests.rs index 19a5836..51d37ab 100644 --- a/crates/xlsx/src/tests/passthrough_tests.rs +++ b/crates/xlsx/src/tests/passthrough_tests.rs @@ -530,6 +530,8 @@ fn saving_into_another_folder_rebases_relative_links_to_workbooks() { assert!(crate::rebase_links(&wb, std::path::Path::new("/elsewhere")).is_none()); wb.source_dir = Some("relative/dir".into()); assert!(crate::rebase_links(&wb, std::path::Path::new("/elsewhere")).is_none()); +} + // ------------------------------------------------------------------ chart sheets (#727) const NS_C: &str = "http://schemas.openxmlformats.org/drawingml/2006/chart"; @@ -708,6 +710,8 @@ fn formulas_name_the_sheets_a_chart_plots() { assert_eq!(sheet_names_in("SUM(Data!A1:A3,'Other sheet'!B2)"), ["Data", "Other sheet"]); assert!(sheet_names_in("[1]Ext!A1").is_empty() && sheet_names_in("[1]Ext!A1:A3").is_empty()); assert!(sheet_names_in("Name").is_empty() && sheet_names_in("").is_empty()); +} + #[test] fn file_version_and_calc_features_survive_a_save() { // Excel trusts the saved cell values only when workbook.xml carries both and the