From e798350cd27abab191d3596438d56009de479228 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <Jeremy@marzhillstudios.com>
Date: Fri, 7 Feb 2025 19:16:57 -0500
Subject: [PATCH] wip: fix area calculation bug

---
 src/book/mod.rs | 27 +++++++++++++--------------
 src/ui/mod.rs   |  4 ++--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/book/mod.rs b/src/book/mod.rs
index a5817e1..b248971 100644
--- a/src/book/mod.rs
+++ b/src/book/mod.rs
@@ -227,13 +227,7 @@ impl Book {
     }
 
     pub fn clear_cell_range(&mut self, sheet: u32, start: Address, end: Address) -> Result<()> {
-        let area = Area {
-            sheet,
-            row: start.row as i32,
-            column: start.col as i32,
-            width: (end.row - start.row) as i32,
-            height: (end.col - end.row) as i32,
-        };
+        let area = calculate_area(sheet, start, end);
         self.model
             .range_clear_contents(&area)
             .map_err(|s| anyhow!("Unable to clear cell contents {}", s))?;
@@ -254,13 +248,7 @@ impl Book {
     }
 
     pub fn clear_cell_range_all(&mut self, sheet: u32, start: Address, end: Address) -> Result<()> {
-        let area = Area {
-            sheet,
-            row: start.row as i32,
-            column: start.col as i32,
-            width: (end.row - start.row) as i32,
-            height: (end.col - end.row) as i32,
-        };
+        let area = calculate_area(sheet, start, end);
         self.model.range_clear_all(&area)
             .map_err(|s| anyhow!("Unable to clear cell contents {}", s))?;
         Ok(())
@@ -584,6 +572,17 @@ impl Book {
     }
 }
 
+fn calculate_area(sheet: u32, start: Address, end: Address) -> Area {
+    let area = Area {
+        sheet,
+        row: start.row as i32,
+        column: start.col as i32,
+        height: (end.row - start.row + 1) as i32,
+        width: (end.col - start.col + 1) as i32,
+    };
+    area
+}
+
 impl Default for Book {
     fn default() -> Self {
         let mut book =
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index 530ae04..bc5f916 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -131,7 +131,7 @@ impl<'ws> AppState<'ws> {
     }
 }
 
-// TODO(jwall): This should probably move to a different module.
+// TODO(jwall): Should we just be using `Area` for this?.
 /// The Address in a Table.
 #[derive(Debug, PartialEq, PartialOrd, Ord, Eq, Clone)]
 pub struct Address {
@@ -539,7 +539,7 @@ impl<'ws> Workspace<'ws> {
                     self.handle_numeric_prefix(d);
                 }
                 KeyCode::Char('D') => {
-                    if let Some((start, end)) = self.state.range_select.get_range() {
+                    if let Some((start, end)) = dbg!(self.state.range_select.get_range()) {
                         self.book.clear_cell_range_all(
                             self.state
                                 .range_select