UPDATE: Implement Insert/Delete Cells

.github/workflows/test-coverage.yaml

@@ -1,6 +1,6 @@
 name: Coverage
 
-on: [pull_request]
+on: [pull_request, push]
 
 jobs:
   coverage:
@@ -14,7 +14,7 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Generate code coverage
-        run: cargo llvm-cov --all-features --workspace --exclude pyroncalc --exclude wasm --lcov --output-path lcov.info
+        run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:

.readthedocs.yaml

@@ -1,32 +0,0 @@
-# .readthedocs.yaml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Set the OS, Python version and other tools you might need
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.12"
-    # You can also specify other tool versions:
-    # nodejs: "19"
-    # rust: "1.64"
-    # golang: "1.19"
-
-# Build documentation in the "docs/" directory with Sphinx
-sphinx:
-  configuration: bindings/python/docs/conf.py
-
-# Optionally build your docs in additional formats such as PDF and ePub
-# formats:
-#    - pdf
-#    - epub
-
-# Optional but recommended, declare the Python requirements required
-# to build your documentation
-# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-# python:
-#    install:
-#    - requirements: docs/requirements.txt

Cargo.lock

@@ -299,12 +299,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -337,12 +331,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
 [[package]]
 name = "inout"
 version = "0.1.3"
@@ -354,7 +342,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc"
-version = "0.2.0"
+version = "0.1.3"
 dependencies = [
  "bitcode",
  "chrono",
@@ -370,7 +358,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc_base"
-version = "0.2.0"
+version = "0.1.3"
 dependencies = [
  "bitcode",
  "chrono",
@@ -435,15 +423,6 @@ version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.2"
@@ -550,12 +529,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
-[[package]]
-name = "portable-atomic"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -570,86 +543,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "pyo3"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225"
-dependencies = [
- "cfg-if",
- "indoc",
- "libc",
- "memoffset",
- "once_cell",
- "portable-atomic",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3"
-dependencies = [
- "once_cell",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1"
-dependencies = [
- "heck",
- "proc-macro2",
- "pyo3-build-config",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pyroncalc"
-version = "0.1.2"
-dependencies = [
- "ironcalc",
- "pyo3",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.35"
@@ -814,21 +714,15 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
 [[package]]
 name = "thiserror"
 version = "1.0.58"
@@ -880,12 +774,6 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
-[[package]]
-name = "unindent"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
-
 [[package]]
 name = "uuid"
 version = "1.8.0"

Cargo.toml

@@ -5,7 +5,6 @@ members = [
   "base",
   "xlsx",
   "bindings/wasm",
-  "bindings/python",
 ]
 
 exclude = [

Makefile

@@ -1,53 +1,41 @@
-.PHONY: lint
 lint:
 	cargo fmt -- --check
 	cargo clippy --all-targets --all-features
-	cd webapp && npm install && npm run check
 
-.PHONY: format
 format:
 	cargo fmt
 
-.PHONY: tests
 tests: lint
 	cargo test
 	./target/debug/documentation
 	cmp functions.md wiki/functions.md || exit 1
 	make remove-artifacts
-	# Regretabbly we need to build the wasm twice, once for the nodejs tests
+	cd bindings/wasm/ && wasm-pack build --target nodejs && node tests/test.mjs
-	# and a second one for the vitest.
-	cd bindings/wasm/ && wasm-pack build --target nodejs && node tests/test.mjs && make
-	cd webapp && npm run test
-	cd bindings/python && ./run_tests.sh && ./run_examples.sh
 
-.PHONY: remove-artifacts
 remove-artifacts:
 	rm -f xlsx/hello-calc.xlsx
 	rm -f xlsx/hello-styles.xlsx
 	rm -f xlsx/widths-and-heights.xlsx
 	rm -f functions.md
 
-.PHONY: clean
 clean: remove-artifacts
 	cargo clean
 	rm -r -f base/target
 	rm -r -f xlsx/target
-	rm -r -f bindings/python/target
-	rm -r -f bindings/wasm/targets
 	rm -f cargo-test-*
 	rm -f base/cargo-test-*
 	rm -f xlsx/cargo-test-*
 
-.PHONY: coverage
+
 coverage:
 	CARGO_INCREMENTAL=0 RUSTFLAGS='-C instrument-coverage' LLVM_PROFILE_FILE='cargo-test-%p-%m.profraw' cargo test
 	grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/html
 
-.PHONY: update-docs
 update-docs:
 	cargo build
 	./target/debug/documentation -o wiki/functions.md
 
-.PHONY: docs
 docs:
 	cargo doc --no-deps
+
+.PHONY: lint format tests docs coverage all

README.md

@@ -128,7 +128,7 @@ https://playground.ironcalc.com
 
 # Collaborators needed!. Call to action
 
-We don't have a vibrant community just yet. This is the very stages of the project. But if you are passionate about code with high standards and no compromises, if you are looking for a project with high impact, if you are interested in a better, more open infrastructure for spreadsheets, whether you are a developer (rust, python, TypeScript, electron/tauri/anything else native app, React, you name it), a designer, an Excel power user who wants features, a business looking to integrate a MIT/Apache licensed spreadsheet in your own SaaS application join us!
+We don't have a vibrant community just yet. This is the very stages of the project. But if you are passionate about code with high standards and no compromises, if you are looking for a project with high impact, if you are interested in a better, more open infrastructure for spreadsheets, whether you are a developer (rust, python, TypeScript, electron/tauri/anything else native app, React, you name it), a designer (we need a logo desperately!), an Excel power user who wants features, a business looking to integrate a MIT/Apache licensed spreadsheet in your own SaaS application join us!
 
 The best place to start will be to join or [discord channel](https://discord.gg/zZYWfh3RHJ) or send us an email at hello@ironcalc.com.
 

base/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ironcalc_base"
-version = "0.2.0"
+version = "0.1.3"
 authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"]
 edition = "2021"
 homepage = "https://www.ironcalc.com"

base/examples/formulas_and_errors.rs

@@ -3,15 +3,15 @@ use ironcalc_base::{types::CellType, Model};
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut model = Model::new_empty("formulas-and-errors", "en", "UTC")?;
     // A1
-    model.set_user_input(0, 1, 1, "1".to_string())?;
+    model.set_user_input(0, 1, 1, "1".to_string());
     // A2
-    model.set_user_input(0, 2, 1, "2".to_string())?;
+    model.set_user_input(0, 2, 1, "2".to_string());
     // A3
-    model.set_user_input(0, 3, 1, "3".to_string())?;
+    model.set_user_input(0, 3, 1, "3".to_string());
     // B1
-    model.set_user_input(0, 1, 2, "=SUM(A1:A3)".to_string())?;
+    model.set_user_input(0, 1, 2, "=SUM(A1:A3)".to_string());
     // B2
-    model.set_user_input(0, 2, 2, "=B1/0".to_string())?;
+    model.set_user_input(0, 2, 2, "=B1/0".to_string());
     // Evaluate
     model.evaluate();
 

base/examples/hello_world.rs

@@ -3,11 +3,11 @@ use ironcalc_base::{cell::CellValue, Model};
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut model = Model::new_empty("hello-world", "en", "UTC")?;
     // A1
-    model.set_user_input(0, 1, 1, "Hello".to_string())?;
+    model.set_user_input(0, 1, 1, "Hello".to_string());
     // B1
-    model.set_user_input(0, 1, 2, "world!".to_string())?;
+    model.set_user_input(0, 1, 2, "world!".to_string());
     // C1
-    model.set_user_input(0, 1, 3, "=CONCAT(A1, \" \", B1".to_string())?;
+    model.set_user_input(0, 1, 3, "=CONCAT(A1, \" \", B1".to_string());
     // evaluates
     model.evaluate();
 

base/src/actions.rs

@@ -69,21 +69,27 @@ impl Model {
         target_row: i32,
         target_column: i32,
     ) -> Result<(), String> {
-        let source_cell = self
+        if let Some(source_cell) = self
             .workbook
             .worksheet(sheet)?
             .cell(source_row, source_column)
-            .ok_or("Expected Cell to exist")?;
+        {
             let style = source_cell.get_style();
             // FIXME: we need some user_input getter instead of get_text
             let formula_or_value = self
                 .get_cell_formula(sheet, source_row, source_column)?
-            .unwrap_or_else(|| source_cell.get_text(&self.workbook.shared_strings, &self.language));
+                .unwrap_or_else(|| {
-        self.set_user_input(sheet, target_row, target_column, formula_or_value)?;
+                    source_cell.get_text(&self.workbook.shared_strings, &self.language)
+                });
+            self.set_user_input(sheet, target_row, target_column, formula_or_value);
             self.workbook
                 .worksheet_mut(sheet)?
-            .set_cell_style(target_row, target_column, style)?;
+                .set_cell_style(target_row, target_column, style);
-        self.cell_clear_all(sheet, source_row, source_column)
+            self.cell_clear_all(sheet, source_row, source_column)?;
+        } else {
+            self.cell_clear_all(sheet, target_row, target_column)?;
+        }
+        Ok(())
     }
 
     /// Inserts one or more new columns into the model at the specified index.
@@ -105,7 +111,7 @@ impl Model {
             return Err("Cannot add a negative number of cells :)".to_string());
         }
         // check if it is possible:
-        let dimensions = self.workbook.worksheet(sheet)?.dimension();
+        let dimensions = self.workbook.worksheet(sheet)?.get_dimension();
         let last_column = dimensions.max_column + column_count;
         if last_column > LAST_COLUMN {
             return Err(
@@ -262,7 +268,7 @@ impl Model {
             return Err("Cannot add a negative number of cells :)".to_string());
         }
         // Check if it is possible:
-        let dimensions = self.workbook.worksheet(sheet)?.dimension();
+        let dimensions = self.workbook.worksheet(sheet)?.get_dimension();
         let last_row = dimensions.max_row + row_count;
         if last_row > LAST_ROW {
             return Err(
@@ -366,13 +372,162 @@ impl Model {
             }
         }
         self.workbook.worksheets[sheet as usize].rows = new_rows;
-        self.displace_cells(
+        self.displace_cells(&DisplaceData::Row {
-            &(DisplaceData::Row {
             sheet,
             row,
             delta: -row_count,
-            }),
+        });
-        );
+        Ok(())
+    }
+
+    pub fn delete_cells_and_shift_left(
+        &mut self,
+        sheet: u32,
+        row: i32,
+        column: i32,
+        row_delta: i32,
+        column_delta: i32,
+    ) -> Result<(), String> {
+        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
+        let max_column = worksheet.get_dimension().max_column;
+
+        // Delete all cells in the range
+        for r in row..row + row_delta {
+            for c in column..column + column_delta {
+                self.cell_clear_all(sheet, r, c)?;
+            }
+        }
+
+        // Move all cells in the range
+        for r in row..row + row_delta {
+            for c in column + 1..max_column + 1 {
+                println!("{r}-{c}");
+                self.move_cell(sheet, r, c, r, c - column_delta)?;
+            }
+        }
+
+        // Update all formulas in the workbook
+        self.displace_cells(&DisplaceData::ShiftCellsRight {
+            sheet,
+            row,
+            column,
+            column_delta: -column_delta,
+            row_delta,
+        });
+
+        Ok(())
+    }
+
+    /// Insert cells and shift right
+    pub fn insert_cells_and_shift_right(
+        &mut self,
+        sheet: u32,
+        row: i32,
+        column: i32,
+        row_delta: i32,
+        column_delta: i32,
+    ) -> Result<(), String> {
+        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
+        let max_column = worksheet.get_dimension().max_column;
+
+        // Move all cells in the range
+        for r in row..row + row_delta {
+            for c in (column..max_column + 1).rev() {
+                self.move_cell(sheet, r, c, r, c + column_delta)?;
+            }
+        }
+
+        // Delete all cells in the range
+        for r in row..row + row_delta {
+            for c in column..column + column_delta {
+                self.cell_clear_all(sheet, r, c)?;
+            }
+        }
+
+        // Update all formulas in the workbook
+        self.displace_cells(&DisplaceData::ShiftCellsRight {
+            sheet,
+            row,
+            column,
+            column_delta,
+            row_delta,
+        });
+
+        Ok(())
+    }
+
+    /// Insert cells and shift down
+    pub fn insert_cells_and_shift_down(
+        &mut self,
+        sheet: u32,
+        row: i32,
+        column: i32,
+        row_delta: i32,
+        column_delta: i32,
+    ) -> Result<(), String> {
+        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
+        let max_row = worksheet.get_dimension().max_row;
+
+        // Move all cells in the range
+        for r in (row..row + max_row + 1).rev() {
+            for c in column..column + column_delta {
+                self.move_cell(sheet, r, c, r, c + column_delta)?;
+            }
+        }
+
+        // Delete all cells in the range
+        for r in row..row + row_delta {
+            for c in column..column + column_delta {
+                self.cell_clear_all(sheet, r, c)?;
+            }
+        }
+
+        // Update all formulas in the workbook
+        self.displace_cells(&DisplaceData::ShiftCellsDown {
+            sheet,
+            row,
+            column,
+            column_delta,
+            row_delta,
+        });
+
+        Ok(())
+    }
+
+    pub fn delete_cells_and_shift_up(
+        &mut self,
+        sheet: u32,
+        row: i32,
+        column: i32,
+        row_delta: i32,
+        column_delta: i32,
+    ) -> Result<(), String> {
+        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
+        let max_row = worksheet.get_dimension().max_row;
+
+        // Delete all cells in the range
+        for r in row..row + row_delta {
+            for c in column..column + column_delta {
+                self.cell_clear_all(sheet, r, c)?;
+            }
+        }
+
+        // Move all cells in the range
+        for r in row..max_row + 1 {
+            for c in column + 1..column + column_delta {
+                self.move_cell(sheet, r, c, r - row_delta, c)?;
+            }
+        }
+
+        // Update all formulas in the workbook
+        self.displace_cells(&DisplaceData::ShiftCellsDown {
+            sheet,
+            row,
+            column,
+            column_delta,
+            row_delta: -row_delta,
+        });
+
         Ok(())
     }
 

base/src/constants.rs

@@ -6,8 +6,6 @@ pub(crate) const DEFAULT_COLUMN_WIDTH: f64 = 100.0;
 pub(crate) const DEFAULT_ROW_HEIGHT: f64 = 21.0;
 pub(crate) const COLUMN_WIDTH_FACTOR: f64 = 12.0;
 pub(crate) const ROW_HEIGHT_FACTOR: f64 = 2.0;
-pub(crate) const DEFAULT_WINDOW_HEIGH: i64 = 600;
-pub(crate) const DEFAULT_WINDOW_WIDTH: i64 = 800;
 
 pub(crate) const LAST_COLUMN: i32 = 16_384;
 pub(crate) const LAST_ROW: i32 = 1_048_576;

base/src/expressions/lexer/marked_token.rs

@@ -1,3 +1,5 @@
+#![deny(missing_docs)]
+
 use serde::{Deserialize, Serialize};
 
 use crate::expressions::token;
@@ -9,8 +11,11 @@ use super::{Lexer, LexerMode};
 /// A MarkedToken is a token together with its position on a formula
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct MarkedToken {
+    /// Token type (see [token::TokenType])
     pub token: token::TokenType,
+    /// Position of the start of the token (in bytes)
     pub start: i32,
+    /// Position of the end of the token (in bytes)
     pub end: i32,
 }
 
@@ -19,7 +24,7 @@ pub struct MarkedToken {
 /// # Examples
 /// ```
 /// use ironcalc_base::expressions::{
-///      lexer::util::{get_tokens, MarkedToken},
+///      lexer::marked_token::{get_tokens, MarkedToken},
 ///      token::{OpSum, TokenType},
 /// };
 ///

base/src/expressions/lexer/mod.rs

@@ -1,3 +1,5 @@
+#![deny(missing_docs)]
+
 //! A tokenizer for spreadsheet formulas.
 //!
 //! This is meant to feed a formula parser.
@@ -7,8 +9,10 @@
 //! It supports two working modes:
 //!
 //! 1. A1 or display mode
+//!
 //!    This is for user formulas. References are like `D4`, `D$4` or `F5:T10`
 //! 2. R1C1, internal or runtime mode
+//!
 //!    A reference like R1C1 refers to $A$1 and R3C4 to $D$4
 //!    R[2]C[5] refers to a cell two rows below and five columns to the right
 //!    It uses the 'en' locale and language.
@@ -55,7 +59,8 @@ use super::token::{Error, TokenType};
 use super::types::*;
 use super::utils;
 
-pub mod util;
+/// Returns an iterator over tokens together with their position in the byte string.
+pub mod marked_token;
 
 #[cfg(test)]
 mod test;
@@ -63,17 +68,28 @@ mod test;
 mod ranges;
 mod structured_references;
 
+/// This is the TokenType we return if we cannot recognize a token
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct LexerError {
+    /// Position of the beginning of the token in the byte string.
     pub position: usize,
+    /// Message describing what we think the error is.
     pub message: String,
 }
 
 pub(super) type Result<T> = std::result::Result<T, LexerError>;
 
+/// Whether we try to parse formulas in A1 mode or in the internal R1C1 mode
 #[derive(Clone, PartialEq, Eq)]
 pub enum LexerMode {
+    /// Cell references are written `=S34`. This is the display mode
     A1,
+    ///    R1C1, internal or runtime mode
+    ///
+    ///    A reference like R1C1 refers to $A$1 and R3C4 to $D$4
+    ///    R[2]C[5] refers to a cell two rows below and five columns to the right
+    ///    It uses the 'en' locale and language.
+    ///    This is used internally at runtime.
     R1C1,
 }
 

base/src/expressions/lexer/test/mod.rs

@@ -1,6 +1,6 @@
 mod test_common;
 mod test_language;
 mod test_locale;
+mod test_marked_token;
 mod test_ranges;
 mod test_tables;
-mod test_util;

base/src/expressions/lexer/test/test_marked_token.rs

@@ -1,5 +1,5 @@
 use crate::expressions::{
-    lexer::util::get_tokens,
+    lexer::marked_token::{get_tokens, MarkedToken},
     token::{OpCompare, OpSum, TokenType},
 };
 
@@ -22,6 +22,29 @@ fn test_get_tokens() {
     assert_eq!(l.end, 10);
 }
 
+#[test]
+fn chinese_characters() {
+    let formula = "\"你好\" & \"世界！\"";
+    let marked_tokens = get_tokens(formula);
+    assert_eq!(marked_tokens.len(), 3);
+    let first_t = MarkedToken {
+        token: TokenType::String("你好".to_string()),
+        start: 0,
+        end: 4,
+    };
+    let second_t = MarkedToken {
+        token: TokenType::And,
+        start: 4,
+        end: 6,
+    };
+    let third_t = MarkedToken {
+        token: TokenType::String("世界！".to_string()),
+        start: 6,
+        end: 12,
+    };
+    assert_eq!(marked_tokens, vec![first_t, second_t, third_t]);
+}
+
 #[test]
 fn test_simple_tokens() {
     assert_eq!(

base/src/expressions/mod.rs

@@ -1,4 +1,3 @@
-// public modules
 pub mod lexer;
 pub mod parser;
 pub mod token;

base/src/expressions/parser/mod.rs

@@ -1,31 +1,29 @@
-/*!
+//! # GRAMMAR
-# GRAMAR
+//!
-
+//! <pre class="rust">
-<pre class="rust">
+//! opComp   => '=' | '<' | '>' | '<=' } '>=' | '<>'
-opComp   => '=' | '<' | '>' | '<=' } '>=' | '<>'
+//! opFactor => '*' | '/'
-opFactor => '*' | '/'
+//! unaryOp  => '-' | '+'
-unaryOp  => '-' | '+'
+//!
-
+//! expr    => concat (opComp concat)*
-expr    => concat (opComp concat)*
+//! concat  => term ('&' term)*
-concat  => term ('&' term)*
+//! term    => factor (opFactor factor)*
-term    => factor (opFactor factor)*
+//! factor  => prod (opProd prod)*
-factor  => prod (opProd prod)*
+//! prod    => power ('^' power)*
-prod    => power ('^' power)*
+//! power   => (unaryOp)* range '%'*
-power   => (unaryOp)* range '%'*
+//! range   => primary (':' primary)?
-range   => primary (':' primary)?
+//! primary => '(' expr ')'
-primary => '(' expr ')'
+//!         => number
-        => number
+//!         => function '(' f_args ')'
-        => function '(' f_args ')'
+//!         => name
-        => name
+//!         => string
-        => string
+//!         => '{' a_args '}'
-        => '{' a_args '}'
+//!         => bool
-        => bool
+//!         => bool()
-        => bool()
+//!         => error
-        => error
+//!
-
+//! f_args  => e (',' e)*
-f_args  => e (',' e)*
+//! </pre>
-</pre>
-*/
 
 use std::collections::HashMap;
 
@@ -44,21 +42,15 @@ use super::utils::number_to_column;
 
 use token::OpCompare;
 
-pub mod move_formula;
+pub(crate) mod move_formula;
+pub(crate) mod walk;
+
+/// Produces a string representation of a formula from the AST.
 pub mod stringify;
-pub mod walk;
 
 #[cfg(test)]
 mod test;
 
-#[cfg(test)]
-mod test_ranges;
-
-#[cfg(test)]
-mod test_move_formula;
-#[cfg(test)]
-mod test_tables;
-
 pub(crate) fn parse_range(formula: &str) -> Result<(i32, i32, i32, i32), String> {
     let mut lexer = lexer::Lexer::new(
         formula,

base/src/expressions/parser/stringify.rs

@@ -1,43 +1,75 @@
+#![deny(missing_docs)]
+
 use super::{super::utils::quote_name, Node, Reference};
 use crate::constants::{LAST_COLUMN, LAST_ROW};
 use crate::expressions::token::OpUnary;
 use crate::{expressions::types::CellReferenceRC, number_format::to_excel_precision_str};
 
+/// Displaced data
 pub enum DisplaceData {
+    /// Displaces columns (inserting or deleting columns)
     Column {
+        /// Sheet in which the displace data applies
         sheet: u32,
+        /// Column from which the data is displaced
         column: i32,
+        /// Number of columns displaced (might be negative, e.g. when deleting columns)
         delta: i32,
     },
+    /// Displaces rows (Inserting or deleting rows)
     Row {
+        /// Sheet in which the displace data applies
         sheet: u32,
+        /// Row from which the data is displaced
         row: i32,
+        /// Number of rows displaced (might be negative, e.g. when deleting rows)
         delta: i32,
     },
-    CellHorizontal {
+    /// Displaces cells horizontally
+    ShiftCellsRight {
+        /// Sheet in which the displace data applies
         sheet: u32,
+        /// Row of the to left corner
         row: i32,
+        /// Column of the top left corner
         column: i32,
-        delta: i32,
+        /// Number of rows to be displaced
+        row_delta: i32,
+        /// Number of columns to be displaced (might be negative)
+        column_delta: i32,
     },
-    CellVertical {
+    /// Displaces cells vertically
+    ShiftCellsDown {
+        /// Sheet in which the displace data applies
         sheet: u32,
+        /// Row of the to left corner
         row: i32,
+        /// Column of the top left corner
         column: i32,
-        delta: i32,
+        /// Number of rows displaced (might be negative)
+        row_delta: i32,
+        /// Number of columns to be displaced
+        column_delta: i32,
     },
+    /// Displaces data due to a column move from column to column + delta
     ColumnMove {
+        /// Sheet in which the displace data applies
         sheet: u32,
+        /// Column that is moved
         column: i32,
+        /// The position of the new column is column + delta (might be negative)
         delta: i32,
     },
+    /// Doesn't do any cell displacement
     None,
 }
 
+/// Stringifies the AST formula in its internal R1C1 format
 pub fn to_rc_format(node: &Node) -> String {
     stringify(node, None, &DisplaceData::None, false)
 }
 
+/// Stringifies the formula applying the _displace_data_.
 pub fn to_string_displaced(
     node: &Node,
     context: &CellReferenceRC,
@@ -46,10 +78,12 @@ pub fn to_string_displaced(
     stringify(node, Some(context), displace_data, false)
 }
 
+/// Stringifies a formula from the AST
 pub fn to_string(node: &Node, context: &CellReferenceRC) -> String {
     stringify(node, Some(context), &DisplaceData::None, false)
 }
 
+/// Stringifies the formula for Excel compatibility
 pub fn to_excel_string(node: &Node, context: &CellReferenceRC) -> String {
     stringify(node, Some(context), &DisplaceData::None, true)
 }
@@ -116,41 +150,49 @@ pub(crate) fn stringify_reference(
                         }
                     }
                 }
-                DisplaceData::CellHorizontal {
+                DisplaceData::ShiftCellsRight {
                     sheet,
                     row: displace_row,
                     column: displace_column,
-                    delta,
+                    column_delta,
+                    row_delta,
                 } => {
-                    if sheet_index == *sheet && displace_row == &row {
+                    if sheet_index == *sheet
-                        if *delta < 0 {
+                        && displace_row >= &row
+                        && *displace_row < row + *row_delta
+                    {
+                        if *column_delta < 0 {
                             if &column >= displace_column {
-                                if column < displace_column - *delta {
+                                if column < displace_column - *column_delta {
                                     return "#REF!".to_string();
                                 }
-                                column += *delta;
+                                column += *column_delta;
                             }
                         } else if &column >= displace_column {
-                            column += *delta;
+                            column += *column_delta;
                         }
                     }
                 }
-                DisplaceData::CellVertical {
+                DisplaceData::ShiftCellsDown {
                     sheet,
                     row: displace_row,
                     column: displace_column,
-                    delta,
+                    row_delta,
+                    column_delta,
                 } => {
-                    if sheet_index == *sheet && displace_column == &column {
+                    if sheet_index == *sheet
-                        if *delta < 0 {
+                        && displace_column >= &column
+                        && *displace_column < column + *column_delta
+                    {
+                        if *row_delta < 0 {
                             if &row >= displace_row {
-                                if row < displace_row - *delta {
+                                if row < displace_row - *row_delta {
                                     return "#REF!".to_string();
                                 }
-                                row += *delta;
+                                row += *row_delta;
                             }
                         } else if &row >= displace_row {
-                            row += *delta;
+                            row += *row_delta;
                         }
                     }
                 }

base/src/expressions/parser/test/mod.rs

@@ -0,0 +1,4 @@
+mod test_genertal;
+mod test_move_formula;
+mod test_ranges;
+mod test_tables;

base/src/expressions/parser/test/test_genertal.rs

@@ -1,17 +1,12 @@
 use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
-use crate::expressions::parser::stringify::DisplaceData;
+use crate::expressions::parser::stringify::{to_string_displaced, DisplaceData};
-
+use crate::expressions::parser::{
-use super::super::types::CellReferenceRC;
-use super::Parser;
-use super::{
-    super::parser::{
     stringify::{to_rc_format, to_string},
-        Node,
+    Node, Parser,
-    },
-    stringify::to_string_displaced,
 };
+use crate::expressions::types::CellReferenceRC;
 
 struct Formula<'a> {
     initial: &'a str,

base/src/expressions/parser/test/test_move_formula.rs

@@ -1,10 +1,8 @@
 use std::collections::HashMap;
 
 use crate::expressions::parser::move_formula::{move_formula, MoveContext};
-use crate::expressions::types::Area;
+use crate::expressions::parser::Parser;
-
+use crate::expressions::types::{Area, CellReferenceRC};
-use super::super::types::CellReferenceRC;
-use super::Parser;
 
 #[test]
 fn test_move_formula() {

base/src/expressions/parser/test/test_ranges.rs

@@ -2,9 +2,9 @@ use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
 
-use super::super::parser::stringify::{to_rc_format, to_string};
+use crate::expressions::parser::stringify::{to_rc_format, to_string};
-use super::super::types::CellReferenceRC;
+use crate::expressions::parser::Parser;
-use super::Parser;
+use crate::expressions::types::CellReferenceRC;
 
 struct Formula<'a> {
     formula_a1: &'a str,

base/src/expressions/parser/test/test_tables.rs

@@ -6,8 +6,8 @@ use crate::expressions::parser::stringify::to_string;
 use crate::expressions::utils::{number_to_column, parse_reference_a1};
 use crate::types::{Table, TableColumn, TableStyleInfo};
 
-use super::super::types::CellReferenceRC;
+use crate::expressions::parser::Parser;
-use super::Parser;
+use crate::expressions::types::CellReferenceRC;
 
 fn create_test_table(
     table_name: &str,

base/src/functions/engineering/complex.rs

@@ -3,7 +3,7 @@ use std::fmt;
 use crate::{
     calc_result::CalcResult,
     expressions::{
-        lexer::util::get_tokens,
+        lexer::marked_token::get_tokens,
         parser::Node,
         token::{Error, OpSum, TokenType},
         types::CellReferenceIndex,

base/src/functions/financial.rs

@@ -221,7 +221,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .dimension()
+                        .get_dimension()
                         .max_row;
                 }
                 if column1 == 1 && column2 == LAST_COLUMN {
@@ -229,7 +229,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .dimension()
+                        .get_dimension()
                         .max_column;
                 }
                 for row in row1..row2 + 1 {
@@ -284,7 +284,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .dimension()
+                        .get_dimension()
                         .max_row;
                 }
                 if column1 == 1 && column2 == LAST_COLUMN {
@@ -292,7 +292,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .dimension()
+                        .get_dimension()
                         .max_column;
                 }
                 for row in row1..row2 + 1 {
@@ -360,7 +360,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .dimension()
+                        .get_dimension()
                         .max_row;
                 }
                 if column1 == 1 && column2 == LAST_COLUMN {
@@ -368,7 +368,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .dimension()
+                        .get_dimension()
                         .max_column;
                 }
                 for row in row1..row2 + 1 {
@@ -866,7 +866,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -874,7 +874,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {

base/src/functions/mathematical.rs

@@ -132,7 +132,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -140,7 +140,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {
@@ -199,7 +199,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -207,7 +207,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {

base/src/functions/statistical.rs

@@ -385,7 +385,7 @@ impl Model {
             .workbook
             .worksheet(first_range.left.sheet)
             .expect("Sheet expected during evaluation.")
-            .dimension();
+            .get_dimension();
         let max_row = dimension.max_row;
         let max_column = dimension.max_column;
 
@@ -530,7 +530,7 @@ impl Model {
                 .workbook
                 .worksheet(sum_range.left.sheet)
                 .expect("Sheet expected during evaluation.")
-                .dimension()
+                .get_dimension()
                 .max_row;
         }
         if left_column == 1 && right_column == LAST_COLUMN {
@@ -538,7 +538,7 @@ impl Model {
                 .workbook
                 .worksheet(sum_range.left.sheet)
                 .expect("Sheet expected during evaluation.")
-                .dimension()
+                .get_dimension()
                 .max_column;
         }
 

base/src/functions/text.rs

@@ -892,7 +892,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -900,7 +900,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .dimension()
+                            .get_dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {

base/src/functions/xlookup.rs

@@ -255,7 +255,7 @@ impl Model {
                                 .workbook
                                 .worksheet(left.sheet)
                                 .expect("Sheet expected during evaluation.")
-                                .dimension()
+                                .get_dimension()
                                 .max_row;
                         }
                         if column1 == 1 && column2 == LAST_COLUMN {
@@ -263,7 +263,7 @@ impl Model {
                                 .workbook
                                 .worksheet(left.sheet)
                                 .expect("Sheet expected during evaluation.")
-                                .dimension()
+                                .get_dimension()
                                 .max_column;
                         }
                         let left = CellReferenceIndex {

base/src/lib.rs

@@ -57,5 +57,4 @@ pub mod mock_time;
 
 pub use model::get_milliseconds_since_epoch;
 pub use model::Model;
-pub use user_model::BorderArea;
 pub use user_model::UserModel;

base/src/model.rs

@@ -7,15 +7,19 @@ use crate::{
     calc_result::{CalcResult, Range},
     cell::CellValue,
     constants::{self, LAST_COLUMN, LAST_ROW},
+    expressions::token::{Error, OpCompare, OpProduct, OpSum, OpUnary},
+    expressions::{
+        parser::move_formula::{move_formula, MoveContext},
+        token::get_error_by_name,
+        types::*,
+        utils::{self, is_valid_row},
+    },
     expressions::{
         parser::{
-            move_formula::{move_formula, MoveContext},
             stringify::{to_rc_format, to_string},
             Node, Parser,
         },
-        token::{get_error_by_name, Error, OpCompare, OpProduct, OpSum, OpUnary},
+        utils::is_valid_column_number,
-        types::*,
-        utils::{self, is_valid_column_number, is_valid_row},
     },
     formatter::{
         format::{format_number, parse_formatted_number},
@@ -114,8 +118,6 @@ pub struct Model {
     pub(crate) language: Language,
     /// The timezone used to evaluate the model
     pub(crate) tz: Tz,
-    /// The view id. A view consist of a selected sheet and ranges.
-    pub(crate) view_id: u32,
 }
 
 // FIXME: Maybe this should be the same as CellReference
@@ -679,13 +681,6 @@ impl Model {
         Err(format!("Invalid color: {}", color))
     }
 
-    /// Makes the grid lines in the sheet visible (`true`) or hidden (`false`)
-    pub fn set_show_grid_lines(&mut self, sheet: u32, show_grid_lines: bool) -> Result<(), String> {
-        let worksheet = self.workbook.worksheet_mut(sheet)?;
-        worksheet.show_grid_lines = show_grid_lines;
-        Ok(())
-    }
-
     fn get_cell_value(&self, cell: &Cell, cell_reference: CellReferenceIndex) -> CalcResult {
         use Cell::*;
         match cell {
@@ -891,7 +886,6 @@ impl Model {
             language,
             locale,
             tz,
-            view_id: 0,
         };
 
         model.parse_formulas();
@@ -1200,10 +1194,10 @@ impl Model {
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
     /// let mut model = Model::new_empty("model", "en", "UTC")?;
     /// let (sheet, row, column) = (0, 1, 1);
-    /// model.set_user_input(sheet, row, column, "Hello!".to_string())?;
+    /// model.set_user_input(sheet, row, column, "Hello!".to_string());
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "Hello!".to_string());
     ///
-    /// model.update_cell_with_text(sheet, row, column, "Goodbye!")?;
+    /// model.update_cell_with_text(sheet, row, column, "Goodbye!");
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "Goodbye!".to_string());
     /// # Ok(())
     /// # }
@@ -1214,30 +1208,23 @@ impl Model {
     /// * [Model::update_cell_with_number()]
     /// * [Model::update_cell_with_bool()]
     /// * [Model::update_cell_with_formula()]
-    pub fn update_cell_with_text(
+    pub fn update_cell_with_text(&mut self, sheet: u32, row: i32, column: i32, value: &str) {
-        &mut self,
+        let style_index = self.get_cell_style_index(sheet, row, column);
-        sheet: u32,
-        row: i32,
-        column: i32,
-        value: &str,
-    ) -> Result<(), String> {
-        let style_index = self.get_cell_style_index(sheet, row, column)?;
         let new_style_index;
         if common::value_needs_quoting(value, &self.language) {
             new_style_index = self
                 .workbook
                 .styles
-                .get_style_with_quote_prefix(style_index)?;
+                .get_style_with_quote_prefix(style_index);
         } else if self.workbook.styles.style_is_quote_prefix(style_index) {
             new_style_index = self
                 .workbook
                 .styles
-                .get_style_without_quote_prefix(style_index)?;
+                .get_style_without_quote_prefix(style_index);
         } else {
             new_style_index = style_index;
         }
-
+        self.set_cell_with_string(sheet, row, column, value, new_style_index);
-        self.set_cell_with_string(sheet, row, column, value, new_style_index)
     }
 
     /// Updates the value of a cell with a boolean value
@@ -1250,10 +1237,10 @@ impl Model {
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
     /// let mut model = Model::new_empty("model", "en", "UTC")?;
     /// let (sheet, row, column) = (0, 1, 1);
-    /// model.set_user_input(sheet, row, column, "TRUE".to_string())?;
+    /// model.set_user_input(sheet, row, column, "TRUE".to_string());
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "TRUE".to_string());
     ///
-    /// model.update_cell_with_bool(sheet, row, column, false)?;
+    /// model.update_cell_with_bool(sheet, row, column, false);
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "FALSE".to_string());
     /// # Ok(())
     /// # }
@@ -1264,22 +1251,17 @@ impl Model {
     /// * [Model::update_cell_with_number()]
     /// * [Model::update_cell_with_text()]
     /// * [Model::update_cell_with_formula()]
-    pub fn update_cell_with_bool(
+    pub fn update_cell_with_bool(&mut self, sheet: u32, row: i32, column: i32, value: bool) {
-        &mut self,
+        let style_index = self.get_cell_style_index(sheet, row, column);
-        sheet: u32,
-        row: i32,
-        column: i32,
-        value: bool,
-    ) -> Result<(), String> {
-        let style_index = self.get_cell_style_index(sheet, row, column)?;
         let new_style_index = if self.workbook.styles.style_is_quote_prefix(style_index) {
             self.workbook
                 .styles
-                .get_style_without_quote_prefix(style_index)?
+                .get_style_without_quote_prefix(style_index)
         } else {
             style_index
         };
-        self.set_cell_with_boolean(sheet, row, column, value, new_style_index)
+        let worksheet = &mut self.workbook.worksheets[sheet as usize];
+        worksheet.set_cell_with_boolean(row, column, value, new_style_index);
     }
 
     /// Updates the value of a cell with a number
@@ -1292,10 +1274,10 @@ impl Model {
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
     /// let mut model = Model::new_empty("model", "en", "UTC")?;
     /// let (sheet, row, column) = (0, 1, 1);
-    /// model.set_user_input(sheet, row, column, "42".to_string())?;
+    /// model.set_user_input(sheet, row, column, "42".to_string());
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "42".to_string());
     ///
-    /// model.update_cell_with_number(sheet, row, column, 23.0)?;
+    /// model.update_cell_with_number(sheet, row, column, 23.0);
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "23".to_string());
     /// # Ok(())
     /// # }
@@ -1306,22 +1288,17 @@ impl Model {
     /// * [Model::update_cell_with_text()]
     /// * [Model::update_cell_with_bool()]
     /// * [Model::update_cell_with_formula()]
-    pub fn update_cell_with_number(
+    pub fn update_cell_with_number(&mut self, sheet: u32, row: i32, column: i32, value: f64) {
-        &mut self,
+        let style_index = self.get_cell_style_index(sheet, row, column);
-        sheet: u32,
-        row: i32,
-        column: i32,
-        value: f64,
-    ) -> Result<(), String> {
-        let style_index = self.get_cell_style_index(sheet, row, column)?;
         let new_style_index = if self.workbook.styles.style_is_quote_prefix(style_index) {
             self.workbook
                 .styles
-                .get_style_without_quote_prefix(style_index)?
+                .get_style_without_quote_prefix(style_index)
         } else {
             style_index
         };
-        self.set_cell_with_number(sheet, row, column, value, new_style_index)
+        let worksheet = &mut self.workbook.worksheets[sheet as usize];
+        worksheet.set_cell_with_number(row, column, value, new_style_index);
     }
 
     /// Updates the formula of given cell
@@ -1335,11 +1312,11 @@ impl Model {
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
     /// let mut model = Model::new_empty("model", "en", "UTC")?;
     /// let (sheet, row, column) = (0, 1, 1);
-    /// model.set_user_input(sheet, row, column, "=A2*2".to_string())?;
+    /// model.set_user_input(sheet, row, column, "=A2*2".to_string());
     /// model.evaluate();
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "=A2*2".to_string());
     ///
-    /// model.update_cell_with_formula(sheet, row, column, "=A3*2".to_string())?;
+    /// model.update_cell_with_formula(sheet, row, column, "=A3*2".to_string());
     /// model.evaluate();
     /// assert_eq!(model.get_cell_content(sheet, row, column)?, "=A3*2".to_string());
     /// # Ok(())
@@ -1358,12 +1335,12 @@ impl Model {
         column: i32,
         formula: String,
     ) -> Result<(), String> {
-        let mut style_index = self.get_cell_style_index(sheet, row, column)?;
+        let mut style_index = self.get_cell_style_index(sheet, row, column);
         if self.workbook.styles.style_is_quote_prefix(style_index) {
             style_index = self
                 .workbook
                 .styles
-                .get_style_without_quote_prefix(style_index)?;
+                .get_style_without_quote_prefix(style_index);
         }
         let formula = formula
             .strip_prefix('=')
@@ -1403,36 +1380,31 @@ impl Model {
     /// * [Model::update_cell_with_number()]
     /// * [Model::update_cell_with_bool()]
     /// * [Model::update_cell_with_text()]
-    pub fn set_user_input(
+    pub fn set_user_input(&mut self, sheet: u32, row: i32, column: i32, value: String) {
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        value: String,
-    ) -> Result<(), String> {
         // If value starts with "'" then we force the style to be quote_prefix
-        let style_index = self.get_cell_style_index(sheet, row, column)?;
+        let style_index = self.get_cell_style_index(sheet, row, column);
         if let Some(new_value) = value.strip_prefix('\'') {
             // First check if it needs quoting
             let new_style = if common::value_needs_quoting(new_value, &self.language) {
                 self.workbook
                     .styles
-                    .get_style_with_quote_prefix(style_index)?
+                    .get_style_with_quote_prefix(style_index)
             } else {
                 style_index
             };
-            self.set_cell_with_string(sheet, row, column, new_value, new_style)?;
+            self.set_cell_with_string(sheet, row, column, new_value, new_style);
         } else {
             let mut new_style_index = style_index;
             if self.workbook.styles.style_is_quote_prefix(style_index) {
                 new_style_index = self
                     .workbook
                     .styles
-                    .get_style_without_quote_prefix(style_index)?;
+                    .get_style_without_quote_prefix(style_index);
             }
             if let Some(formula) = value.strip_prefix('=') {
-                let formula_index =
+                let formula_index = self
-                    self.set_cell_with_formula(sheet, row, column, formula, new_style_index)?;
+                    .set_cell_with_formula(sheet, row, column, formula, new_style_index)
+                    .expect("could not set the cell formula");
                 // Update the style if needed
                 let cell = CellReferenceIndex { sheet, row, column };
                 let parsed_formula = &self.parsed_formulas[sheet as usize][formula_index as usize];
@@ -1440,11 +1412,15 @@ impl Model {
                     let new_style_index = self
                         .workbook
                         .styles
-                        .get_style_with_format(new_style_index, &units.get_num_fmt())?;
+                        .get_style_with_format(new_style_index, &units.get_num_fmt());
-                    let style = self.workbook.styles.get_style(new_style_index)?;
+                    let style = self.workbook.styles.get_style(new_style_index);
-                    self.set_cell_style(sheet, row, column, &style)?
+                    self.set_cell_style(sheet, row, column, &style)
+                        .expect("Failed setting the style");
                 }
             } else {
+                let worksheets = &mut self.workbook.worksheets;
+                let worksheet = &mut worksheets[sheet as usize];
+
                 // The list of currencies is '$', '€' and the local currency
                 let mut currencies = vec!["$", "€"];
                 let currency = &self.locale.currency.symbol;
@@ -1457,39 +1433,35 @@ impl Model {
                         // Should not apply the format in the following cases:
                         // - we assign a date to already date-formatted cell
                         let should_apply_format = !(is_likely_date_number_format(
-                            &self.workbook.styles.get_style(new_style_index)?.num_fmt,
+                            &self.workbook.styles.get_style(new_style_index).num_fmt,
                         ) && is_likely_date_number_format(&num_fmt));
                         if should_apply_format {
                             new_style_index = self
                                 .workbook
                                 .styles
-                                .get_style_with_format(new_style_index, &num_fmt)?;
+                                .get_style_with_format(new_style_index, &num_fmt);
                         }
                     }
-                    let worksheet = self.workbook.worksheet_mut(sheet)?;
+                    worksheet.set_cell_with_number(row, column, v, new_style_index);
-                    worksheet.set_cell_with_number(row, column, v, new_style_index)?;
+                    return;
-                    return Ok(());
                 }
                 // We try to parse as boolean
                 if let Ok(v) = value.to_lowercase().parse::<bool>() {
-                    let worksheet = self.workbook.worksheet_mut(sheet)?;
+                    worksheet.set_cell_with_boolean(row, column, v, new_style_index);
-                    worksheet.set_cell_with_boolean(row, column, v, new_style_index)?;
+                    return;
-                    return Ok(());
                 }
                 // Check is it is error value
                 let upper = value.to_uppercase();
-                let worksheet = self.workbook.worksheet_mut(sheet)?;
                 match get_error_by_name(&upper, &self.language) {
                     Some(error) => {
-                        worksheet.set_cell_with_error(row, column, error, new_style_index)?;
+                        worksheet.set_cell_with_error(row, column, error, new_style_index);
                     }
                     None => {
-                        self.set_cell_with_string(sheet, row, column, &value, new_style_index)?;
+                        self.set_cell_with_string(sheet, row, column, &value, new_style_index);
                     }
                 }
             }
         }
-        Ok(())
     }
 
     fn set_cell_with_formula(
@@ -1530,66 +1502,24 @@ impl Model {
             self.parsed_formulas[sheet as usize].push(parsed_formula);
             formula_index = (shared_formulas.len() as i32) - 1;
         }
-        worksheet.set_cell_with_formula(row, column, formula_index, style)?;
+        worksheet.set_cell_with_formula(row, column, formula_index, style);
         Ok(formula_index)
     }
 
-    fn set_cell_with_string(
+    fn set_cell_with_string(&mut self, sheet: u32, row: i32, column: i32, value: &str, style: i32) {
-        &mut self,
+        let worksheets = &mut self.workbook.worksheets;
-        sheet: u32,
+        let worksheet = &mut worksheets[sheet as usize];
-        row: i32,
-        column: i32,
-        value: &str,
-        style: i32,
-    ) -> Result<(), String> {
         match self.shared_strings.get(value) {
             Some(string_index) => {
-                self.workbook.worksheet_mut(sheet)?.set_cell_with_string(
+                worksheet.set_cell_with_string(row, column, *string_index as i32, style);
-                    row,
-                    column,
-                    *string_index as i32,
-                    style,
-                )?;
             }
             None => {
                 let string_index = self.workbook.shared_strings.len();
                 self.workbook.shared_strings.push(value.to_string());
                 self.shared_strings.insert(value.to_string(), string_index);
-                self.workbook.worksheet_mut(sheet)?.set_cell_with_string(
+                worksheet.set_cell_with_string(row, column, string_index as i32, style);
-                    row,
-                    column,
-                    string_index as i32,
-                    style,
-                )?;
             }
         }
-        Ok(())
-    }
-
-    fn set_cell_with_boolean(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        value: bool,
-        style: i32,
-    ) -> Result<(), String> {
-        self.workbook
-            .worksheet_mut(sheet)?
-            .set_cell_with_boolean(row, column, value, style)
-    }
-
-    fn set_cell_with_number(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        value: f64,
-        style: i32,
-    ) -> Result<(), String> {
-        self.workbook
-            .worksheet_mut(sheet)?
-            .set_cell_with_number(row, column, value, style)
     }
 
     /// Gets the Excel Value (Bool, Number, String) of a cell
@@ -1656,7 +1586,7 @@ impl Model {
     ) -> Result<String, String> {
         match self.workbook.worksheet(sheet_index)?.cell(row, column) {
             Some(cell) => {
-                let format = self.get_style_for_cell(sheet_index, row, column)?.num_fmt;
+                let format = self.get_style_for_cell(sheet_index, row, column).num_fmt;
                 let formatted_value =
                     cell.formatted_value(&self.workbook.shared_strings, &self.language, |value| {
                         format_number(value, &format, &self.locale).text
@@ -1759,7 +1689,7 @@ impl Model {
     pub fn cell_clear_contents(&mut self, sheet: u32, row: i32, column: i32) -> Result<(), String> {
         self.workbook
             .worksheet_mut(sheet)?
-            .cell_clear_contents(row, column)?;
+            .cell_clear_contents(row, column);
         Ok(())
     }
 
@@ -1794,40 +1724,43 @@ impl Model {
     }
 
     /// Returns the style index for cell (`sheet`, `row`, `column`)
-    pub fn get_cell_style_index(&self, sheet: u32, row: i32, column: i32) -> Result<i32, String> {
+    pub fn get_cell_style_index(&self, sheet: u32, row: i32, column: i32) -> i32 {
         // First check the cell, then row, the column
-        let cell = self.workbook.worksheet(sheet)?.cell(row, column);
+        let cell = self
-
+            .workbook
+            .worksheet(sheet)
+            .expect("Invalid sheet")
+            .cell(row, column);
         match cell {
-            Some(cell) => Ok(cell.get_style()),
+            Some(cell) => cell.get_style(),
             None => {
-                let rows = &self.workbook.worksheet(sheet)?.rows;
+                let rows = &self.workbook.worksheets[sheet as usize].rows;
                 for r in rows {
                     if r.r == row {
                         if r.custom_format {
-                            return Ok(r.s);
+                            return r.s;
                         }
                         break;
                     }
                 }
-                let cols = &self.workbook.worksheet(sheet)?.cols;
+                let cols = &self.workbook.worksheets[sheet as usize].cols;
                 for c in cols.iter() {
                     let min = c.min;
                     let max = c.max;
                     if column >= min && column <= max {
-                        return Ok(c.style.unwrap_or(0));
+                        return c.style.unwrap_or(0);
                     }
                 }
-                Ok(0)
+                0
             }
         }
     }
 
     /// Returns the style for cell (`sheet`, `row`, `column`)
-    pub fn get_style_for_cell(&self, sheet: u32, row: i32, column: i32) -> Result<Style, String> {
+    pub fn get_style_for_cell(&self, sheet: u32, row: i32, column: i32) -> Style {
-        let style_index = self.get_cell_style_index(sheet, row, column)?;
+        self.workbook
-        let style = self.workbook.styles.get_style(style_index)?;
+            .styles
-        Ok(style)
+            .get_style(self.get_cell_style_index(sheet, row, column))
     }
 
     /// Returns an internal binary representation of the workbook
@@ -1855,7 +1788,7 @@ impl Model {
     /// Returns markup representation of the given `sheet`.
     pub fn get_sheet_markup(&self, sheet: u32) -> Result<String, String> {
         let worksheet = self.workbook.worksheet(sheet)?;
-        let dimension = worksheet.dimension();
+        let dimension = worksheet.get_dimension();
 
         let mut rows = Vec::new();
 
@@ -1867,7 +1800,7 @@ impl Model {
                     Some(formula) => formula,
                     None => self.get_formatted_cell_value(sheet, row, column)?,
                 };
-                let style = self.get_style_for_cell(sheet, row, column)?;
+                let style = self.get_style_for_cell(sheet, row, column);
                 if style.font.b {
                     cell_markup = format!("**{cell_markup}**")
                 }

base/src/new_empty.rs

@@ -4,7 +4,6 @@ use std::collections::HashMap;
 
 use crate::{
     calc_result::Range,
-    constants::{DEFAULT_WINDOW_HEIGH, DEFAULT_WINDOW_WIDTH},
     expressions::{
         lexer::LexerMode,
         parser::{
@@ -16,9 +15,7 @@ use crate::{
     language::get_language,
     locale::get_locale,
     model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
-    types::{
+    types::{Metadata, Selection, SheetState, Workbook, WorkbookSettings, Worksheet},
-        Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView,
-    },
     utils::ParsedReference,
 };
 
@@ -38,20 +35,7 @@ fn is_valid_sheet_name(name: &str) -> bool {
 
 impl Model {
     /// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists
-    fn new_empty_worksheet(name: &str, sheet_id: u32, view_ids: &[&u32]) -> Worksheet {
+    fn new_empty_worksheet(name: &str, sheet_id: u32) -> Worksheet {
-        let mut views = HashMap::new();
-        for id in view_ids {
-            views.insert(
-                **id,
-                WorksheetView {
-                    row: 1,
-                    column: 1,
-                    range: [1, 1, 1, 1],
-                    top_row: 1,
-                    left_column: 1,
-                },
-            );
-        }
         Worksheet {
             cols: vec![],
             rows: vec![],
@@ -66,8 +50,12 @@ impl Model {
             color: Default::default(),
             frozen_columns: 0,
             frozen_rows: 0,
-            show_grid_lines: true,
+            selection: Selection {
-            views,
+                is_selected: false,
+                row: 1,
+                column: 1,
+                range: [1, 1, 1, 1],
+            },
         }
     }
 
@@ -142,7 +130,7 @@ impl Model {
         self.parsed_defined_names = parsed_defined_names;
     }
 
-    /// Reparses all formulas and defined names
+    // Reparses all formulas and defined names
     pub(crate) fn reset_parsed_structures(&mut self) {
         self.parser
             .set_worksheets(self.workbook.get_worksheet_names());
@@ -173,8 +161,7 @@ impl Model {
         let sheet_name = format!("{}{}", base_name, index);
         // Now we need a sheet_id
         let sheet_id = self.get_new_sheet_id();
-        let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
+        let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id);
-        let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id, &view_ids);
         self.workbook.worksheets.push(worksheet);
         self.reset_parsed_structures();
         (sheet_name, self.workbook.worksheets.len() as u32 - 1)
@@ -205,8 +192,7 @@ impl Model {
             Some(id) => id,
             None => self.get_new_sheet_id(),
         };
-        let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
+        let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id);
-        let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id, &view_ids);
         if sheet_index as usize > self.workbook.worksheets.len() {
             return Err("Sheet index out of range".to_string());
         }
@@ -353,21 +339,11 @@ impl Model {
         // "2020-08-06T21:20:53Z
         let now = dt.format("%Y-%m-%dT%H:%M:%SZ").to_string();
 
-        let mut views = HashMap::new();
-        views.insert(
-            0,
-            WorkbookView {
-                sheet: 0,
-                window_width: DEFAULT_WINDOW_WIDTH,
-                window_height: DEFAULT_WINDOW_HEIGH,
-            },
-        );
-
         // String versions of the locale are added here to simplify the serialize/deserialize logic
         let workbook = Workbook {
             shared_strings: vec![],
             defined_names: vec![],
-            worksheets: vec![Model::new_empty_worksheet("Sheet1", 1, &[&0])],
+            worksheets: vec![Model::new_empty_worksheet("Sheet1", 1)],
             styles: Default::default(),
             name: name.to_string(),
             settings: WorkbookSettings {
@@ -383,7 +359,6 @@ impl Model {
                 last_modified: now,
             },
             tables: HashMap::new(),
-            views,
         };
         let parsed_formulas = Vec::new();
         let worksheets = &workbook.worksheets;
@@ -404,7 +379,6 @@ impl Model {
             locale,
             language,
             tz,
-            view_id: 0,
         };
         model.parse_formulas();
         Ok(model)

base/src/styles.rs

@@ -161,29 +161,26 @@ impl Styles {
 
     pub fn create_named_style(&mut self, style_name: &str, style: &Style) -> Result<(), String> {
         let style_index = self.create_new_style(style);
-        self.add_named_cell_style(style_name, style_index)
+        self.add_named_cell_style(style_name, style_index)?;
+        Ok(())
     }
 
-    pub(crate) fn get_style_with_quote_prefix(&mut self, index: i32) -> Result<i32, String> {
+    pub(crate) fn get_style_with_quote_prefix(&mut self, index: i32) -> i32 {
-        let mut style = self.get_style(index)?;
+        let mut style = self.get_style(index);
         style.quote_prefix = true;
-        Ok(self.get_style_index_or_create(&style))
+        self.get_style_index_or_create(&style)
     }
 
-    pub(crate) fn get_style_with_format(
+    pub(crate) fn get_style_with_format(&mut self, index: i32, num_fmt: &str) -> i32 {
-        &mut self,
+        let mut style = self.get_style(index);
-        index: i32,
-        num_fmt: &str,
-    ) -> Result<i32, String> {
-        let mut style = self.get_style(index)?;
         style.num_fmt = num_fmt.to_string();
-        Ok(self.get_style_index_or_create(&style))
+        self.get_style_index_or_create(&style)
     }
 
-    pub(crate) fn get_style_without_quote_prefix(&mut self, index: i32) -> Result<i32, String> {
+    pub(crate) fn get_style_without_quote_prefix(&mut self, index: i32) -> i32 {
-        let mut style = self.get_style(index)?;
+        let mut style = self.get_style(index);
         style.quote_prefix = false;
-        Ok(self.get_style_index_or_create(&style))
+        self.get_style_index_or_create(&style)
     }
 
     pub(crate) fn style_is_quote_prefix(&self, index: i32) -> bool {
@@ -191,11 +188,9 @@ impl Styles {
         cell_xf.quote_prefix
     }
 
-    pub(crate) fn get_style(&self, index: i32) -> Result<Style, String> {
+    pub(crate) fn get_style(&self, index: i32) -> Style {
-        let cell_xf = &self
+        let cell_xf = &self.cell_xfs[index as usize];
-            .cell_xfs
+
-            .get(index as usize)
-            .ok_or("Invalid index provided".to_string())?;
         let border_id = cell_xf.border_id as usize;
         let fill_id = cell_xf.fill_id as usize;
         let font_id = cell_xf.font_id as usize;
@@ -203,14 +198,14 @@ impl Styles {
         let quote_prefix = cell_xf.quote_prefix;
         let alignment = cell_xf.alignment.clone();
 
-        Ok(Style {
+        Style {
             alignment,
             num_fmt: get_num_fmt(num_fmt_id, &self.num_fmts),
             fill: self.fills[fill_id].clone(),
             font: self.fonts[font_id].clone(),
             border: self.borders[border_id].clone(),
             quote_prefix,
-        })
+        }
     }
 }
 
@@ -226,7 +221,8 @@ impl Model {
         let style_index = self.workbook.styles.get_style_index_or_create(style);
         self.workbook
             .worksheet_mut(sheet)?
-            .set_cell_style(row, column, style_index)
+            .set_cell_style(row, column, style_index);
+        Ok(())
     }
 
     pub fn copy_cell_style(
@@ -241,7 +237,9 @@ impl Model {
 
         self.workbook
             .worksheet_mut(destination_cell.0)?
-            .set_cell_style(destination_cell.1, destination_cell.2, source_style_index)
+            .set_cell_style(destination_cell.1, destination_cell.2, source_style_index);
+
+        Ok(())
     }
 
     /// Sets the style "style_name" in cell
@@ -255,7 +253,8 @@ impl Model {
         let style_index = self.workbook.styles.get_style_index_by_name(style_name)?;
         self.workbook
             .worksheet_mut(sheet)?
-            .set_cell_style(row, column, style_index)
+            .set_cell_style(row, column, style_index);
+        Ok(())
     }
 
     pub fn set_sheet_style(&mut self, sheet: u32, style_name: &str) -> Result<(), String> {

base/src/test/engineering/test_complex.rs

@@ -76,16 +76,10 @@ fn fn_imconjugate() {
 fn fn_imcos() {
     let mut model = new_empty_model();
     model._set("A1", r#"=IMCOS("4+3i")"#);
-    // In macos non intel this is "-6.58066304055116+7.58155274274655i"
-    model._set("A2", r#"=COMPLEX(-6.58066304055116, 7.58155274274654)"#);
-    model._set("A3", r#"=IMABS(IMSUB(A1, A2)) < G1"#);
-
-    // small number
-    model._set("G1", "0.0000001");
 
     model.evaluate();
 
-    assert_eq!(model._get_text("A3"), "TRUE");
+    assert_eq!(model._get_text("A1"), "-6.58066304055116+7.58155274274654i");
 }
 
 #[test]

base/src/test/functions/mod.rs

@@ -0,0 +1,18 @@
+mod test_fn_average;
+mod test_fn_averageifs;
+mod test_fn_choose;
+mod test_fn_concatenate;
+mod test_fn_count;
+mod test_fn_exact;
+mod test_fn_financial;
+mod test_fn_if;
+mod test_fn_maxifs;
+mod test_fn_minifs;
+mod test_fn_offset;
+mod test_fn_product;
+mod test_fn_rept;
+mod test_fn_sum;
+mod test_fn_sumifs;
+mod test_fn_textbefore;
+mod test_fn_textjoin;
+mod test_fn_type;

base/src/test/mod.rs

@@ -1,3 +1,5 @@
+mod engineering;
+mod functions;
 mod test_actions;
 mod test_binary_search;
 mod test_cell;
@@ -8,51 +10,30 @@ mod test_criteria;
 mod test_currency;
 mod test_date_and_time;
 mod test_error_propagation;
-mod test_fn_average;
+mod test_escape_quotes;
-mod test_fn_averageifs;
+mod test_extend;
-mod test_fn_choose;
-mod test_fn_concatenate;
-mod test_fn_count;
-mod test_fn_exact;
-mod test_fn_financial;
-mod test_fn_if;
-mod test_fn_maxifs;
-mod test_fn_minifs;
-mod test_fn_product;
-mod test_fn_rept;
-mod test_fn_sum;
-mod test_fn_sumifs;
-mod test_fn_textbefore;
-mod test_fn_textjoin;
 mod test_forward_references;
+mod test_frozen_rows_and_columns;
 mod test_frozen_rows_columns;
 mod test_general;
+mod test_get_cell_content;
 mod test_math;
 mod test_metadata;
 mod test_model_cell_clear_all;
 mod test_model_is_empty_cell;
 mod test_move_formula;
+mod test_number_format;
+mod test_percentage;
 mod test_quote_prefix;
 mod test_set_user_input;
 mod test_sheet_markup;
 mod test_sheets;
+mod test_shift_cells;
 mod test_styles;
+mod test_today;
 mod test_trigonometric;
+mod test_types;
 mod test_workbook;
 mod test_worksheet;
-pub(crate) mod util;
-
-mod engineering;
-mod test_fn_offset;
-mod test_number_format;
-
-mod test_escape_quotes;
-mod test_extend;
-mod test_fn_type;
-mod test_frozen_rows_and_columns;
-mod test_get_cell_content;
-mod test_percentage;
-mod test_set_functions_error_handling;
-mod test_today;
-mod test_types;
 mod user_model;
+pub(crate) mod util;

base/src/test/test_column_width.rs

@@ -26,7 +26,7 @@ fn test_column_width() {
     assert!((worksheet.get_column_width(1).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
     assert!((worksheet.get_column_width(2).unwrap() - 30.0).abs() < f64::EPSILON);
     assert!((worksheet.get_column_width(3).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
-    assert_eq!(model.get_cell_style_index(0, 23, 2), Ok(6));
+    assert_eq!(model.get_cell_style_index(0, 23, 2), 6);
 }
 
 #[test]
@@ -53,7 +53,7 @@ fn test_column_width_lower_edge() {
     assert!(
         (worksheet.get_column_width(6).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON
     );
-    assert_eq!(model.get_cell_style_index(0, 23, 5), Ok(1));
+    assert_eq!(model.get_cell_style_index(0, 23, 5), 1);
 }
 
 #[test]
@@ -80,5 +80,5 @@ fn test_column_width_higher_edge() {
     );
     assert!((worksheet.get_column_width(16).unwrap() - 30.0).abs() < f64::EPSILON);
     assert!((worksheet.get_column_width(17).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
-    assert_eq!(model.get_cell_style_index(0, 23, 16), Ok(1));
+    assert_eq!(model.get_cell_style_index(0, 23, 16), 1);
 }

base/src/test/test_general.rs

@@ -17,9 +17,7 @@ fn test_empty_model() {
 #[test]
 fn test_model_simple_evaluation() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "= 1 + 3".to_string());
-        .set_user_input(0, 1, 1, "= 1 + 3".to_string())
-        .unwrap();
     model.evaluate();
     let result = model._get_text_at(0, 1, 1);
     assert_eq!(result, *"4");
@@ -45,7 +43,7 @@ fn test_model_simple_evaluation_order() {
 #[test]
 fn test_model_invalid_formula() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "= 1 +".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "= 1 +".to_string());
     model.evaluate();
     let result = model._get_text_at(0, 1, 1);
     assert_eq!(result, *"#ERROR!");
@@ -56,10 +54,8 @@ fn test_model_invalid_formula() {
 #[test]
 fn test_model_dependencies() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "23".to_string()).unwrap(); // A1
+    model.set_user_input(0, 1, 1, "23".to_string()); // A1
-    model
+    model.set_user_input(0, 1, 2, "= A1* 2-4".to_string()); // B1
-        .set_user_input(0, 1, 2, "= A1* 2-4".to_string())
-        .unwrap(); // B1
     model.evaluate();
     let result = model._get_text_at(0, 1, 1);
     assert_eq!(result, *"23");
@@ -69,9 +65,7 @@ fn test_model_dependencies() {
     let result = model._get_formula("B1");
     assert_eq!(result, *"=A1*2-4");
 
-    model
+    model.set_user_input(0, 2, 1, "=SUM(A1, B1)".to_string()); // A2
-        .set_user_input(0, 2, 1, "=SUM(A1, B1)".to_string())
-        .unwrap(); // A2
     model.evaluate();
     let result = model._get_text_at(0, 2, 1);
     assert_eq!(result, *"65");
@@ -80,10 +74,8 @@ fn test_model_dependencies() {
 #[test]
 fn test_model_strings() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "Hello World".to_string());
-        .set_user_input(0, 1, 1, "Hello World".to_string())
+    model.set_user_input(0, 1, 2, "=A1".to_string());
-        .unwrap();
-    model.set_user_input(0, 1, 2, "=A1".to_string()).unwrap();
     model.evaluate();
     let result = model._get_text_at(0, 1, 1);
     assert_eq!(result, *"Hello World");
@@ -160,35 +152,21 @@ fn test_to_excel_precision_str() {
 #[test]
 fn test_booleans() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "true".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "true".to_string());
-    model.set_user_input(0, 2, 1, "TRUE".to_string()).unwrap();
+    model.set_user_input(0, 2, 1, "TRUE".to_string());
-    model.set_user_input(0, 3, 1, "True".to_string()).unwrap();
+    model.set_user_input(0, 3, 1, "True".to_string());
-    model.set_user_input(0, 4, 1, "false".to_string()).unwrap();
+    model.set_user_input(0, 4, 1, "false".to_string());
-    model.set_user_input(0, 5, 1, "FALSE".to_string()).unwrap();
+    model.set_user_input(0, 5, 1, "FALSE".to_string());
-    model.set_user_input(0, 6, 1, "False".to_string()).unwrap();
+    model.set_user_input(0, 6, 1, "False".to_string());
 
-    model
+    model.set_user_input(0, 1, 2, "=ISLOGICAL(A1)".to_string());
-        .set_user_input(0, 1, 2, "=ISLOGICAL(A1)".to_string())
+    model.set_user_input(0, 2, 2, "=ISLOGICAL(A2)".to_string());
-        .unwrap();
+    model.set_user_input(0, 3, 2, "=ISLOGICAL(A3)".to_string());
-    model
+    model.set_user_input(0, 4, 2, "=ISLOGICAL(A4)".to_string());
-        .set_user_input(0, 2, 2, "=ISLOGICAL(A2)".to_string())
+    model.set_user_input(0, 5, 2, "=ISLOGICAL(A5)".to_string());
-        .unwrap();
+    model.set_user_input(0, 6, 2, "=ISLOGICAL(A6)".to_string());
-    model
-        .set_user_input(0, 3, 2, "=ISLOGICAL(A3)".to_string())
-        .unwrap();
-    model
-        .set_user_input(0, 4, 2, "=ISLOGICAL(A4)".to_string())
-        .unwrap();
-    model
-        .set_user_input(0, 5, 2, "=ISLOGICAL(A5)".to_string())
-        .unwrap();
-    model
-        .set_user_input(0, 6, 2, "=ISLOGICAL(A6)".to_string())
-        .unwrap();
 
-    model
+    model.set_user_input(0, 1, 5, "=IF(false, True, FALSe)".to_string());
-        .set_user_input(0, 1, 5, "=IF(false, True, FALSe)".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -213,19 +191,19 @@ fn test_booleans() {
 #[test]
 fn test_set_cell_style() {
     let mut model = new_empty_model();
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     assert!(!style.font.b);
 
     style.font.b = true;
     assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
 
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     assert!(style.font.b);
 
     style.font.b = false;
     assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
 
-    let style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let style = model.get_style_for_cell(0, 1, 1);
     assert!(!style.font.b);
 }
 
@@ -233,21 +211,21 @@ fn test_set_cell_style() {
 fn test_copy_cell_style() {
     let mut model = new_empty_model();
 
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     style.font.b = true;
     assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
 
-    let mut style = model.get_style_for_cell(0, 1, 2).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 2);
     style.font.i = true;
     assert!(model.set_cell_style(0, 1, 2, &style).is_ok());
 
     assert!(model.copy_cell_style((0, 1, 1), (0, 1, 2)).is_ok());
 
-    let style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let style = model.get_style_for_cell(0, 1, 1);
     assert!(style.font.b);
     assert!(!style.font.i);
 
-    let style = model.get_style_for_cell(0, 1, 2).unwrap();
+    let style = model.get_style_for_cell(0, 1, 2);
     assert!(style.font.b);
     assert!(!style.font.i);
 }
@@ -256,15 +234,15 @@ fn test_copy_cell_style() {
 fn test_get_cell_style_index() {
     let mut model = new_empty_model();
 
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
-    let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
+    let style_index = model.get_cell_style_index(0, 1, 1);
     assert_eq!(style_index, 0);
     assert!(!style.font.b);
 
     style.font.b = true;
     assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
 
-    let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
+    let style_index = model.get_cell_style_index(0, 1, 1);
     assert_eq!(style_index, 1);
 }
 
@@ -272,29 +250,29 @@ fn test_get_cell_style_index() {
 fn test_model_set_cells_with_values_styles() {
     let mut model = new_empty_model();
     // Inputs
-    model.set_user_input(0, 1, 1, "21".to_string()).unwrap(); // A1
+    model.set_user_input(0, 1, 1, "21".to_string()); // A1
-    model.set_user_input(0, 2, 1, "2".to_string()).unwrap(); // A2
+    model.set_user_input(0, 2, 1, "2".to_string()); // A2
 
-    let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
+    let style_index = model.get_cell_style_index(0, 1, 1);
     assert_eq!(style_index, 0);
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     style.font.b = true;
     assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
     assert!(model.set_cell_style(0, 2, 1, &style).is_ok());
-    let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
+    let style_index = model.get_cell_style_index(0, 1, 1);
     assert_eq!(style_index, 1);
-    let style_index = model.get_cell_style_index(0, 2, 1).unwrap();
+    let style_index = model.get_cell_style_index(0, 2, 1);
     assert_eq!(style_index, 1);
 
-    model.update_cell_with_number(0, 1, 2, 1.0).unwrap();
+    model.update_cell_with_number(0, 1, 2, 1.0);
-    model.update_cell_with_number(0, 2, 1, 2.0).unwrap();
+    model.update_cell_with_number(0, 2, 1, 2.0);
 
     model.evaluate();
 
     // Styles are not modified
-    let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
+    let style_index = model.get_cell_style_index(0, 1, 1);
     assert_eq!(style_index, 1);
-    let style_index = model.get_cell_style_index(0, 2, 1).unwrap();
+    let style_index = model.get_cell_style_index(0, 2, 1);
     assert_eq!(style_index, 1);
 }
 
@@ -302,20 +280,20 @@ fn test_model_set_cells_with_values_styles() {
 fn test_style_fmt_id() {
     let mut model = new_empty_model();
 
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     style.num_fmt = "#.##".to_string();
     assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
-    let style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let style = model.get_style_for_cell(0, 1, 1);
     assert_eq!(style.num_fmt, "#.##");
 
-    let mut style = model.get_style_for_cell(0, 10, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 10, 1);
     style.num_fmt = "$$#,##0.0000".to_string();
     assert!(model.set_cell_style(0, 10, 1, &style).is_ok());
-    let style = model.get_style_for_cell(0, 10, 1).unwrap();
+    let style = model.get_style_for_cell(0, 10, 1);
     assert_eq!(style.num_fmt, "$$#,##0.0000");
 
     // Make sure old style is not touched
-    let style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let style = model.get_style_for_cell(0, 1, 1);
     assert_eq!(style.num_fmt, "#.##");
 }
 
@@ -379,13 +357,9 @@ fn set_input_autocomplete() {
     let mut model = new_empty_model();
     model._set("A1", "1");
     model._set("A2", "2");
-    model
+    model.set_user_input(0, 3, 1, "=SUM(A1:A2".to_string());
-        .set_user_input(0, 3, 1, "=SUM(A1:A2".to_string())
-        .unwrap();
     // This will fail anyway
-    model
+    model.set_user_input(0, 4, 1, "=SUM(A1*".to_string());
-        .set_user_input(0, 4, 1, "=SUM(A1*".to_string())
-        .unwrap();
     model.evaluate();
 
     assert_eq!(model._get_formula("A3"), "=SUM(A1:A2)");
@@ -431,7 +405,7 @@ fn test_get_formatted_cell_value() {
     model._set("A5", "123.456");
 
     // change A5 format
-    let mut style = model.get_style_for_cell(0, 5, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 5, 1);
     style.num_fmt = "$#,##0.00".to_string();
     model.set_cell_style(0, 5, 1, &style).unwrap();
 

base/src/test/test_get_cell_content.rs

@@ -5,12 +5,8 @@ use crate::test::util::new_empty_model;
 #[test]
 fn test_formulas() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "$100.348".to_string());
-        .set_user_input(0, 1, 1, "$100.348".to_string())
+    model.set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string());
-        .unwrap();
-    model
-        .set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string())
-        .unwrap();
 
     model.evaluate();
 

base/src/test/test_metadata.rs

@@ -3,7 +3,7 @@ use crate::test::util::new_empty_model;
 #[test]
 fn test_metadata_new_model() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "5.5".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "5.5".to_string());
     model.evaluate();
     let metadata = &model.workbook.metadata;
     assert_eq!(metadata.application, "IronCalc Sheets");

base/src/test/test_model_is_empty_cell.rs

@@ -14,9 +14,7 @@ fn test_is_empty_cell_non_existing_sheet() {
 fn test_is_empty_cell() {
     let mut model = new_empty_model();
     assert!(model.is_empty_cell(0, 3, 1).unwrap());
-    model
+    model.set_user_input(0, 3, 1, "Hello World".to_string());
-        .set_user_input(0, 3, 1, "Hello World".to_string())
-        .unwrap();
     assert!(!model.is_empty_cell(0, 3, 1).unwrap());
     model.cell_clear_contents(0, 3, 1).unwrap();
     assert!(model.is_empty_cell(0, 3, 1).unwrap());

base/src/test/test_quote_prefix.rs

@@ -57,12 +57,12 @@ fn test_quote_prefix_enter() {
     model._set("A2", "=ISTEXT(A1)");
     model.evaluate();
     // We introduce a value with a "quote prefix" index
-    model.set_user_input(0, 1, 3, "'=A1".to_string()).unwrap();
+    model.set_user_input(0, 1, 3, "'=A1".to_string());
     model.evaluate();
     assert_eq!(model._get_text("C1"), *"=A1");
 
     // But if we enter with a quote_prefix but without the "'" it won't be quote_prefix
-    model.set_user_input(0, 1, 4, "=A1".to_string()).unwrap();
+    model.set_user_input(0, 1, 4, "=A1".to_string());
     model.evaluate();
     assert_eq!(model._get_text("D1"), *"123");
 }
@@ -75,7 +75,7 @@ fn test_quote_prefix_reenter() {
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"TRUE");
     // We introduce a value with a "quote prefix" index
-    model.set_user_input(0, 1, 1, "123".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "123".to_string());
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"FALSE");
 }
@@ -83,7 +83,7 @@ fn test_quote_prefix_reenter() {
 #[test]
 fn test_update_cell_quote() {
     let mut model = new_empty_model();
-    model.update_cell_with_text(0, 1, 1, "= 1 + 3").unwrap();
+    model.update_cell_with_text(0, 1, 1, "= 1 + 3");
     model.evaluate();
     assert_eq!(model._get_text("A1"), *"= 1 + 3");
     assert!(!model._has_formula("A1"));
@@ -92,12 +92,12 @@ fn test_update_cell_quote() {
 #[test]
 fn test_update_quote_prefix_reenter() {
     let mut model = new_empty_model();
-    model.update_cell_with_text(0, 1, 1, "123").unwrap();
+    model.update_cell_with_text(0, 1, 1, "123");
     model._set("A2", "=ISTEXT(A1)");
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"TRUE");
     // We reenter as a number
-    model.update_cell_with_number(0, 1, 1, 123.0).unwrap();
+    model.update_cell_with_number(0, 1, 1, 123.0);
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"FALSE");
 }
@@ -105,12 +105,12 @@ fn test_update_quote_prefix_reenter() {
 #[test]
 fn test_update_quote_prefix_reenter_bool() {
     let mut model = new_empty_model();
-    model.update_cell_with_text(0, 1, 1, "TRUE").unwrap();
+    model.update_cell_with_text(0, 1, 1, "TRUE");
     model._set("A2", "=ISTEXT(A1)");
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"TRUE");
     // We enter a bool
-    model.update_cell_with_bool(0, 1, 1, true).unwrap();
+    model.update_cell_with_bool(0, 1, 1, true);
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"FALSE");
 }
@@ -118,29 +118,29 @@ fn test_update_quote_prefix_reenter_bool() {
 #[test]
 fn test_update_quote_prefix_reenter_text() {
     let mut model = new_empty_model();
-    model.update_cell_with_text(0, 1, 1, "123").unwrap();
+    model.update_cell_with_text(0, 1, 1, "123");
     model._set("A2", "=ISTEXT(A1)");
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"TRUE");
-    assert!(model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
+    assert!(model.get_style_for_cell(0, 1, 1).quote_prefix);
     // We enter a string
-    model.update_cell_with_text(0, 1, 1, "Hello").unwrap();
+    model.update_cell_with_text(0, 1, 1, "Hello");
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"TRUE");
-    assert!(!model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
+    assert!(!model.get_style_for_cell(0, 1, 1).quote_prefix);
 }
 
 #[test]
 fn test_update_quote_prefix_reenter_text_2() {
     let mut model = new_empty_model();
-    model.update_cell_with_text(0, 1, 1, "123").unwrap();
+    model.update_cell_with_text(0, 1, 1, "123");
     model._set("A2", "=ISTEXT(A1)");
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"TRUE");
-    assert!(model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
+    assert!(model.get_style_for_cell(0, 1, 1).quote_prefix);
     // We enter another number
-    model.update_cell_with_text(0, 1, 1, "42").unwrap();
+    model.update_cell_with_text(0, 1, 1, "42");
     model.evaluate();
     assert_eq!(model._get_text("A2"), *"TRUE");
-    assert!(model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
+    assert!(model.get_style_for_cell(0, 1, 1).quote_prefix);
 }

base/src/test/test_set_functions_error_handling.rs

@@ -1,449 +0,0 @@
-use crate::{expressions::token, test::util::new_empty_model, types::Cell};
-
-#[test]
-fn test_update_cell_with_text() {
-    let mut model = new_empty_model();
-
-    // Below are safe inputs
-    model.set_user_input(0, 1, 1, "Hello".to_string()).unwrap();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid sheet
-    let update_result = model.update_cell_with_text(1, 1, 1, "new value");
-    assert_eq!(update_result, Err("Invalid sheet index".to_string()));
-
-    // Case2 : Invalid Row
-    let update_result = model.update_cell_with_text(0, 0, 1, "new value");
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case3 : Invalid Column
-    let update_result = model.update_cell_with_text(0, 1, 1048579, "new value");
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_update_cell_with_number() {
-    let mut model = new_empty_model();
-
-    // Below are safe inputs
-    model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid sheet
-    let update_result = model.update_cell_with_number(1, 1, 1, 20.0);
-    assert_eq!(update_result, Err("Invalid sheet index".to_string()));
-
-    // Case2 : Invalid Row
-    let update_result = model.update_cell_with_number(0, 0, 1, 20.0);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case3 : Invalid Column
-    let update_result = model.update_cell_with_number(0, 1, 1048579, 20.0);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_update_cell_with_bool() {
-    let mut model = new_empty_model();
-
-    // Below are safe inputs
-    model.update_cell_with_bool(0, 1, 1, true).unwrap();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid sheet
-    let update_result = model.update_cell_with_bool(1, 1, 1, false);
-    assert_eq!(update_result, Err("Invalid sheet index".to_string()));
-
-    // Case2 : Invalid Row
-    let update_result = model.update_cell_with_bool(0, 0, 1, false);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case3 : Invalid Column
-    let update_result = model.update_cell_with_bool(0, 1, 1048579, false);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_update_cell_with_formula() {
-    let mut model = new_empty_model();
-
-    // Below are safe inputs
-    model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
-    model
-        .update_cell_with_formula(0, 1, 2, "=A1*2".to_string())
-        .unwrap();
-
-    model.evaluate();
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid sheet
-    let update_result = model.update_cell_with_formula(1, 1, 2, "=A1*2".to_string());
-    assert_eq!(update_result, Err("Invalid sheet index".to_string()));
-
-    // Case2 : Invalid Row
-    let update_result = model.update_cell_with_formula(0, 0, 2, "=A1*2".to_string());
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case3 : Invalid Column
-    let update_result = model.update_cell_with_formula(0, 1, 1048579, "=A1*2".to_string());
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_set_user_input() {
-    let mut model = new_empty_model();
-
-    // Below are safe inputs
-    model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
-    model.evaluate();
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid sheet
-    let update_result = model.set_user_input(1, 1, 2, "20.0".to_string());
-    assert_eq!(update_result, Err("Invalid sheet index".to_string()));
-
-    // Case2 : Invalid Row
-    let update_result = model.set_user_input(0, 0, 2, "20.0".to_string());
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case3 : Invalid Column
-    let update_result = model.set_user_input(0, 1, 1048579, "20.0".to_string());
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_get_style_for_cell() {
-    let mut model = new_empty_model();
-
-    // Below are safe inputs
-    model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
-    model.evaluate();
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid sheet
-    let update_result = model.get_style_for_cell(1, 1, 2);
-    assert_eq!(update_result, Err("Invalid sheet index".to_string()));
-
-    // ATTENTION : get_cell_style_index tries to get cell using row and col
-    // if we invalid row or column is given, it will return index 0.
-
-    // Case2 : Invalid Row
-    let update_result = model.get_style_for_cell(0, 0, 2);
-    assert!(update_result.is_ok());
-
-    // Case3 : Invalid Column
-    let update_result = model.get_style_for_cell(0, 1, 1048579);
-    assert!(update_result.is_ok());
-}
-
-#[test]
-fn test_get_cell_style_index() {
-    let mut model = new_empty_model();
-
-    // Below are safe inputs
-    model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
-    model.evaluate();
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid sheet
-    let update_result = model.get_cell_style_index(1, 1, 2);
-    assert_eq!(update_result, Err("Invalid sheet index".to_string()));
-
-    // ATTENTION : get_cell_style_index tries to get cell using row and col
-    // if we invalid row or column is given, it will return index 0.
-
-    // Case2 : Invalid Row
-    let update_result = model.get_cell_style_index(0, 0, 2);
-    assert_eq!(update_result, Ok(0));
-
-    // Case3 : Invalid Column
-    let update_result = model.get_cell_style_index(0, 1, 1048579);
-    assert_eq!(update_result, Ok(0));
-}
-
-#[test]
-fn test_worksheet_update_cell() {
-    let mut model = new_empty_model();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result =
-        model
-            .workbook
-            .worksheet_mut(0)
-            .unwrap()
-            .update_cell(0, 1, Cell::new_number(10.0, 1));
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result =
-        model
-            .workbook
-            .worksheet_mut(0)
-            .unwrap()
-            .update_cell(1, 1048579, Cell::new_number(10.0, 1));
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_worksheet_set_cell_style() {
-    let mut model = new_empty_model();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_style(0, 1, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_style(1, 1048579, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_worksheet_set_cell_with_formula() {
-    let mut model = new_empty_model();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_formula(0, 1, 1, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_formula(1, 1048579, 1, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_worksheet_set_cell_with_number() {
-    let mut model = new_empty_model();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_number(0, 1, 1.0, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_number(1, 1048579, 1.0, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_worksheet_set_cell_with_string() {
-    let mut model = new_empty_model();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_string(0, 1, 1, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_string(1, 1048579, 1, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_worksheet_set_cell_with_boolean() {
-    let mut model = new_empty_model();
-
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_boolean(0, 1, true, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_boolean(1, 1048579, true, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_worksheet_set_cell_with_error() {
-    let mut model = new_empty_model();
-
-    // Now testing all the possible error scenarios
-
-    // Case1: Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_error(0, 1, token::Error::ERROR, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .set_cell_with_error(1, 1048579, token::Error::ERROR, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-}
-
-#[test]
-fn test_worksheet_cell_clear_contents() {
-    let mut model = new_empty_model();
-
-    model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .update_cell(1, 1, Cell::new_number(10.0, 1))
-        .unwrap();
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .cell_clear_contents(0, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .cell_clear_contents(1, 1048579);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case3 : Valid case
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .cell_clear_contents(1, 1);
-    assert_eq!(update_result, Ok(()))
-}
-
-#[test]
-fn test_worksheet_cell_clear_contents_with_style() {
-    let mut model = new_empty_model();
-
-    model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .update_cell(1, 1, Cell::new_number(10.0, 1))
-        .unwrap();
-    // Now testing all the possible error scenarios
-
-    // Case1 : Invalid Row
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .cell_clear_contents_with_style(0, 1, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case2 : Invalid Column
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .cell_clear_contents_with_style(1, 1048579, 1);
-    assert_eq!(update_result, Err("Incorrect row or column".to_string()));
-
-    // Case3 : Valid case
-    let update_result = model
-        .workbook
-        .worksheet_mut(0)
-        .unwrap()
-        .cell_clear_contents_with_style(1, 1, 1);
-    assert_eq!(update_result, Ok(()))
-}
-
-#[test]
-fn workbook_styles_get_style_error_handling() {
-    let model = new_empty_model();
-
-    // case 1 : Invalid index
-    assert_eq!(
-        model.workbook.styles.get_style(15),
-        Err("Invalid index provided".to_string())
-    );
-}
-
-#[test]
-fn workbook_styles_get_style_without_quote_prefix_error_handling() {
-    let mut model = new_empty_model();
-
-    // case 1 : Invalid index
-    assert_eq!(
-        model.workbook.styles.get_style_without_quote_prefix(15),
-        Err("Invalid index provided".to_string())
-    );
-}
-
-#[test]
-fn workbook_styles_get_style_with_format_error_handling() {
-    let mut model = new_empty_model();
-
-    // case 1 : Invalid index
-    assert_eq!(
-        model
-            .workbook
-            .styles
-            .get_style_with_format(15, "dummy_num_format"),
-        Err("Invalid index provided".to_string())
-    );
-}
-
-#[test]
-fn workbook_styles_get_style_with_quote_prefix_handling() {
-    let mut model = new_empty_model();
-
-    // case 1 : Invalid index
-    assert_eq!(
-        model.workbook.styles.get_style_with_quote_prefix(15),
-        Err("Invalid index provided".to_string())
-    );
-}

base/src/test/test_set_user_input.rs

@@ -5,28 +5,16 @@ use crate::{cell::CellValue, test::util::new_empty_model};
 #[test]
 fn test_currencies() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "$100.348".to_string());
-        .set_user_input(0, 1, 1, "$100.348".to_string())
+    model.set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string());
-        .unwrap();
-    model
-        .set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string())
-        .unwrap();
 
-    model
+    model.set_user_input(0, 2, 1, "$ 100.348".to_string());
-        .set_user_input(0, 2, 1, "$ 100.348".to_string())
+    model.set_user_input(0, 2, 2, "=ISNUMBER(A2)".to_string());
-        .unwrap();
-    model
-        .set_user_input(0, 2, 2, "=ISNUMBER(A2)".to_string())
-        .unwrap();
 
-    model.set_user_input(0, 3, 1, "100$".to_string()).unwrap();
+    model.set_user_input(0, 3, 1, "100$".to_string());
-    model
+    model.set_user_input(0, 3, 2, "=ISNUMBER(A3)".to_string());
-        .set_user_input(0, 3, 2, "=ISNUMBER(A3)".to_string())
-        .unwrap();
 
-    model
+    model.set_user_input(0, 4, 1, "3.1415926$".to_string());
-        .set_user_input(0, 4, 1, "3.1415926$".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -55,9 +43,9 @@ fn test_currencies() {
 #[test]
 fn scientific() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "3e-4".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "3e-4".to_string());
-    model.set_user_input(0, 2, 1, "5e-4$".to_string()).unwrap();
+    model.set_user_input(0, 2, 1, "5e-4$".to_string());
-    model.set_user_input(0, 3, 1, "6e-4%".to_string()).unwrap();
+    model.set_user_input(0, 3, 1, "6e-4%".to_string());
 
     model.evaluate();
 
@@ -73,13 +61,9 @@ fn scientific() {
 #[test]
 fn test_percentage() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 10, 1, "50%".to_string()).unwrap();
+    model.set_user_input(0, 10, 1, "50%".to_string());
-    model
+    model.set_user_input(0, 10, 2, "=ISNUMBER(A10)".to_string());
-        .set_user_input(0, 10, 2, "=ISNUMBER(A10)".to_string())
+    model.set_user_input(0, 11, 1, "55.759%".to_string());
-        .unwrap();
-    model
-        .set_user_input(0, 11, 1, "55.759%".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -97,8 +81,8 @@ fn test_percentage_ops() {
     let mut model = new_empty_model();
     model._set("A1", "5%");
     model._set("A2", "20%");
-    model.set_user_input(0, 3, 1, "=A1+A2".to_string()).unwrap();
+    model.set_user_input(0, 3, 1, "=A1+A2".to_string());
-    model.set_user_input(0, 4, 1, "=A1*A2".to_string()).unwrap();
+    model.set_user_input(0, 4, 1, "=A1*A2".to_string());
 
     model.evaluate();
 
@@ -109,19 +93,11 @@ fn test_percentage_ops() {
 #[test]
 fn test_numbers() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "1,000,000".to_string());
-        .set_user_input(0, 1, 1, "1,000,000".to_string())
-        .unwrap();
 
-    model
+    model.set_user_input(0, 20, 1, "50,123.549".to_string());
-        .set_user_input(0, 20, 1, "50,123.549".to_string())
+    model.set_user_input(0, 21, 1, "50,12.549".to_string());
-        .unwrap();
+    model.set_user_input(0, 22, 1, "1,234567".to_string());
-    model
-        .set_user_input(0, 21, 1, "50,12.549".to_string())
-        .unwrap();
-    model
-        .set_user_input(0, 22, 1, "1,234567".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -155,7 +131,7 @@ fn test_numbers() {
 #[test]
 fn test_negative_numbers() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "-100".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "-100".to_string());
 
     model.evaluate();
 
@@ -168,19 +144,15 @@ fn test_negative_numbers() {
 #[test]
 fn test_negative_currencies() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "-$100".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "-$100".to_string());
-    model
+    model.set_user_input(0, 2, 1, "-$99.123".to_string());
-        .set_user_input(0, 2, 1, "-$99.123".to_string())
-        .unwrap();
     // This is valid!
-    model.set_user_input(0, 3, 1, "$-345".to_string()).unwrap();
+    model.set_user_input(0, 3, 1, "$-345".to_string());
 
-    model.set_user_input(0, 1, 2, "-200$".to_string()).unwrap();
+    model.set_user_input(0, 1, 2, "-200$".to_string());
-    model
+    model.set_user_input(0, 2, 2, "-92.689$".to_string());
-        .set_user_input(0, 2, 2, "-92.689$".to_string())
-        .unwrap();
     // This is valid!
-    model.set_user_input(0, 3, 2, "-22$".to_string()).unwrap();
+    model.set_user_input(0, 3, 2, "-22$".to_string());
 
     model.evaluate();
 
@@ -202,10 +174,8 @@ fn test_formulas() {
     let mut model = new_empty_model();
     model._set("A1", "$100");
     model._set("A2", "$200");
-    model.set_user_input(0, 3, 1, "=A1+A2".to_string()).unwrap();
+    model.set_user_input(0, 3, 1, "=A1+A2".to_string());
-    model
+    model.set_user_input(0, 4, 1, "=SUM(A1:A3)".to_string());
-        .set_user_input(0, 4, 1, "=SUM(A1:A3)".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -228,9 +198,9 @@ fn test_product() {
     model._set("A2", "$5");
     model._set("A3", "4");
 
-    model.set_user_input(0, 1, 2, "=A1*A2".to_string()).unwrap();
+    model.set_user_input(0, 1, 2, "=A1*A2".to_string());
-    model.set_user_input(0, 2, 2, "=A1*A3".to_string()).unwrap();
+    model.set_user_input(0, 2, 2, "=A1*A3".to_string());
-    model.set_user_input(0, 3, 2, "=A1*3".to_string()).unwrap();
+    model.set_user_input(0, 3, 2, "=A1*3".to_string());
 
     model.evaluate();
 
@@ -246,12 +216,10 @@ fn test_division() {
     model._set("A2", "$5");
     model._set("A3", "4");
 
-    model.set_user_input(0, 1, 2, "=A1/A2".to_string()).unwrap();
+    model.set_user_input(0, 1, 2, "=A1/A2".to_string());
-    model.set_user_input(0, 2, 2, "=A1/A3".to_string()).unwrap();
+    model.set_user_input(0, 2, 2, "=A1/A3".to_string());
-    model.set_user_input(0, 3, 2, "=A1/2".to_string()).unwrap();
+    model.set_user_input(0, 3, 2, "=A1/2".to_string());
-    model
+    model.set_user_input(0, 4, 2, "=100/A2".to_string());
-        .set_user_input(0, 4, 2, "=100/A2".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -267,54 +235,54 @@ fn test_some_complex_examples() {
     // $3.00 / 2 = $1.50
     model._set("A1", "$3.00");
     model._set("A2", "2");
-    model.set_user_input(0, 3, 1, "=A1/A2".to_string()).unwrap();
+    model.set_user_input(0, 3, 1, "=A1/A2".to_string());
 
     // $3 / 2 = $1
     model._set("B1", "$3");
     model._set("B2", "2");
-    model.set_user_input(0, 3, 2, "=B1/B2".to_string()).unwrap();
+    model.set_user_input(0, 3, 2, "=B1/B2".to_string());
 
     // $5.00 * 25% = 25% * $5.00 = $1.25
     model._set("C1", "$5.00");
     model._set("C2", "25%");
-    model.set_user_input(0, 3, 3, "=C1*C2".to_string()).unwrap();
+    model.set_user_input(0, 3, 3, "=C1*C2".to_string());
-    model.set_user_input(0, 4, 3, "=C2*C1".to_string()).unwrap();
+    model.set_user_input(0, 4, 3, "=C2*C1".to_string());
 
     // $5 * 75% = 75% * $5 = $1
     model._set("D1", "$5");
     model._set("D2", "75%");
-    model.set_user_input(0, 3, 4, "=D1*D2".to_string()).unwrap();
+    model.set_user_input(0, 3, 4, "=D1*D2".to_string());
-    model.set_user_input(0, 4, 4, "=D2*D1".to_string()).unwrap();
+    model.set_user_input(0, 4, 4, "=D2*D1".to_string());
 
     // $10 + $9.99 = $9.99 + $10 = $19.99
     model._set("E1", "$10");
     model._set("E2", "$9.99");
-    model.set_user_input(0, 3, 5, "=E1+E2".to_string()).unwrap();
+    model.set_user_input(0, 3, 5, "=E1+E2".to_string());
-    model.set_user_input(0, 4, 5, "=E2+E1".to_string()).unwrap();
+    model.set_user_input(0, 4, 5, "=E2+E1".to_string());
 
     // $2 * 2 = 2 * $2 = $4
     model._set("F1", "$2");
     model._set("F2", "2");
-    model.set_user_input(0, 3, 6, "=F1*F2".to_string()).unwrap();
+    model.set_user_input(0, 3, 6, "=F1*F2".to_string());
-    model.set_user_input(0, 4, 6, "=F2*F1".to_string()).unwrap();
+    model.set_user_input(0, 4, 6, "=F2*F1".to_string());
 
     // $2.50 * 2 = 2 * $2.50 = $5.00
     model._set("G1", "$2.50");
     model._set("G2", "2");
-    model.set_user_input(0, 3, 7, "=G1*G2".to_string()).unwrap();
+    model.set_user_input(0, 3, 7, "=G1*G2".to_string());
-    model.set_user_input(0, 4, 7, "=G2*G1".to_string()).unwrap();
+    model.set_user_input(0, 4, 7, "=G2*G1".to_string());
 
     // $2 * 2.5 = 2.5 * $2 = $5
     model._set("H1", "$2");
     model._set("H2", "2.5");
-    model.set_user_input(0, 3, 8, "=H1*H2".to_string()).unwrap();
+    model.set_user_input(0, 3, 8, "=H1*H2".to_string());
-    model.set_user_input(0, 4, 8, "=H2*H1".to_string()).unwrap();
+    model.set_user_input(0, 4, 8, "=H2*H1".to_string());
 
     // 10% * 1,000 = 1,000 * 10% = 100
     model._set("I1", "10%");
     model._set("I2", "1,000");
-    model.set_user_input(0, 3, 9, "=I1*I2".to_string()).unwrap();
+    model.set_user_input(0, 3, 9, "=I1*I2".to_string());
-    model.set_user_input(0, 4, 9, "=I2*I1".to_string()).unwrap();
+    model.set_user_input(0, 4, 9, "=I2*I1".to_string());
 
     model.evaluate();
 
@@ -352,15 +320,9 @@ fn test_financial_functions() {
     model._set("A3", "10");
     model._set("A4", "$10,000");
 
-    model
+    model.set_user_input(0, 5, 1, "=PMT(A2/12,A3,A4)".to_string());
-        .set_user_input(0, 5, 1, "=PMT(A2/12,A3,A4)".to_string())
+    model.set_user_input(0, 6, 1, "=PMT(A2/12,A3,A4,,1)".to_string());
-        .unwrap();
+    model.set_user_input(0, 7, 1, "=PMT(0.2, 3, -200)".to_string());
-    model
-        .set_user_input(0, 6, 1, "=PMT(A2/12,A3,A4,,1)".to_string())
-        .unwrap();
-    model
-        .set_user_input(0, 7, 1, "=PMT(0.2, 3, -200)".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -377,15 +339,9 @@ fn test_sum_function() {
     model._set("A1", "$100");
     model._set("A2", "$300");
 
-    model
+    model.set_user_input(0, 1, 2, "=SUM(A:A)".to_string());
-        .set_user_input(0, 1, 2, "=SUM(A:A)".to_string())
+    model.set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string());
-        .unwrap();
+    model.set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string());
-    model
-        .set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string())
-        .unwrap();
-    model
-        .set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -397,7 +353,7 @@ fn test_sum_function() {
 #[test]
 fn test_number() {
     let mut model = new_empty_model();
-    model.set_user_input(0, 1, 1, "3".to_string()).unwrap();
+    model.set_user_input(0, 1, 1, "3".to_string());
 
     model.evaluate();
 
@@ -411,9 +367,7 @@ fn test_number() {
 #[test]
 fn test_currencies_eur_prefix() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "€100.348".to_string());
-        .set_user_input(0, 1, 1, "€100.348".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -427,27 +381,19 @@ fn test_currencies_eur_prefix() {
 #[test]
 fn test_currencies_eur_suffix() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "100.348€".to_string());
-        .set_user_input(0, 1, 1, "100.348€".to_string())
+    model.set_user_input(0, 2, 1, "25€".to_string());
-        .unwrap();
-    model.set_user_input(0, 2, 1, "25€".to_string()).unwrap();
 
     // negatives
-    model
+    model.set_user_input(0, 1, 2, "-123.348€".to_string());
-        .set_user_input(0, 1, 2, "-123.348€".to_string())
+    model.set_user_input(0, 2, 2, "-42€".to_string());
-        .unwrap();
-    model.set_user_input(0, 2, 2, "-42€".to_string()).unwrap();
 
     // with a space
-    model
+    model.set_user_input(0, 1, 3, "101.348 €".to_string());
-        .set_user_input(0, 1, 3, "101.348 €".to_string())
+    model.set_user_input(0, 2, 3, "26 €".to_string());
-        .unwrap();
-    model.set_user_input(0, 2, 3, "26 €".to_string()).unwrap();
 
-    model
+    model.set_user_input(0, 1, 4, "-12.348 €".to_string());
-        .set_user_input(0, 1, 4, "-12.348 €".to_string())
+    model.set_user_input(0, 2, 4, "-45 €".to_string());
-        .unwrap();
-    model.set_user_input(0, 2, 4, "-45 €".to_string()).unwrap();
 
     model.evaluate();
 
@@ -503,15 +449,9 @@ fn test_sum_function_eur() {
     model._set("A1", "€100");
     model._set("A2", "€300");
 
-    model
+    model.set_user_input(0, 1, 2, "=SUM(A:A)".to_string());
-        .set_user_input(0, 1, 2, "=SUM(A:A)".to_string())
+    model.set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string());
-        .unwrap();
+    model.set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string());
-    model
-        .set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string())
-        .unwrap();
-    model
-        .set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -523,9 +463,7 @@ fn test_sum_function_eur() {
 #[test]
 fn input_dates() {
     let mut model = new_empty_model();
-    model
+    model.set_user_input(0, 1, 1, "3/4/2025".to_string());
-        .set_user_input(0, 1, 1, "3/4/2025".to_string())
-        .unwrap();
 
     model.evaluate();
 
@@ -536,9 +474,7 @@ fn input_dates() {
     );
 
     // further date assignments do not change the format
-    model
+    model.set_user_input(0, 1, 1, "08-08-2028".to_string());
-        .set_user_input(0, 1, 1, "08-08-2028".to_string())
-        .unwrap();
     model.evaluate();
     assert_eq!(model._get_text("A1"), "8/8/2028");
 }

base/src/test/test_sheet_markup.rs

@@ -14,7 +14,7 @@ fn test_sheet_markup() {
     model._set("A4", "Total");
     model._set("B4", "=SUM(B2:B3)");
 
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     style.font.b = true;
     model.set_cell_style(0, 1, 1, &style).unwrap();
     model.set_cell_style(0, 1, 2, &style).unwrap();

base/src/test/test_sheets.rs

@@ -138,14 +138,14 @@ fn test_insert_sheet() {
 
     // Insert the sheet at the end and check the formula
     assert!(model.insert_sheet("Bacchus", 1, None).is_ok());
-    model.set_user_input(1, 3, 1, "42".to_string()).unwrap();
+    model.set_user_input(1, 3, 1, "42".to_string());
     model.evaluate();
     assert_eq!(model._get_text("A1"), "42");
     assert_eq!(model._get_text("A2"), "#REF!");
 
     // Insert a sheet in between the other two
     assert!(model.insert_sheet("Dionysus", 1, None).is_ok());
-    model.set_user_input(1, 3, 1, "111".to_string()).unwrap();
+    model.set_user_input(1, 3, 1, "111".to_string());
     model.evaluate();
     assert_eq!(model._get_text("A1"), "42");
     assert_eq!(model._get_text("A2"), "111");
@@ -176,7 +176,7 @@ fn test_rename_sheet() {
     let mut model = new_empty_model();
     model.new_sheet();
     model._set("A1", "=NewSheet!A3");
-    model.set_user_input(1, 3, 1, "25".to_string()).unwrap();
+    model.set_user_input(1, 3, 1, "25".to_string());
     model.evaluate();
     assert_eq!(model._get_text("A1"), "#REF!");
     assert!(model.rename_sheet("Sheet2", "NewSheet").is_ok());
@@ -189,7 +189,7 @@ fn test_rename_sheet_by_index() {
     let mut model = new_empty_model();
     model.new_sheet();
     model._set("A1", "=NewSheet!A1");
-    model.set_user_input(1, 1, 1, "25".to_string()).unwrap();
+    model.set_user_input(1, 1, 1, "25".to_string());
     model.evaluate();
     assert_eq!(model._get_text("A1"), "#REF!");
     assert!(model.rename_sheet_by_index(1, "NewSheet").is_ok());

base/src/test/test_shift_cells.rs

@@ -0,0 +1,110 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn shift_cells_right() {
+    let mut model = new_empty_model();
+    let (sheet, row, column) = (0, 5, 3); // C5
+    model.set_user_input(sheet, row, column, "Hi".to_string());
+    model.set_user_input(sheet, row, column + 1, "world".to_string());
+    model.set_user_input(sheet, row, column + 2, "!".to_string());
+
+    model
+        .insert_cells_and_shift_right(sheet, row, column, 1, 1)
+        .unwrap();
+    model.evaluate();
+
+    assert_eq!(model.get_cell_content(0, 5, 3), Ok("".to_string()));
+    assert_eq!(model.get_cell_content(0, 5, 4), Ok("Hi".to_string()));
+}
+
+#[test]
+fn shift_cells_right_with_formulas() {
+    let mut model = new_empty_model();
+    let (sheet, row, column) = (0, 5, 3); // C5
+    model.set_user_input(sheet, row, column - 1, "23".to_string());
+    model.set_user_input(sheet, row, column, "42".to_string());
+    model.set_user_input(sheet, row, column + 1, "=C5*2".to_string());
+    model.set_user_input(sheet, row, column + 2, "=A5+2".to_string());
+    model.set_user_input(sheet, 20, 3, "=C5*A2".to_string());
+    model.evaluate();
+
+    model
+        .insert_cells_and_shift_right(sheet, row, column, 1, 1)
+        .unwrap();
+
+    model.evaluate();
+    assert_eq!(
+        model.get_cell_content(0, row, column - 1),
+        Ok("23".to_string())
+    );
+    assert_eq!(model.get_cell_content(0, row, column), Ok("".to_string()));
+    assert_eq!(
+        model.get_cell_content(0, row, column + 1),
+        Ok("42".to_string())
+    );
+    assert_eq!(
+        model.get_cell_content(0, row, column + 2),
+        Ok("=D5*2".to_string())
+    );
+    assert_eq!(
+        model.get_cell_content(0, row, column + 3),
+        Ok("=A5+2".to_string())
+    );
+    assert_eq!(model.get_cell_content(0, 20, 3), Ok("=D5*A2".to_string()));
+}
+
+#[test]
+fn shift_cells_left() {
+    let mut model = new_empty_model();
+    let (sheet, row, column) = (0, 5, 10); // J5
+    model.set_user_input(sheet, row, column - 1, "23".to_string());
+    model.set_user_input(sheet, row, column, "42".to_string());
+    model.set_user_input(sheet, row, column + 1, "Hi".to_string());
+    model.set_user_input(sheet, row, column + 2, "honey!".to_string());
+    model.evaluate();
+
+    model
+        .delete_cells_and_shift_left(sheet, row, column, 1, 1)
+        .unwrap();
+
+    model.evaluate();
+    assert_eq!(
+        model.get_cell_content(0, row, column - 1),
+        Ok("23".to_string())
+    );
+
+    assert_eq!(model.get_cell_content(0, row, column), Ok("Hi".to_string()));
+    assert_eq!(
+        model.get_cell_content(0, row, column + 1),
+        Ok("honey!".to_string())
+    );
+}
+
+#[test]
+fn shift_cells_left_with_formulas() {
+    let mut model = new_empty_model();
+    let (sheet, row, column) = (0, 5, 10); // J5
+    model.set_user_input(sheet, row, column - 1, "23".to_string());
+    model.set_user_input(sheet, row, column, "42".to_string());
+    model.set_user_input(sheet, row, column + 1, "33".to_string());
+    model.set_user_input(sheet, row, column + 2, "=K5*A5".to_string());
+
+    model.set_user_input(sheet, row, column + 20, "=K5*A5".to_string());
+    model.evaluate();
+
+    model
+        .delete_cells_and_shift_left(sheet, row, column, 1, 1)
+        .unwrap();
+
+    model.evaluate();
+    assert_eq!(
+        model.get_cell_content(0, row, column + 1),
+        Ok("=J5*A5".to_string())
+    );
+    assert_eq!(
+        model.get_cell_content(0, row, column + 19),
+        Ok("=J5*A5".to_string())
+    );
+}

base/src/test/test_styles.rs

@@ -7,10 +7,10 @@ use crate::types::Style;
 fn test_model_set_cells_with_values_styles() {
     let mut model = new_empty_model();
     // Inputs
-    model.set_user_input(0, 1, 1, "21".to_string()).unwrap(); // A1
+    model.set_user_input(0, 1, 1, "21".to_string()); // A1
-    model.set_user_input(0, 2, 1, "42".to_string()).unwrap(); // A2
+    model.set_user_input(0, 2, 1, "42".to_string()); // A2
 
-    let style_base = model.get_style_for_cell(0, 1, 1).unwrap();
+    let style_base = model.get_style_for_cell(0, 1, 1);
     let mut style = style_base.clone();
     style.font.b = true;
     style.num_fmt = "#,##0.00".to_string();
@@ -19,7 +19,7 @@ fn test_model_set_cells_with_values_styles() {
     let mut style = style_base;
     style.num_fmt = "#,##0.00".to_string();
     assert!(model.set_cell_style(0, 2, 1, &style).is_ok());
-    let style: Style = model.get_style_for_cell(0, 2, 1).unwrap();
+    let style: Style = model.get_style_for_cell(0, 2, 1);
     assert_eq!(style.num_fmt, "#,##0.00".to_string());
 }
 
@@ -27,21 +27,21 @@ fn test_model_set_cells_with_values_styles() {
 fn test_named_styles() {
     let mut model = new_empty_model();
     model._set("A1", "42");
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     style.font.b = true;
     assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
-    let bold_style_index = model.get_cell_style_index(0, 1, 1).unwrap();
+    let bold_style_index = model.get_cell_style_index(0, 1, 1);
     let e = model
         .workbook
         .styles
         .add_named_cell_style("bold", bold_style_index);
     assert!(e.is_ok());
     model._set("A2", "420");
-    let a2_style_index = model.get_cell_style_index(0, 2, 1).unwrap();
+    let a2_style_index = model.get_cell_style_index(0, 2, 1);
     assert!(a2_style_index != bold_style_index);
     let e = model.set_cell_style_by_name(0, 2, 1, "bold");
     assert!(e.is_ok());
-    assert_eq!(model.get_cell_style_index(0, 2, 1), Ok(bold_style_index));
+    assert_eq!(model.get_cell_style_index(0, 2, 1), bold_style_index);
 }
 
 #[test]
@@ -49,7 +49,7 @@ fn test_create_named_style() {
     let mut model = new_empty_model();
     model._set("A1", "42");
 
-    let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let mut style = model.get_style_for_cell(0, 1, 1);
     assert!(!style.font.b);
 
     style.font.b = true;
@@ -59,6 +59,6 @@ fn test_create_named_style() {
     let e = model.set_cell_style_by_name(0, 1, 1, "bold");
     assert!(e.is_ok());
 
-    let style = model.get_style_for_cell(0, 1, 1).unwrap();
+    let style = model.get_style_for_cell(0, 1, 1);
     assert!(style.font.b);
 }

base/src/test/test_worksheet.rs

@@ -10,7 +10,7 @@ use crate::{
 fn test_worksheet_dimension_empty_sheet() {
     let model = new_empty_model();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 1,
             min_column: 1,
@@ -25,7 +25,7 @@ fn test_worksheet_dimension_single_cell() {
     let mut model = new_empty_model();
     model._set("W11", "1");
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 11,
             min_column: 23,
@@ -41,7 +41,7 @@ fn test_worksheet_dimension_single_cell_set_empty() {
     model._set("W11", "1");
     model.cell_clear_contents(0, 11, 23).unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 11,
             min_column: 23,
@@ -57,7 +57,7 @@ fn test_worksheet_dimension_single_cell_deleted() {
     model._set("W11", "1");
     model.cell_clear_all(0, 11, 23).unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 1,
             min_column: 1,
@@ -77,7 +77,7 @@ fn test_worksheet_dimension_multiple_cells() {
     model._set("B19", "1");
     model.cell_clear_all(0, 11, 23).unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 11,
             min_column: 2,
@@ -91,7 +91,7 @@ fn test_worksheet_dimension_multiple_cells() {
 fn test_worksheet_dimension_progressive() {
     let mut model = new_empty_model();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 1,
             min_column: 1,
@@ -100,11 +100,9 @@ fn test_worksheet_dimension_progressive() {
         }
     );
 
-    model
+    model.set_user_input(0, 30, 50, "Hello World".to_string());
-        .set_user_input(0, 30, 50, "Hello World".to_string())
-        .unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 30,
             min_column: 50,
@@ -113,11 +111,9 @@ fn test_worksheet_dimension_progressive() {
         }
     );
 
-    model
+    model.set_user_input(0, 10, 15, "Hello World".to_string());
-        .set_user_input(0, 10, 15, "Hello World".to_string())
-        .unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 10,
             min_column: 15,
@@ -126,11 +122,9 @@ fn test_worksheet_dimension_progressive() {
         }
     );
 
-    model
+    model.set_user_input(0, 5, 25, "Hello World".to_string());
-        .set_user_input(0, 5, 25, "Hello World".to_string())
-        .unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 5,
             min_column: 15,
@@ -139,11 +133,9 @@ fn test_worksheet_dimension_progressive() {
         }
     );
 
-    model
+    model.set_user_input(0, 10, 250, "Hello World".to_string());
-        .set_user_input(0, 10, 250, "Hello World".to_string())
-        .unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().dimension(),
+        model.workbook.worksheet(0).unwrap().get_dimension(),
         WorksheetDimension {
             min_row: 5,
             min_column: 15,
@@ -170,14 +162,12 @@ fn test_worksheet_navigate_to_edge_in_direction() {
     for (row_index, row) in inline_spreadsheet.into_iter().enumerate() {
         for (column_index, value) in row.into_iter().enumerate() {
             if value != 0 {
-                model
+                model.update_cell_with_number(
-                    .update_cell_with_number(
                     0,
                     (row_index as i32) + 1,
                     (column_index as i32) + 1,
                     value.into(),
-                    )
+                );
-                    .unwrap();
             }
         }
     }

base/src/test/user_model/mod.rs

@@ -1,20 +1,11 @@
 mod test_add_delete_sheets;
-mod test_autofill_columns;
-mod test_autofill_rows;
-mod test_border;
 mod test_clear_cells;
 mod test_diff_queue;
 mod test_evaluation;
 mod test_general;
-mod test_grid_lines;
-mod test_keyboard_navigation;
-mod test_on_area_selection;
-mod test_on_expand_selected_range;
-mod test_on_paste_styles;
 mod test_rename_sheet;
 mod test_row_column;
+mod test_shift_cells;
 mod test_styles;
 mod test_to_from_bytes;
 mod test_undo_redo;
-mod test_view;
-mod test_window_size;

base/src/test/user_model/test_add_delete_sheets.rs

@@ -82,15 +82,3 @@ fn delete_sheet_propagates() {
     let sheets_info = model2.get_worksheets_properties();
     assert_eq!(sheets_info.len(), 1);
 }
-
-#[test]
-fn delete_last_sheet() {
-    // Deleting the last sheet, selects the previous
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.new_sheet();
-    model.new_sheet();
-    model.set_selected_sheet(2).unwrap();
-    model.delete_sheet(2).unwrap();
-
-    assert_eq!(model.get_selected_sheet(), 1);
-}

base/src/test/user_model/test_autofill_columns.rs

@@ -1,404 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::types::Area;
-use crate::test::util::new_empty_model;
-use crate::UserModel;
-
-#[test]
-fn basic_tests() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // This is cell A3
-    model.set_user_input(0, 3, 1, "alpha").unwrap();
-    // We autofill from A3 to C3
-    model
-        .auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 3,
-                column: 1,
-                width: 1,
-                height: 1,
-            },
-            5,
-        )
-        .unwrap();
-    // B3
-    assert_eq!(
-        model.get_formatted_cell_value(0, 3, 2),
-        Ok("alpha".to_string())
-    );
-    // C3
-    assert_eq!(
-        model.get_formatted_cell_value(0, 3, 3),
-        Ok("alpha".to_string())
-    );
-}
-
-#[test]
-fn one_cell_right() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 1, 1, "23").unwrap();
-    model
-        .auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 1,
-                height: 1,
-            },
-            2,
-        )
-        .unwrap();
-    // B1
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("23".to_string())
-    );
-}
-
-#[test]
-fn alpha_beta_gamma() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A1:B3
-    model.set_user_input(0, 1, 1, "Alpher").unwrap(); // A1
-    model.set_user_input(0, 1, 2, "Bethe").unwrap(); // B1
-    model.set_user_input(0, 1, 3, "Gamow").unwrap(); // C1
-    model.set_user_input(0, 2, 1, "=A1").unwrap(); // A2
-    model.set_user_input(0, 2, 2, "=B1").unwrap(); // B2
-    model.set_user_input(0, 2, 3, "=C1").unwrap(); // C2
-
-    // We autofill from A1:C2 to I2
-    model
-        .auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 3,
-                height: 2,
-            },
-            9,
-        )
-        .unwrap();
-
-    // D1
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 4),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 5),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 6),
-        Ok("Gamow".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 7),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 8),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 9),
-        Ok("Gamow".to_string())
-    );
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 4),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 5),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 6),
-        Ok("Gamow".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 7),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 8),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 9),
-        Ok("Gamow".to_string())
-    );
-
-    assert_eq!(model.get_cell_content(0, 2, 4), Ok("=D1".to_string()));
-}
-
-#[test]
-fn styles() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A1:C1
-    model.set_user_input(0, 1, 1, "Alpher").unwrap();
-    model.set_user_input(0, 2, 1, "Bethe").unwrap();
-    model.set_user_input(0, 3, 1, "Gamow").unwrap();
-
-    let b1 = Area {
-        sheet: 0,
-        row: 1,
-        column: 2,
-        width: 1,
-        height: 1,
-    };
-
-    let c1 = Area {
-        sheet: 0,
-        row: 1,
-        column: 3,
-        width: 1,
-        height: 1,
-    };
-
-    model.update_range_style(&b1, "font.i", "true").unwrap();
-    model
-        .update_range_style(&c1, "fill.bg_color", "#334455")
-        .unwrap();
-
-    model
-        .auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 3,
-                height: 1,
-            },
-            9,
-        )
-        .unwrap();
-
-    // Check that cell E1 has B1 style
-    let style = model.get_cell_style(0, 1, 5).unwrap();
-    assert!(style.font.i);
-    // A6 would have the style of A3
-    let style = model.get_cell_style(0, 1, 6).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#334455".to_string()));
-
-    model.undo().unwrap();
-
-    assert_eq!(model.get_cell_content(0, 1, 4), Ok("".to_string()));
-    // Check that cell A5 has A2 style
-    let style = model.get_cell_style(0, 1, 5).unwrap();
-    assert!(!style.font.i);
-    // A6 would have the style of A3
-    let style = model.get_cell_style(0, 1, 6).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    model.redo().unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 4),
-        Ok("Alpher".to_string())
-    );
-    // Check that cell A5 has A2 style
-    let style = model.get_cell_style(0, 1, 5).unwrap();
-    assert!(style.font.i);
-    // A6 would have the style of A3
-    let style = model.get_cell_style(0, 1, 6).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#334455".to_string()));
-}
-
-#[test]
-fn left() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A10:A12
-    model.set_user_input(0, 1, 10, "Alpher").unwrap();
-    model.set_user_input(0, 1, 11, "Bethe").unwrap();
-    model.set_user_input(0, 1, 12, "Gamow").unwrap();
-
-    // We fill upwards to row 5
-    model
-        .auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 10,
-                width: 3,
-                height: 1,
-            },
-            5,
-        )
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 9),
-        Ok("Gamow".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 8),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 7),
-        Ok("Alpher".to_string())
-    );
-}
-
-#[test]
-fn left_4() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A10:A13
-    model.set_user_input(0, 1, 10, "Margaret Burbidge").unwrap();
-    model.set_user_input(0, 1, 11, "Geoffrey Burbidge").unwrap();
-    model.set_user_input(0, 1, 12, "Willy Fowler").unwrap();
-    model.set_user_input(0, 1, 13, "Fred Hoyle").unwrap();
-
-    // We fill left to row 5
-    model
-        .auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 10,
-                width: 4,
-                height: 1,
-            },
-            5,
-        )
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 9),
-        Ok("Fred Hoyle".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 8),
-        Ok("Willy Fowler".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 5),
-        Ok("Fred Hoyle".to_string())
-    );
-}
-
-#[test]
-fn errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-
-    model.set_user_input(0, 1, 4, "Margaret Burbidge").unwrap();
-
-    // Invalid sheet
-    assert_eq!(
-        model.auto_fill_columns(
-            &Area {
-                sheet: 3,
-                row: 1,
-                column: 4,
-                width: 1,
-                height: 1,
-            },
-            10,
-        ),
-        Err("Invalid worksheet index: '3'".to_string())
-    );
-
-    // invalid column
-    assert_eq!(
-        model.auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: -1,
-                width: 1,
-                height: 1,
-            },
-            10,
-        ),
-        Err("Invalid column: '-1'".to_string())
-    );
-
-    // invalid column
-    assert_eq!(
-        model.auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: LAST_COLUMN - 1,
-                width: 10,
-                height: 1,
-            },
-            10,
-        ),
-        Err("Invalid column: '16392'".to_string())
-    );
-
-    assert_eq!(
-        model.auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: LAST_ROW + 1,
-                column: 1,
-                width: 10,
-                height: 1,
-            },
-            10,
-        ),
-        Err("Invalid row: '1048577'".to_string())
-    );
-
-    assert_eq!(
-        model.auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: LAST_ROW - 2,
-                column: 1,
-                width: 1,
-                height: 10,
-            },
-            10,
-        ),
-        Err("Invalid row: '1048583'".to_string())
-    );
-
-    assert_eq!(
-        model.auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 5,
-                width: 10,
-                height: 1,
-            },
-            -10,
-        ),
-        Err("Invalid row: '-10'".to_string())
-    );
-}
-
-#[test]
-fn invalid_parameters() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 1, 1, "23").unwrap();
-    assert_eq!(
-        model.auto_fill_columns(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 2,
-                height: 1,
-            },
-            2,
-        ),
-        Err("Invalid parameters for autofill".to_string())
-    );
-}

base/src/test/user_model/test_autofill_rows.rs

@@ -1,399 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::types::Area;
-use crate::test::util::new_empty_model;
-use crate::UserModel;
-
-#[test]
-fn basic_tests() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // This is cell A3
-    model.set_user_input(0, 3, 1, "alpha").unwrap();
-    // We autofill from A3 to A5
-    model
-        .auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 3,
-                column: 1,
-                width: 1,
-                height: 1,
-            },
-            5,
-        )
-        .unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 4, 1),
-        Ok("alpha".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 1),
-        Ok("alpha".to_string())
-    );
-}
-
-#[test]
-fn one_cell_down() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 1, 1, "23").unwrap();
-    model
-        .auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 1,
-                height: 1,
-            },
-            2,
-        )
-        .unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("23".to_string())
-    );
-}
-
-#[test]
-fn alpha_beta_gamma() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A1:B3
-    model.set_user_input(0, 1, 1, "Alpher").unwrap();
-    model.set_user_input(0, 2, 1, "Bethe").unwrap();
-    model.set_user_input(0, 3, 1, "Gamow").unwrap();
-    model.set_user_input(0, 1, 2, "=A1").unwrap();
-    model.set_user_input(0, 2, 2, "=A2").unwrap();
-    model.set_user_input(0, 3, 2, "=A3").unwrap();
-    // We autofill from A1:B3 to A9
-    model
-        .auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 2,
-                height: 3,
-            },
-            9,
-        )
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 4, 1),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 1),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 6, 1),
-        Ok("Gamow".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 7, 1),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 8, 1),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 9, 1),
-        Ok("Gamow".to_string())
-    );
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 4, 2),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 2),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 6, 2),
-        Ok("Gamow".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 7, 2),
-        Ok("Alpher".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 8, 2),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 9, 2),
-        Ok("Gamow".to_string())
-    );
-
-    assert_eq!(model.get_cell_content(0, 4, 2), Ok("=A4".to_string()));
-}
-
-#[test]
-fn styles() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A1:B3
-    model.set_user_input(0, 1, 1, "Alpher").unwrap();
-    model.set_user_input(0, 2, 1, "Bethe").unwrap();
-    model.set_user_input(0, 3, 1, "Gamow").unwrap();
-
-    let a2 = Area {
-        sheet: 0,
-        row: 2,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    let a3 = Area {
-        sheet: 0,
-        row: 3,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    model.update_range_style(&a2, "font.i", "true").unwrap();
-    model
-        .update_range_style(&a3, "fill.bg_color", "#334455")
-        .unwrap();
-
-    model
-        .auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 1,
-                height: 3,
-            },
-            9,
-        )
-        .unwrap();
-
-    // Check that cell A5 has A2 style
-    let style = model.get_cell_style(0, 5, 1).unwrap();
-    assert!(style.font.i);
-    // A6 would have the style of A3
-    let style = model.get_cell_style(0, 6, 1).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#334455".to_string()));
-
-    model.undo().unwrap();
-
-    assert_eq!(model.get_cell_content(0, 4, 1), Ok("".to_string()));
-    // Check that cell A5 has A2 style
-    let style = model.get_cell_style(0, 5, 1).unwrap();
-    assert!(!style.font.i);
-    // A6 would have the style of A3
-    let style = model.get_cell_style(0, 6, 1).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    model.redo().unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 4, 1),
-        Ok("Alpher".to_string())
-    );
-    // Check that cell A5 has A2 style
-    let style = model.get_cell_style(0, 5, 1).unwrap();
-    assert!(style.font.i);
-    // A6 would have the style of A3
-    let style = model.get_cell_style(0, 6, 1).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#334455".to_string()));
-}
-
-#[test]
-fn upwards() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A10:A12
-    model.set_user_input(0, 10, 1, "Alpher").unwrap();
-    model.set_user_input(0, 11, 1, "Bethe").unwrap();
-    model.set_user_input(0, 12, 1, "Gamow").unwrap();
-
-    // We fill upwards to row 5
-    model
-        .auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 10,
-                column: 1,
-                width: 1,
-                height: 3,
-            },
-            5,
-        )
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 9, 1),
-        Ok("Gamow".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 8, 1),
-        Ok("Bethe".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 7, 1),
-        Ok("Alpher".to_string())
-    );
-}
-
-#[test]
-fn upwards_4() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A10:A13
-    model.set_user_input(0, 10, 1, "Margaret Burbidge").unwrap();
-    model.set_user_input(0, 11, 1, "Geoffrey Burbidge").unwrap();
-    model.set_user_input(0, 12, 1, "Willy Fowler").unwrap();
-    model.set_user_input(0, 13, 1, "Fred Hoyle").unwrap();
-
-    // We fill upwards to row 5
-    model
-        .auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 10,
-                column: 1,
-                width: 1,
-                height: 4,
-            },
-            5,
-        )
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 9, 1),
-        Ok("Fred Hoyle".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 8, 1),
-        Ok("Willy Fowler".to_string())
-    );
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 1),
-        Ok("Fred Hoyle".to_string())
-    );
-}
-
-#[test]
-fn errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // cells A10:A13
-    model.set_user_input(0, 4, 1, "Margaret Burbidge").unwrap();
-
-    // Invalid sheet
-    assert_eq!(
-        model.auto_fill_rows(
-            &Area {
-                sheet: 3,
-                row: 4,
-                column: 1,
-                width: 1,
-                height: 1,
-            },
-            10,
-        ),
-        Err("Invalid worksheet index: '3'".to_string())
-    );
-
-    // invalid row
-    assert_eq!(
-        model.auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: -1,
-                column: 1,
-                width: 1,
-                height: 1,
-            },
-            10,
-        ),
-        Err("Invalid row: '-1'".to_string())
-    );
-
-    // invalid row
-    assert_eq!(
-        model.auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: LAST_ROW - 1,
-                column: 1,
-                width: 1,
-                height: 10,
-            },
-            10,
-        ),
-        Err("Invalid row: '1048584'".to_string())
-    );
-
-    assert_eq!(
-        model.auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: LAST_COLUMN + 1,
-                width: 1,
-                height: 10,
-            },
-            10,
-        ),
-        Err("Invalid column: '16385'".to_string())
-    );
-
-    assert_eq!(
-        model.auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: LAST_COLUMN - 2,
-                width: 10,
-                height: 1,
-            },
-            10,
-        ),
-        Err("Invalid column: '16391'".to_string())
-    );
-
-    assert_eq!(
-        model.auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 5,
-                column: 1,
-                width: 1,
-                height: 10,
-            },
-            -10,
-        ),
-        Err("Invalid row: '-10'".to_string())
-    );
-}
-
-#[test]
-fn invalid_parameters() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 1, 1, "23").unwrap();
-    assert_eq!(
-        model.auto_fill_rows(
-            &Area {
-                sheet: 0,
-                row: 1,
-                column: 1,
-                width: 1,
-                height: 2,
-            },
-            2,
-        ),
-        Err("Invalid parameters for autofill".to_string())
-    );
-}

base/src/test/user_model/test_border.rs

@@ -1,416 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    expressions::{types::Area, utils::number_to_column},
-    types::{Border, BorderItem, BorderStyle},
-    BorderArea, UserModel,
-};
-
-#[test]
-fn borders_all() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // We set an outer border in cells F5:H9
-    let range = &Area {
-        sheet: 0,
-        row: 5,
-        column: 6,
-        width: 3,
-        height: 4,
-    };
-    assert_eq!(number_to_column(6).unwrap(), "F");
-    assert_eq!(number_to_column(8).unwrap(), "H");
-    // ATM we don't have a way to create the object from Rust, that's ok.
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "All"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    for row in 5..9 {
-        for column in 6..9 {
-            let style = model.get_cell_style(0, row, column).unwrap();
-            let border_item = BorderItem {
-                style: BorderStyle::Thin,
-                color: Some("#FF5566".to_string()),
-            };
-            let expected_border = Border {
-                diagonal_up: false,
-                diagonal_down: false,
-                left: Some(border_item.clone()),
-                right: Some(border_item.clone()),
-                top: Some(border_item.clone()),
-                bottom: Some(border_item.clone()),
-                diagonal: None,
-            };
-            assert_eq!(style.border, expected_border);
-        }
-    }
-
-    // Lets remove all of them:
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "None"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    for row in 5..9 {
-        for column in 6..9 {
-            let style = model.get_cell_style(0, row, column).unwrap();
-            let expected_border = Border {
-                diagonal_up: false,
-                diagonal_down: false,
-                left: None,
-                right: None,
-                top: None,
-                bottom: None,
-                diagonal: None,
-            };
-            assert_eq!(style.border, expected_border);
-        }
-    }
-}
-
-#[test]
-fn borders_inner() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // We set an outer border in cells F5:H9
-    let range = &Area {
-        sheet: 0,
-        row: 5,
-        column: 6,
-        width: 3,
-        height: 4,
-    };
-    assert_eq!(number_to_column(6).unwrap(), "F");
-    assert_eq!(number_to_column(8).unwrap(), "H");
-    // ATM we don't have a way to create the object from Rust, that's ok.
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "Inner"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    // The inner part all have borders
-    for row in 6..8 {
-        for column in 7..8 {
-            let style = model.get_cell_style(0, row, column).unwrap();
-            let border_item = BorderItem {
-                style: BorderStyle::Thin,
-                color: Some("#FF5566".to_string()),
-            };
-            let expected_border = Border {
-                diagonal_up: false,
-                diagonal_down: false,
-                left: Some(border_item.clone()),
-                right: Some(border_item.clone()),
-                top: Some(border_item.clone()),
-                bottom: Some(border_item.clone()),
-                diagonal: None,
-            };
-            assert_eq!(style.border, expected_border);
-        }
-    }
-    // F5 has border only left and bottom
-    {
-        // We check the border on F5
-        let style = model.get_cell_style(0, 5, 6).unwrap();
-        let border_item = BorderItem {
-            style: BorderStyle::Thin,
-            color: Some("#FF5566".to_string()),
-        };
-        // It should be right and bottom
-        let expected_border = Border {
-            diagonal_up: false,
-            diagonal_down: false,
-            left: None,
-            right: Some(border_item.clone()),
-            top: None,
-            bottom: Some(border_item),
-            diagonal: None,
-        };
-        assert_eq!(style.border, expected_border);
-    }
-    {
-        // Then let's try the bottom-right border
-        let style = model.get_cell_style(0, 8, 8).unwrap();
-        let border_item = BorderItem {
-            style: BorderStyle::Thin,
-            color: Some("#FF5566".to_string()),
-        };
-        // It should be only left and top
-        let expected_border = Border {
-            diagonal_up: false,
-            diagonal_down: false,
-            left: Some(border_item.clone()),
-            right: None,
-            top: Some(border_item.clone()),
-            bottom: None,
-            diagonal: None,
-        };
-        assert_eq!(style.border, expected_border);
-    }
-}
-
-#[test]
-fn borders_outer() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // We set an outer border in cells F5:H9
-    let range = &Area {
-        sheet: 0,
-        row: 5,
-        column: 6,
-        width: 3,
-        height: 4,
-    };
-    assert_eq!(number_to_column(6).unwrap(), "F");
-    assert_eq!(number_to_column(8).unwrap(), "H");
-    // ATM we don't have a way to create the object from Rust, that's ok.
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "Outer"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    {
-        // We check the border on F5
-        let style = model.get_cell_style(0, 5, 6).unwrap();
-        let border_item = BorderItem {
-            style: BorderStyle::Thin,
-            color: Some("#FF5566".to_string()),
-        };
-        // It should be only left and top
-        let expected_border = Border {
-            diagonal_up: false,
-            diagonal_down: false,
-            left: Some(border_item.clone()),
-            right: None,
-            top: Some(border_item),
-            bottom: None,
-            diagonal: None,
-        };
-        assert_eq!(style.border, expected_border);
-    }
-    {
-        // Then let's try the bottom-right border
-        let style = model.get_cell_style(0, 8, 8).unwrap();
-        let border_item = BorderItem {
-            style: BorderStyle::Thin,
-            color: Some("#FF5566".to_string()),
-        };
-        // It should be only left and top
-        let expected_border = Border {
-            diagonal_up: false,
-            diagonal_down: false,
-            left: None,
-            right: Some(border_item.clone()),
-            top: None,
-            bottom: Some(border_item.clone()),
-            diagonal: None,
-        };
-        assert_eq!(style.border, expected_border);
-    }
-}
-
-#[test]
-fn borders_top() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // We set an outer border in cells F5:H9
-    let range = &Area {
-        sheet: 0,
-        row: 5,
-        column: 6,
-        width: 3,
-        height: 4,
-    };
-    assert_eq!(number_to_column(6).unwrap(), "F");
-    assert_eq!(number_to_column(8).unwrap(), "H");
-    // ATM we don't have a way to create the object from Rust, that's ok.
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "Top"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    for row in 5..9 {
-        for column in 6..9 {
-            let style = model.get_cell_style(0, row, column).unwrap();
-            let border_item = BorderItem {
-                style: BorderStyle::Thin,
-                color: Some("#FF5566".to_string()),
-            };
-            let expected_border = Border {
-                diagonal_up: false,
-                diagonal_down: false,
-                left: None,
-                right: None,
-                top: Some(border_item.clone()),
-                bottom: None,
-                diagonal: None,
-            };
-            assert_eq!(style.border, expected_border);
-        }
-    }
-}
-
-#[test]
-fn borders_right() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // We set an outer border in cells F5:H9
-    let range = &Area {
-        sheet: 0,
-        row: 5,
-        column: 6,
-        width: 3,
-        height: 4,
-    };
-    assert_eq!(number_to_column(6).unwrap(), "F");
-    assert_eq!(number_to_column(8).unwrap(), "H");
-    // ATM we don't have a way to create the object from Rust, that's ok.
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "Right"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    for row in 5..9 {
-        for column in 6..9 {
-            let style = model.get_cell_style(0, row, column).unwrap();
-            let border_item = BorderItem {
-                style: BorderStyle::Thin,
-                color: Some("#FF5566".to_string()),
-            };
-            let expected_border = Border {
-                diagonal_up: false,
-                diagonal_down: false,
-                left: None,
-                right: Some(border_item.clone()),
-                top: None,
-                bottom: None,
-                diagonal: None,
-            };
-            assert_eq!(style.border, expected_border);
-        }
-    }
-}
-
-#[test]
-fn borders_bottom() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // We set an outer border in cells F5:H9
-    let range = &Area {
-        sheet: 0,
-        row: 5,
-        column: 6,
-        width: 3,
-        height: 4,
-    };
-    assert_eq!(number_to_column(6).unwrap(), "F");
-    assert_eq!(number_to_column(8).unwrap(), "H");
-    // ATM we don't have a way to create the object from Rust, that's ok.
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "Bottom"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    for row in 5..9 {
-        for column in 6..9 {
-            let style = model.get_cell_style(0, row, column).unwrap();
-            let border_item = BorderItem {
-                style: BorderStyle::Thin,
-                color: Some("#FF5566".to_string()),
-            };
-            let expected_border = Border {
-                diagonal_up: false,
-                diagonal_down: false,
-                left: None,
-                right: None,
-                top: None,
-                bottom: Some(border_item.clone()),
-                diagonal: None,
-            };
-            assert_eq!(style.border, expected_border);
-        }
-    }
-}
-
-#[test]
-fn borders_left() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // We set an outer border in cells F5:H9
-    let range = &Area {
-        sheet: 0,
-        row: 5,
-        column: 6,
-        width: 3,
-        height: 4,
-    };
-    assert_eq!(number_to_column(6).unwrap(), "F");
-    assert_eq!(number_to_column(8).unwrap(), "H");
-    // ATM we don't have a way to create the object from Rust, that's ok.
-    let border_area: BorderArea = serde_json::from_str(
-        r##"{
-      "item": {
-        "style": "thin",
-        "color": "#FF5566"
-      },
-      "type": "Left"
-    }"##,
-    )
-    .unwrap();
-    model.set_area_with_border(range, &border_area).unwrap();
-    for row in 5..9 {
-        for column in 6..9 {
-            let style = model.get_cell_style(0, row, column).unwrap();
-            let border_item = BorderItem {
-                style: BorderStyle::Thin,
-                color: Some("#FF5566".to_string()),
-            };
-            let expected_border = Border {
-                diagonal_up: false,
-                diagonal_down: false,
-                left: Some(border_item.clone()),
-                right: None,
-                top: None,
-                bottom: None,
-                diagonal: None,
-            };
-            assert_eq!(style.border, expected_border);
-        }
-    }
-}

base/src/test/user_model/test_grid_lines.rs

@@ -1,42 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-use crate::UserModel;
-
-#[test]
-fn basic_tests() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.new_sheet();
-
-    // default sheet has show_grid_lines = true
-    assert_eq!(model.get_show_grid_lines(0), Ok(true));
-
-    // default new sheet has show_grid_lines = true
-    assert_eq!(model.get_show_grid_lines(1), Ok(true));
-
-    // wrong sheet number
-    assert_eq!(
-        model.get_show_grid_lines(2),
-        Err("Invalid sheet index".to_string())
-    );
-
-    // we can set it
-    model.set_show_grid_lines(1, false).unwrap();
-    assert_eq!(model.get_show_grid_lines(1), Ok(false));
-    assert_eq!(model.get_show_grid_lines(0), Ok(true));
-
-    model.undo().unwrap();
-
-    assert_eq!(model.get_show_grid_lines(1), Ok(true));
-    assert_eq!(model.get_show_grid_lines(0), Ok(true));
-
-    model.redo().unwrap();
-
-    let send_queue = model.flush_send_queue();
-    let mut model2 = UserModel::from_model(new_empty_model());
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    assert_eq!(model2.get_show_grid_lines(1), Ok(false));
-    assert_eq!(model2.get_show_grid_lines(0), Ok(true));
-}

base/src/test/user_model/test_keyboard_navigation.rs

@@ -1,136 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    constants::{
-        DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, DEFAULT_WINDOW_HEIGH, DEFAULT_WINDOW_WIDTH,
-        LAST_COLUMN,
-    },
-    test::util::new_empty_model,
-    UserModel,
-};
-
-#[test]
-fn basic_navigation() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.on_arrow_right().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 2, 1, 2]);
-    assert_eq!(view.column, 2);
-    assert_eq!(view.row, 1);
-
-    model.on_arrow_left().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 1, 1, 1]);
-    assert_eq!(view.column, 1);
-    assert_eq!(view.row, 1);
-
-    model.on_arrow_left().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 1, 1, 1]);
-    assert_eq!(view.column, 1);
-    assert_eq!(view.row, 1);
-
-    model.on_arrow_down().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [2, 1, 2, 1]);
-    assert_eq!(view.column, 1);
-    assert_eq!(view.row, 2);
-
-    model.on_arrow_up().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 1, 1, 1]);
-    assert_eq!(view.column, 1);
-    assert_eq!(view.row, 1);
-
-    model.on_arrow_up().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 1, 1, 1]);
-    assert_eq!(view.column, 1);
-    assert_eq!(view.row, 1);
-}
-
-#[test]
-fn scroll_right() {
-    let window_width = DEFAULT_WINDOW_WIDTH as f64;
-    let column_width = DEFAULT_COLUMN_WIDTH;
-    let column_count = f64::floor(window_width / column_width) as i32;
-
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.on_arrow_right().unwrap();
-
-    model.set_selected_cell(3, column_count).unwrap();
-    model.on_arrow_right().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.left_column, 2);
-
-    model.on_arrow_right().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.left_column, 3);
-}
-
-#[test]
-fn last_colum() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_selected_cell(3, LAST_COLUMN).unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.column, LAST_COLUMN);
-
-    model.on_arrow_right().unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.column, LAST_COLUMN);
-}
-
-#[test]
-fn page_down() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let window_height = DEFAULT_WINDOW_HEIGH as f64;
-    let row_height = DEFAULT_ROW_HEIGHT;
-    let row_count = f64::floor(window_height / row_height) as i32;
-    model.on_page_down().unwrap();
-
-    let view = model.get_selected_view();
-    assert_eq!(view.row, 1 + row_count);
-    let scroll_y = model.get_scroll_y().unwrap();
-    assert_eq!(scroll_y, (row_count as f64) * DEFAULT_ROW_HEIGHT);
-}
-
-// we just test that page up and page down are inverse operations
-#[test]
-fn page_up() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.on_page_down().unwrap();
-    let row1 = model.get_selected_view().row;
-
-    model.on_page_down().unwrap();
-    let row2 = model.get_selected_view().row;
-
-    model.on_page_down().unwrap();
-    let row3 = model.get_selected_view().row;
-
-    model.on_page_down().unwrap();
-
-    model.on_page_up().unwrap();
-    assert_eq!(model.get_selected_view().row, row3);
-
-    model.on_page_up().unwrap();
-    assert_eq!(model.get_selected_view().row, row2);
-
-    model.on_page_up().unwrap();
-    assert_eq!(model.get_selected_view().row, row1);
-
-    model.on_page_up().unwrap();
-    assert_eq!(model.get_selected_view().row, 1);
-}
-
-#[test]
-fn page_up_fails_on_row1() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.on_arrow_up().unwrap();
-    assert_eq!(model.get_selected_view().row, 1);
-}

base/src/test/user_model/test_on_area_selection.rs

@@ -1,33 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_WINDOW_WIDTH},
-    test::util::new_empty_model,
-    UserModel,
-};
-
-#[test]
-fn basic_test() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-
-    model.on_area_selecting(2, 4).unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 1, 2, 4]);
-}
-
-// this checks that is we select in the boundary we automatically scroll
-#[test]
-fn scroll_right() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let window_width = DEFAULT_WINDOW_WIDTH as f64;
-    let column_width = DEFAULT_COLUMN_WIDTH;
-    let column_count = f64::floor(window_width / column_width) as i32;
-    model.set_selected_cell(3, column_count).unwrap();
-
-    model.on_area_selecting(3, column_count + 3).unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [3, column_count, 3, column_count + 3]);
-    assert_eq!(view.left_column, 4);
-}

base/src/test/user_model/test_on_expand_selected_range.rs

@@ -1,151 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_WINDOW_WIDTH, LAST_COLUMN},
-    test::util::new_empty_model,
-    UserModel,
-};
-
-#[test]
-fn arrow_right() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.on_expand_selected_range("ArrowRight").unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 1, 1, 2]);
-}
-
-#[test]
-fn arrow_right_decreases() {
-    // if the selected cell is on the upper right corner, right-arrow will decrease the size of teh area
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let (start_row, start_column, end_row, end_column) = (5, 3, 10, 8);
-    model.set_selected_cell(start_row, end_column).unwrap();
-    model
-        .set_selected_range(start_row, start_column, end_row, end_column)
-        .unwrap();
-
-    model.on_expand_selected_range("ArrowRight").unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(
-        view.range,
-        [start_row, start_column + 1, end_row, end_column]
-    );
-}
-
-#[test]
-fn arrow_right_last_column() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_selected_cell(1, LAST_COLUMN).unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, LAST_COLUMN, 1, LAST_COLUMN]);
-}
-
-#[test]
-fn arrow_right_scroll_right() {
-    let window_width = DEFAULT_WINDOW_WIDTH as f64;
-    let column_width = DEFAULT_COLUMN_WIDTH;
-    let column_count = f64::floor(window_width / column_width) as i32;
-
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-
-    // initially the column to the left is A
-    let view = model.get_selected_view();
-    assert_eq!(view.left_column, 1);
-
-    // We select all columns from 1 to the last visible
-    let (start_row, start_column, end_row, end_column) = (1, 1, 1, column_count);
-    model.set_selected_cell(start_row, start_column).unwrap();
-    model
-        .set_selected_range(start_row, start_column, end_row, end_column)
-        .unwrap();
-
-    // Now we select one more column
-    model.on_expand_selected_range("ArrowRight").unwrap();
-
-    // The view has updated and the first visible column is B
-    let view = model.get_selected_view();
-    assert_eq!(
-        view.range,
-        [start_row, start_column, end_row, end_column + 1]
-    );
-    assert_eq!(view.left_column, 2);
-
-    // now we click on cell B2 and we
-    model.set_selected_cell(2, 2).unwrap();
-    model.on_expand_selected_range("ArrowLeft").unwrap();
-
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [2, 1, 2, 2]);
-    assert_eq!(view.left_column, 1);
-
-    // a second arrow left won't do anything
-    model.on_expand_selected_range("ArrowLeft").unwrap();
-
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [2, 1, 2, 2]);
-    assert_eq!(view.left_column, 1);
-}
-
-#[test]
-fn arrow_left() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_selected_cell(5, 3).unwrap();
-    model.set_selected_range(5, 3, 10, 8).unwrap();
-    model.on_expand_selected_range("ArrowLeft").unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [5, 3, 10, 7]);
-}
-
-#[test]
-fn arrow_left_left_border() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.on_expand_selected_range("ArrowLeft").unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 1, 1, 1]);
-}
-
-#[test]
-fn arrow_left_increases() {
-    // If the selected cell is on the top right corner
-    // arrow left increases the selected area by
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-
-    let (start_row, start_column, end_row, end_column) = (4, 10, 4, 20);
-    model.set_selected_cell(start_row, end_column).unwrap();
-    model
-        .set_selected_range(start_row, start_column, end_row, end_column)
-        .unwrap();
-    model.on_expand_selected_range("ArrowLeft").unwrap();
-    let view = model.get_selected_view();
-    assert_eq!(
-        view.range,
-        [start_row, start_column - 1, end_row, end_column]
-    );
-}
-
-#[test]
-fn arrow_left_scrolls_left() {
-    // If the selected cell is on the top right corner
-    // arrow left increases the selected area by
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-
-    model.set_top_left_visible_cell(1, 50).unwrap();
-
-    model.set_selected_cell(1, 50).unwrap();
-    // arrow left x 2
-    model.on_expand_selected_range("ArrowLeft").unwrap();
-    model.on_expand_selected_range("ArrowLeft").unwrap();
-
-    let view = model.get_selected_view();
-    assert_eq!(view.range, [1, 48, 1, 50]);
-    assert_eq!(view.left_column, 48);
-    assert_eq!(view.column, 50);
-}

base/src/test/user_model/test_on_paste_styles.rs

@@ -1,48 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-use crate::types::Fill;
-use crate::UserModel;
-
-#[test]
-fn simple_pasting() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let mut style = model.get_cell_style(0, 1, 1).unwrap();
-    style.fill = Fill {
-        pattern_type: "solid".to_string(),
-        fg_color: Some("#FF5577".to_string()),
-        bg_color: Some("#33FF44".to_string()),
-    };
-    let styles = vec![vec![style.clone()]];
-
-    model.set_selected_cell(5, 4).unwrap();
-    model.set_selected_range(5, 4, 10, 9).unwrap();
-    model.on_paste_styles(&styles).unwrap();
-
-    for row in 5..10 {
-        for column in 4..9 {
-            let cell_style = model.get_cell_style(0, row, column).unwrap();
-            assert_eq!(cell_style, style);
-        }
-    }
-
-    model.undo().unwrap();
-    let base_style = model.get_cell_style(0, 100, 100).unwrap();
-
-    for row in 5..10 {
-        for column in 4..9 {
-            let cell_style = model.get_cell_style(0, row, column).unwrap();
-            assert_eq!(cell_style, base_style);
-        }
-    }
-
-    model.redo().unwrap();
-
-    for row in 5..10 {
-        for column in 4..9 {
-            let cell_style = model.get_cell_style(0, row, column).unwrap();
-            assert_eq!(cell_style, style);
-        }
-    }
-}

base/src/test/user_model/test_shift_cells.rs

@@ -0,0 +1,23 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::UserModel;
+
+#[test]
+fn shift_cells_general() {
+    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
+    // some reference value in A1
+    model.set_user_input(0, 1, 1, "42").unwrap();
+
+    // We put some values in row 5
+    model.set_user_input(0, 5, 3, "=1 + 1").unwrap(); // C5
+    model.set_user_input(0, 5, 7, "=C5*A1").unwrap();
+
+    // Insert one cell in C5 and push right
+    model.insert_cells_and_shift_right(0, 5, 3, 1, 1).unwrap();
+
+    // C5 should now be empty
+    assert_eq!(model.get_cell_content(0, 5, 3), Ok("".to_string()));
+
+    // D5 should have 2
+    assert_eq!(model.get_cell_content(0, 5, 4), Ok("=1+1".to_string()));
+}

base/src/test/user_model/test_view.rs

@@ -1,209 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use std::collections::HashMap;
-
-use crate::{
-    constants::{LAST_COLUMN, LAST_ROW},
-    test::util::new_empty_model,
-    user_model::SelectedView,
-    UserModel,
-};
-
-#[test]
-fn initial_view() {
-    let model = new_empty_model();
-    let model = UserModel::from_model(model);
-    assert_eq!(model.get_selected_sheet(), 0);
-    assert_eq!(model.get_selected_cell(), (0, 1, 1));
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 1,
-            left_column: 1
-        }
-    );
-}
-
-#[test]
-fn set_the_cell_sets_the_range() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_selected_cell(5, 4).unwrap();
-    assert_eq!(model.get_selected_sheet(), 0);
-    assert_eq!(model.get_selected_cell(), (0, 5, 4));
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 5,
-            column: 4,
-            range: [5, 4, 5, 4],
-            top_row: 1,
-            left_column: 1
-        }
-    );
-}
-
-#[test]
-fn set_the_range_does_not_set_the_cell() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(
-        model.set_selected_range(5, 4, 10, 6),
-        Err(
-            "The selected cells is not in one of the corners. Row: '1' and row range '(5, 10)'"
-                .to_string()
-        )
-    );
-}
-
-#[test]
-fn add_new_sheet_and_back() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.new_sheet();
-    assert_eq!(model.get_selected_sheet(), 0);
-    model.set_selected_cell(5, 4).unwrap();
-    model.set_selected_sheet(1).unwrap();
-    assert_eq!(model.get_selected_cell(), (1, 1, 1));
-    model.set_selected_sheet(0).unwrap();
-    assert_eq!(model.get_selected_cell(), (0, 5, 4));
-}
-
-#[test]
-fn set_selected_cell_errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(
-        model.set_selected_cell(-5, 4),
-        Err("Invalid row: '-5'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_cell(5, -4),
-        Err("Invalid column: '-4'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(-1, 1, 1, 1),
-        Err("Invalid row: '-1'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(1, 0, 1, 1),
-        Err("Invalid column: '0'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(1, 1, LAST_ROW + 1, 1),
-        Err("Invalid row: '1048577'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(1, 1, 1, LAST_COLUMN + 1),
-        Err("Invalid column: '16385'".to_string())
-    );
-}
-
-#[test]
-fn set_selected_cell_errors_wrong_sheet() {
-    let mut model = new_empty_model();
-    // forcefully set a wrong index
-    model.workbook.views.get_mut(&0).unwrap().sheet = 2;
-    let mut model = UserModel::from_model(model);
-    // It's returning the wrong number
-    assert_eq!(model.get_selected_sheet(), 2);
-
-    // But we can't set the selected cell anymore
-    assert_eq!(
-        model.set_selected_cell(3, 4),
-        Err("Invalid worksheet index 2".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(3, 4, 5, 6),
-        Err("Invalid worksheet index 2".to_string())
-    );
-
-    assert_eq!(
-        model.set_top_left_visible_cell(3, 4),
-        Err("Invalid worksheet index 2".to_string())
-    );
-
-    // we can fix it by setting the right cell
-    model.set_selected_sheet(0).unwrap();
-    model.set_selected_cell(3, 4).unwrap();
-}
-
-#[test]
-fn set_visible_cell() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_top_left_visible_cell(100, 12).unwrap();
-
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 100,
-            left_column: 12
-        }
-    );
-
-    let s = serde_json::to_string(&model.get_selected_view()).unwrap();
-    assert_eq!(
-        serde_json::from_str::<SelectedView>(&s).unwrap(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 100,
-            left_column: 12
-        }
-    );
-}
-
-#[test]
-fn set_visible_cell_errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(
-        model.set_top_left_visible_cell(-100, 12),
-        Err("Invalid row: '-100'".to_string())
-    );
-    assert_eq!(
-        model.set_top_left_visible_cell(100, -12),
-        Err("Invalid column: '-12'".to_string())
-    );
-}
-
-#[test]
-fn errors_no_views() {
-    let mut model = new_empty_model();
-    // forcefully remove the view
-    model.workbook.views = HashMap::new();
-    // also in the sheet
-    model.workbook.worksheets[0].views = HashMap::new();
-    let mut model = UserModel::from_model(model);
-    // get methods will return defaults
-    assert_eq!(model.get_selected_sheet(), 0);
-    assert_eq!(model.get_selected_cell(), (0, 1, 1));
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 1,
-            left_column: 1
-        }
-    );
-
-    // set methods won't complain. but won't work either
-    model.set_selected_sheet(0).unwrap();
-    model.set_selected_cell(5, 6).unwrap();
-    assert_eq!(model.get_selected_cell(), (0, 1, 1));
-}

base/src/test/user_model/test_window_size.rs

@@ -1,29 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    constants::{DEFAULT_ROW_HEIGHT, DEFAULT_WINDOW_HEIGH, DEFAULT_WINDOW_WIDTH},
-    test::util::new_empty_model,
-    UserModel,
-};
-
-#[test]
-fn basic_test() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let window_height = model.get_window_height().unwrap();
-    assert_eq!(window_height, DEFAULT_WINDOW_HEIGH);
-
-    let window_width = model.get_window_width().unwrap();
-    assert_eq!(window_width, DEFAULT_WINDOW_WIDTH);
-
-    // Set the window height to double the default and check that page_down behaves as expected
-    model.set_window_height((window_height * 2) as f64);
-    model.on_page_down().unwrap();
-
-    let row_height = DEFAULT_ROW_HEIGHT;
-    let row_count = f64::floor((window_height * 2) as f64 / row_height) as i32;
-    let view = model.get_selected_view();
-    assert_eq!(view.row, 1 + row_count);
-    let scroll_y = model.get_scroll_y().unwrap();
-    assert_eq!(scroll_y, (row_count as f64) * DEFAULT_ROW_HEIGHT);
-}

base/src/test/util.rs

@@ -20,8 +20,7 @@ impl Model {
         let cell_reference = self._parse_reference(cell);
         let column = cell_reference.column;
         let row = cell_reference.row;
-        self.set_user_input(cell_reference.sheet, row, column, value.to_string())
+        self.set_user_input(cell_reference.sheet, row, column, value.to_string());
-            .unwrap();
     }
     pub fn _has_formula(&self, cell: &str) -> bool {
         self._get_formula_opt(cell).is_some()

base/src/types.rs

@@ -27,18 +27,6 @@ pub struct WorkbookSettings {
     pub tz: String,
     pub locale: String,
 }
-
-/// A Workbook View tracks of the selected sheet for each view
-#[derive(Encode, Decode, Debug, PartialEq, Clone)]
-pub struct WorkbookView {
-    /// The index of the currently selected sheet.
-    pub sheet: u32,
-    /// The current width of the window
-    pub window_width: i64,
-    /// The current heigh of the window
-    pub window_height: i64,
-}
-
 /// An internal representation of an IronCalc Workbook
 #[derive(Encode, Decode, Debug, PartialEq, Clone)]
 pub struct Workbook {
@@ -50,7 +38,6 @@ pub struct Workbook {
     pub settings: WorkbookSettings,
     pub metadata: Metadata,
     pub tables: HashMap<String, Table>,
-    pub views: HashMap<u32, WorkbookView>,
 }
 
 /// A defined name. The `sheet_id` is the sheet index in case the name is local
@@ -61,6 +48,9 @@ pub struct DefinedName {
     pub sheet_id: Option<u32>,
 }
 
+// TODO: Move to worksheet.rs make frozen_rows/columns private and u32
+/// Internal representation of a worksheet Excel object
+
 /// * state:
 ///    18.18.68 ST_SheetState (Sheet Visibility Types)
 ///    hidden, veryHidden, visible
@@ -81,21 +71,12 @@ impl Display for SheetState {
     }
 }
 
-/// Represents the state of the worksheet as seen by the user. This includes
-/// details such as the currently selected cell, the visible range, and the
-/// position of the viewport.
 #[derive(Encode, Decode, Debug, PartialEq, Clone)]
-pub struct WorksheetView {
+pub struct Selection {
-    /// The row index of the currently selected cell.
+    pub is_selected: bool,
     pub row: i32,
-    /// The column index of the currently selected cell.
     pub column: i32,
-    /// The selected range in the worksheet, specified as [start_row, start_column, end_row, end_column].
     pub range: [i32; 4],
-    /// The row index of the topmost visible cell in the worksheet view.
-    pub top_row: i32,
-    /// The column index of the leftmost visible cell in the worksheet view.
-    pub left_column: i32,
 }
 
 /// Internal representation of a worksheet Excel object
@@ -114,9 +95,7 @@ pub struct Worksheet {
     pub comments: Vec<Comment>,
     pub frozen_rows: i32,
     pub frozen_columns: i32,
-    pub views: HashMap<u32, WorksheetView>,
+    pub selection: Selection,
-    /// Whether or not to show the grid lines in the worksheet
-    pub show_grid_lines: bool,
 }
 
 /// Internal representation of Excel's sheet_data

base/src/units.rs

@@ -86,15 +86,12 @@ fn get_units_from_format_string(num_fmt: &str) -> Option<Units> {
 
 impl Model {
     fn compute_cell_units(&self, cell_reference: &CellReferenceIndex) -> Option<Units> {
-        let cell_style_res = &self.get_style_for_cell(
+        let style = &self.get_style_for_cell(
             cell_reference.sheet,
             cell_reference.row,
             cell_reference.column,
         );
-        match cell_style_res {
+        get_units_from_format_string(&style.num_fmt)
-            Ok(style) => get_units_from_format_string(&style.num_fmt),
-            Err(_) => None,
-        }
     }
 
     pub(crate) fn compute_node_units(

base/src/user_model/history.rs

@@ -1,164 +0,0 @@
-use std::collections::HashMap;
-
-use bitcode::{Decode, Encode};
-
-use crate::types::{Cell, Col, Row, Style};
-
-#[derive(Clone, Encode, Decode)]
-pub(crate) struct RowData {
-    pub(crate) row: Option<Row>,
-    pub(crate) data: HashMap<i32, Cell>,
-}
-
-#[derive(Clone, Encode, Decode)]
-pub(crate) struct ColumnData {
-    pub(crate) column: Option<Col>,
-    pub(crate) data: HashMap<i32, Cell>,
-}
-
-#[derive(Clone, Encode, Decode)]
-pub(crate) enum Diff {
-    // Cell diffs
-    SetCellValue {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        new_value: String,
-        old_value: Box<Option<Cell>>,
-    },
-    CellClearContents {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        old_value: Box<Option<Cell>>,
-    },
-    CellClearAll {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        old_value: Box<Option<Cell>>,
-        old_style: Box<Style>,
-    },
-    SetCellStyle {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        old_value: Box<Style>,
-        new_value: Box<Style>,
-    },
-    // Column and Row diffs
-    SetColumnWidth {
-        sheet: u32,
-        column: i32,
-        new_value: f64,
-        old_value: f64,
-    },
-    SetRowHeight {
-        sheet: u32,
-        row: i32,
-        new_value: f64,
-        old_value: f64,
-    },
-    InsertRow {
-        sheet: u32,
-        row: i32,
-    },
-    DeleteRow {
-        sheet: u32,
-        row: i32,
-        old_data: Box<RowData>,
-    },
-    InsertColumn {
-        sheet: u32,
-        column: i32,
-    },
-    DeleteColumn {
-        sheet: u32,
-        column: i32,
-        old_data: Box<ColumnData>,
-    },
-    SetFrozenRowsCount {
-        sheet: u32,
-        new_value: i32,
-        old_value: i32,
-    },
-    SetFrozenColumnsCount {
-        sheet: u32,
-        new_value: i32,
-        old_value: i32,
-    },
-    DeleteSheet {
-        sheet: u32,
-    },
-    NewSheet {
-        index: u32,
-        name: String,
-    },
-    RenameSheet {
-        index: u32,
-        old_value: String,
-        new_value: String,
-    },
-    SetSheetColor {
-        index: u32,
-        old_value: String,
-        new_value: String,
-    },
-    SetShowGridLines {
-        sheet: u32,
-        old_value: bool,
-        new_value: bool,
-    }, // FIXME: we are missing SetViewDiffs
-}
-
-pub(crate) type DiffList = Vec<Diff>;
-
-#[derive(Default)]
-pub(crate) struct History {
-    pub(crate) undo_stack: Vec<DiffList>,
-    pub(crate) redo_stack: Vec<DiffList>,
-}
-
-impl History {
-    pub fn push(&mut self, diff_list: DiffList) {
-        self.undo_stack.push(diff_list);
-        self.redo_stack = vec![];
-    }
-
-    pub fn undo(&mut self) -> Option<Vec<Diff>> {
-        match self.undo_stack.pop() {
-            Some(diff_list) => {
-                self.redo_stack.push(diff_list.clone());
-                Some(diff_list)
-            }
-            None => None,
-        }
-    }
-
-    pub fn redo(&mut self) -> Option<Vec<Diff>> {
-        match self.redo_stack.pop() {
-            Some(diff_list) => {
-                self.undo_stack.push(diff_list.clone());
-                Some(diff_list)
-            }
-            None => None,
-        }
-    }
-
-    pub fn clear(&mut self) {
-        self.redo_stack = vec![];
-        self.undo_stack = vec![];
-    }
-}
-
-#[derive(Clone, Encode, Decode)]
-pub enum DiffType {
-    Undo,
-    Redo,
-}
-
-#[derive(Clone, Encode, Decode)]
-pub struct QueueDiffs {
-    pub r#type: DiffType,
-    pub list: DiffList,
-}

base/src/user_model/mod.rs

@@ -1,12 +0,0 @@
-#![deny(missing_docs)]
-
-mod common;
-mod history;
-mod ui;
-
-pub use common::UserModel;
-
-#[cfg(test)]
-pub use ui::SelectedView;
-
-pub use common::BorderArea;

base/src/user_model/ui.rs

@@ -1,687 +0,0 @@
-#![deny(missing_docs)]
-
-use serde::{Deserialize, Serialize};
-
-use crate::expressions::utils::{is_valid_column_number, is_valid_row};
-
-use super::common::UserModel;
-
-#[derive(Serialize, Deserialize)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
-pub struct SelectedView {
-    pub sheet: u32,
-    pub row: i32,
-    pub column: i32,
-    pub range: [i32; 4],
-    pub top_row: i32,
-    pub left_column: i32,
-}
-
-impl UserModel {
-    /// Returns the selected sheet index
-    pub fn get_selected_sheet(&self) -> u32 {
-        if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            0
-        }
-    }
-
-    /// Returns the selected cell
-    pub fn get_selected_cell(&self) -> (u32, i32, i32) {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            0
-        };
-        if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
-            if let Some(view) = worksheet.views.get(&self.model.view_id) {
-                return (sheet, view.row, view.column);
-            }
-        }
-        // return a safe default
-        (0, 1, 1)
-    }
-
-    /// Returns selected view
-    pub fn get_selected_view(&self) -> SelectedView {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            0
-        };
-        if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
-            if let Some(view) = worksheet.views.get(&self.model.view_id) {
-                return SelectedView {
-                    sheet,
-                    row: view.row,
-                    column: view.column,
-                    range: view.range,
-                    top_row: view.top_row,
-                    left_column: view.left_column,
-                };
-            }
-        }
-        // return a safe default
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 1,
-            left_column: 1,
-        }
-    }
-
-    /// Sets the the selected sheet
-    pub fn set_selected_sheet(&mut self, sheet: u32) -> Result<(), String> {
-        if self.model.workbook.worksheet(sheet).is_err() {
-            return Err(format!("Invalid worksheet index {}", sheet));
-        }
-        if let Some(view) = self.model.workbook.views.get_mut(&0) {
-            view.sheet = sheet;
-        }
-        Ok(())
-    }
-
-    /// Sets the selected cell for the current view. Note that this also sets the selected range
-    pub fn set_selected_cell(&mut self, row: i32, column: i32) -> Result<(), String> {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            0
-        };
-        if !is_valid_column_number(column) {
-            return Err(format!("Invalid column: '{column}'"));
-        }
-        if !is_valid_row(row) {
-            return Err(format!("Invalid row: '{row}'"));
-        }
-        if self.model.workbook.worksheet(sheet).is_err() {
-            return Err(format!("Invalid worksheet index {}", sheet));
-        }
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&0) {
-                view.row = row;
-                view.column = column;
-                view.range = [row, column, row, column];
-            }
-        }
-        Ok(())
-    }
-
-    /// Sets the selected range. Note that the selected cell must be in one of the corners.
-    pub fn set_selected_range(
-        &mut self,
-        start_row: i32,
-        start_column: i32,
-        end_row: i32,
-        end_column: i32,
-    ) -> Result<(), String> {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            0
-        };
-
-        if !is_valid_column_number(start_column) {
-            return Err(format!("Invalid column: '{start_column}'"));
-        }
-        if !is_valid_row(start_row) {
-            return Err(format!("Invalid row: '{start_row}'"));
-        }
-
-        if !is_valid_column_number(end_column) {
-            return Err(format!("Invalid column: '{end_column}'"));
-        }
-        if !is_valid_row(end_row) {
-            return Err(format!("Invalid row: '{end_row}'"));
-        }
-        if self.model.workbook.worksheet(sheet).is_err() {
-            return Err(format!("Invalid worksheet index {}", sheet));
-        }
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&0) {
-                let selected_row = view.row;
-                let selected_column = view.column;
-                // The selected cells must be on one of the corners of the selected range:
-                if selected_row != start_row && selected_row != end_row {
-                    return Err(format!(
-                        "The selected cells is not in one of the corners. Row: '{}' and row range '({}, {})'",
-                        selected_row, start_row, end_row
-                    ));
-                }
-                if selected_column != start_column && selected_column != end_column {
-                    return Err(format!(
-                        "The selected cells is not in one of the corners. Column '{}' and column range '({}, {})'",
-                        selected_column, start_column, end_column
-                    ));
-                }
-                view.range = [start_row, start_column, end_row, end_column];
-            }
-        }
-        Ok(())
-    }
-
-    /// The selected range is expanded with the keyboard
-    pub fn on_expand_selected_range(&mut self, key: &str) -> Result<(), String> {
-        let (sheet, window_width, window_height) =
-            if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-                (
-                    view.sheet,
-                    view.window_width as f64,
-                    view.window_height as f64,
-                )
-            } else {
-                return Ok(());
-            };
-        let (selected_row, selected_column, range, top_row, left_column) =
-            if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
-                if let Some(view) = worksheet.views.get(&self.model.view_id) {
-                    (
-                        view.row,
-                        view.column,
-                        view.range,
-                        view.top_row,
-                        view.left_column,
-                    )
-                } else {
-                    return Ok(());
-                }
-            } else {
-                return Ok(());
-            };
-        let [row_start, column_start, row_end, column_end] = range;
-
-        match key {
-            "ArrowRight" => {
-                if selected_column > column_start {
-                    let new_column = column_start + 1;
-                    if !(is_valid_column_number(new_column)) {
-                        return Ok(());
-                    }
-                    self.set_selected_range(row_start, new_column, row_end, column_end)?;
-                } else {
-                    let new_column = column_end + 1;
-                    if !is_valid_column_number(new_column) {
-                        return Ok(());
-                    }
-                    // if the column is not fully visible we 'scroll' right until it is
-                    let mut width = 0.0;
-                    let mut c = left_column;
-                    while c <= new_column {
-                        width += self.model.get_column_width(sheet, c)?;
-                        c += 1;
-                    }
-                    if width > window_width {
-                        self.set_top_left_visible_cell(top_row, left_column + 1)?;
-                    }
-                    self.set_selected_range(row_start, column_start, row_end, column_end + 1)?;
-                }
-            }
-            "ArrowLeft" => {
-                if selected_column < column_end {
-                    let new_column = column_end - 1;
-                    if !is_valid_column_number(new_column) {
-                        return Ok(());
-                    }
-                    if new_column < left_column {
-                        self.set_top_left_visible_cell(top_row, new_column)?;
-                    }
-                    self.set_selected_range(row_start, column_start, row_end, new_column)?;
-                } else {
-                    let new_column = column_start - 1;
-                    if !is_valid_column_number(new_column) {
-                        return Ok(());
-                    }
-                    if new_column < left_column {
-                        self.set_top_left_visible_cell(top_row, new_column)?;
-                    }
-                    self.set_selected_range(row_start, new_column, row_end, column_end)?;
-                }
-            }
-            "ArrowUp" => {
-                if selected_row < row_end {
-                    let new_row = row_end - 1;
-                    if !is_valid_row(new_row) {
-                        return Ok(());
-                    }
-                    self.set_selected_range(row_start, column_start, new_row, column_end)?;
-                } else {
-                    let new_row = row_start - 1;
-                    if !is_valid_row(new_row) {
-                        return Ok(());
-                    }
-                    if new_row < top_row {
-                        self.set_top_left_visible_cell(new_row, left_column)?;
-                    }
-                    self.set_selected_range(new_row, column_start, row_end, column_end)?;
-                }
-            }
-            "ArrowDown" => {
-                if selected_row > row_start {
-                    let new_row = row_start + 1;
-                    if !is_valid_row(new_row) {
-                        return Ok(());
-                    }
-                    self.set_selected_range(new_row, column_start, row_end, column_end)?;
-                } else {
-                    let new_row = row_end + 1;
-                    if !is_valid_row(new_row) {
-                        return Ok(());
-                    }
-                    let mut height = 0.0;
-                    let mut r = top_row;
-                    while r <= new_row + 1 {
-                        height += self.model.get_row_height(sheet, r)?;
-                        r += 1;
-                    }
-                    if height >= window_height {
-                        self.set_top_left_visible_cell(top_row + 1, left_column)?;
-                    }
-                    self.set_selected_range(row_start, column_start, new_row, column_end)?;
-                }
-            }
-            _ => {}
-        }
-
-        Ok(())
-    }
-
-    /// Sets the value of the first visible cell
-    pub fn set_top_left_visible_cell(
-        &mut self,
-        top_row: i32,
-        left_column: i32,
-    ) -> Result<(), String> {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            0
-        };
-
-        if !is_valid_column_number(left_column) {
-            return Err(format!("Invalid column: '{left_column}'"));
-        }
-        if !is_valid_row(top_row) {
-            return Err(format!("Invalid row: '{top_row}'"));
-        }
-        if self.model.workbook.worksheet(sheet).is_err() {
-            return Err(format!("Invalid worksheet index {}", sheet));
-        }
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&0) {
-                view.top_row = top_row;
-                view.left_column = left_column;
-            }
-        }
-        Ok(())
-    }
-
-    /// Sets the width of the window
-    pub fn set_window_width(&mut self, window_width: f64) {
-        if let Some(view) = self.model.workbook.views.get_mut(&self.model.view_id) {
-            view.window_width = window_width as i64;
-        };
-    }
-
-    /// Gets the width of the window
-    pub fn get_window_width(&mut self) -> Result<i64, String> {
-        if let Some(view) = self.model.workbook.views.get_mut(&self.model.view_id) {
-            return Ok(view.window_width);
-        };
-        Err("View not found".to_string())
-    }
-
-    /// Sets the height of the window
-    pub fn set_window_height(&mut self, window_height: f64) {
-        if let Some(view) = self.model.workbook.views.get_mut(&self.model.view_id) {
-            view.window_height = window_height as i64;
-        };
-    }
-
-    /// Gets the height of the window
-    pub fn get_window_height(&mut self) -> Result<i64, String> {
-        if let Some(view) = self.model.workbook.views.get_mut(&self.model.view_id) {
-            return Ok(view.window_height);
-        };
-        Err("View not found".to_string())
-    }
-
-    /// User presses right arrow
-    pub fn on_arrow_right(&mut self) -> Result<(), String> {
-        let (sheet, window_width) =
-            if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-                (view.sheet, view.window_width)
-            } else {
-                return Err("View not found".to_string());
-            };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-        let new_column = view.column + 1;
-        if !is_valid_column_number(new_column) {
-            return Ok(());
-        }
-        // if the column is not fully visible we 'scroll' right until it is
-        let mut width = 0.0;
-        let mut column = view.left_column;
-        while column <= new_column {
-            width += self.model.get_column_width(sheet, column)?;
-            column += 1;
-        }
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&self.model.view_id) {
-                view.column = new_column;
-                view.range = [view.row, new_column, view.row, new_column];
-                if width > window_width as f64 {
-                    view.left_column += 1;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// User presses left arrow
-    pub fn on_arrow_left(&mut self) -> Result<(), String> {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            return Err("View not found".to_string());
-        };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-        let new_column = view.column - 1;
-        if !is_valid_column_number(new_column) {
-            return Ok(());
-        }
-        // if the column is not fully visible we 'scroll' right until it is
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&self.model.view_id) {
-                view.column = new_column;
-                view.range = [view.row, new_column, view.row, new_column];
-                if new_column < view.left_column {
-                    view.left_column = new_column;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// User presses up arrow key
-    pub fn on_arrow_up(&mut self) -> Result<(), String> {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            return Err("View not found".to_string());
-        };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-        let new_row = view.row - 1;
-        if !is_valid_row(new_row) {
-            return Ok(());
-        }
-        // if the column is not fully visible we 'scroll' right until it is
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&self.model.view_id) {
-                view.row = new_row;
-                view.range = [new_row, view.column, new_row, view.column];
-                if new_row < view.top_row {
-                    view.top_row = new_row;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// User presses down arrow key
-    pub fn on_arrow_down(&mut self) -> Result<(), String> {
-        let (sheet, window_height) =
-            if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-                (view.sheet, view.window_height)
-            } else {
-                return Err("View not found".to_string());
-            };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-        let new_row = view.row + 1;
-        if !is_valid_row(new_row) {
-            return Ok(());
-        }
-        // if the row is not fully visible we 'scroll' down until it is
-        let mut height = 0.0;
-        let mut row = view.top_row;
-        while row <= new_row + 1 {
-            height += self.model.get_row_height(sheet, row)?;
-            row += 1;
-        }
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&self.model.view_id) {
-                view.row = new_row;
-                view.range = [new_row, view.column, new_row, view.column];
-                if height > window_height as f64 {
-                    view.top_row += 1;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    // TODO: This function should be memoized
-    /// Returns the x-coordinate of the cell in the top left corner
-    pub fn get_scroll_x(&self) -> Result<f64, String> {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            return Err("View not found".to_string());
-        };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-        let mut scroll_x = 0.0;
-        for column in 1..view.left_column {
-            scroll_x += self.model.get_column_width(sheet, column)?;
-        }
-        Ok(scroll_x)
-    }
-
-    // TODO: This function should be memoized
-    /// Returns the y-coordinate of the cell in the top left corner
-    pub fn get_scroll_y(&self) -> Result<f64, String> {
-        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-            view.sheet
-        } else {
-            return Err("View not found".to_string());
-        };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-        let mut scroll_y = 0.0;
-        for row in 1..view.top_row {
-            scroll_y += self.model.get_row_height(sheet, row)?;
-        }
-        Ok(scroll_y)
-    }
-
-    /// User presses page down.
-    /// The `top_row` is now the first row that is not fully visible
-    pub fn on_page_down(&mut self) -> Result<(), String> {
-        let (sheet, window_height) =
-            if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-                (view.sheet, view.window_height)
-            } else {
-                return Err("View not found".to_string());
-            };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-        let mut last_row = view.top_row;
-        let mut height = self.model.get_row_height(sheet, last_row)?;
-        while height <= window_height as f64 {
-            last_row += 1;
-            height += self.model.get_row_height(sheet, last_row)?;
-        }
-        if !is_valid_row(last_row) {
-            return Ok(());
-        }
-        let row_delta = view.row - view.top_row;
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&self.model.view_id) {
-                view.top_row = last_row;
-                view.row = view.top_row + row_delta;
-                view.range = [view.row, view.column, view.row, view.column];
-            }
-        }
-        Ok(())
-    }
-
-    /// On page up. tis needs to be the inverse of page down
-    pub fn on_page_up(&mut self) -> Result<(), String> {
-        let (sheet, window_height) =
-            if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-                (view.sheet, view.window_height as f64)
-            } else {
-                return Err("View not found".to_string());
-            };
-        let worksheet = match self.model.workbook.worksheet(sheet) {
-            Ok(s) => s,
-            Err(_) => return Err("Worksheet not found".to_string()),
-        };
-        let view = match worksheet.views.get(&self.model.view_id) {
-            Some(s) => s,
-            None => return Err("View not found".to_string()),
-        };
-
-        let mut first_row = view.top_row;
-        let mut height = self.model.get_row_height(sheet, first_row)?;
-        while height <= window_height && first_row > 1 {
-            first_row -= 1;
-            height += self.model.get_row_height(sheet, first_row)?;
-        }
-
-        let row_delta = view.row - view.top_row;
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&self.model.view_id) {
-                view.top_row = first_row;
-                view.row = view.top_row + row_delta;
-                view.range = [view.row, view.column, view.row, view.column];
-            }
-        }
-        Ok(())
-    }
-
-    /// We extend the selection to cell (target_row, target_column)
-    pub fn on_area_selecting(&mut self, target_row: i32, target_column: i32) -> Result<(), String> {
-        let (sheet, window_width, window_height) =
-            if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
-                (
-                    view.sheet,
-                    view.window_width as f64,
-                    view.window_height as f64,
-                )
-            } else {
-                return Ok(());
-            };
-        let (selected_row, selected_column, range, top_row, left_column) =
-            if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
-                if let Some(view) = worksheet.views.get(&self.model.view_id) {
-                    (
-                        view.row,
-                        view.column,
-                        view.range,
-                        view.top_row,
-                        view.left_column,
-                    )
-                } else {
-                    return Ok(());
-                }
-            } else {
-                return Ok(());
-            };
-        let [row_start, column_start, _row_end, _column_end] = range;
-
-        let mut new_left_column = left_column;
-        if target_column >= selected_column {
-            let mut width = 0.0;
-            let mut column = left_column;
-            while column <= target_column {
-                width += self.model.get_column_width(sheet, column)?;
-                column += 1;
-            }
-
-            while width > window_width {
-                width -= self.model.get_column_width(sheet, new_left_column)?;
-                new_left_column += 1;
-            }
-        } else if target_column < new_left_column {
-            new_left_column = target_column;
-        }
-        let mut new_top_row = top_row;
-        if target_row >= selected_row {
-            let mut height = 0.0;
-            let mut row = top_row;
-            while row <= target_row {
-                height += self.model.get_row_height(sheet, row)?;
-                row += 1;
-            }
-            while height > window_height {
-                height -= self.model.get_row_height(sheet, new_top_row)?;
-                new_top_row += 1;
-            }
-        } else if target_row < new_top_row {
-            new_top_row = target_row;
-        }
-
-        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
-            if let Some(view) = worksheet.views.get_mut(&self.model.view_id) {
-                view.range = [row_start, column_start, target_row, target_column];
-                if new_top_row != top_row {
-                    view.top_row = new_top_row;
-                }
-                if new_left_column != left_column {
-                    view.left_column = new_left_column;
-                }
-            }
-        }
-
-        Ok(())
-    }
-}

base/src/worksheet.rs

@@ -42,17 +42,7 @@ impl Worksheet {
         self.sheet_data.get_mut(&row)?.get_mut(&column)
     }
 
-    pub(crate) fn update_cell(
+    pub(crate) fn update_cell(&mut self, row: i32, column: i32, new_cell: Cell) {
-        &mut self,
-        row: i32,
-        column: i32,
-        new_cell: Cell,
-    ) -> Result<(), String> {
-        // validate row and column arg before updating cell of worksheet
-        if !is_valid_row(row) || !is_valid_column_number(column) {
-            return Err("Incorrect row or column".to_string());
-        }
-
         match self.sheet_data.get_mut(&row) {
             Some(column_data) => match column_data.get(&column) {
                 Some(_cell) => {
@@ -68,7 +58,6 @@ impl Worksheet {
                 self.sheet_data.insert(row, column_data);
             }
         }
-        Ok(())
     }
 
     // TODO [MVP]: Pass the cell style from the model
@@ -139,94 +128,53 @@ impl Worksheet {
         Ok(())
     }
 
-    pub fn set_cell_style(
+    pub fn set_cell_style(&mut self, row: i32, column: i32, style_index: i32) {
-        &mut self,
-        row: i32,
-        column: i32,
-        style_index: i32,
-    ) -> Result<(), String> {
         match self.cell_mut(row, column) {
             Some(cell) => {
                 cell.set_style(style_index);
             }
             None => {
-                self.cell_clear_contents_with_style(row, column, style_index)?;
+                self.cell_clear_contents_with_style(row, column, style_index);
             }
         }
-        Ok(())
 
         // TODO: cleanup check if the old cell style is still in use
     }
 
-    pub fn set_cell_with_formula(
+    pub fn set_cell_with_formula(&mut self, row: i32, column: i32, index: i32, style: i32) {
-        &mut self,
-        row: i32,
-        column: i32,
-        index: i32,
-        style: i32,
-    ) -> Result<(), String> {
         let cell = Cell::new_formula(index, style);
-        self.update_cell(row, column, cell)
+        self.update_cell(row, column, cell);
     }
 
-    pub fn set_cell_with_number(
+    pub fn set_cell_with_number(&mut self, row: i32, column: i32, value: f64, style: i32) {
-        &mut self,
-        row: i32,
-        column: i32,
-        value: f64,
-        style: i32,
-    ) -> Result<(), String> {
         let cell = Cell::new_number(value, style);
-        self.update_cell(row, column, cell)
+        self.update_cell(row, column, cell);
     }
 
-    pub fn set_cell_with_string(
+    pub fn set_cell_with_string(&mut self, row: i32, column: i32, index: i32, style: i32) {
-        &mut self,
-        row: i32,
-        column: i32,
-        index: i32,
-        style: i32,
-    ) -> Result<(), String> {
         let cell = Cell::new_string(index, style);
-        self.update_cell(row, column, cell)
+        self.update_cell(row, column, cell);
     }
 
-    pub fn set_cell_with_boolean(
+    pub fn set_cell_with_boolean(&mut self, row: i32, column: i32, value: bool, style: i32) {
-        &mut self,
-        row: i32,
-        column: i32,
-        value: bool,
-        style: i32,
-    ) -> Result<(), String> {
         let cell = Cell::new_boolean(value, style);
-        self.update_cell(row, column, cell)
+        self.update_cell(row, column, cell);
     }
 
-    pub fn set_cell_with_error(
+    pub fn set_cell_with_error(&mut self, row: i32, column: i32, error: Error, style: i32) {
-        &mut self,
-        row: i32,
-        column: i32,
-        error: Error,
-        style: i32,
-    ) -> Result<(), String> {
         let cell = Cell::new_error(error, style);
-        self.update_cell(row, column, cell)
+        self.update_cell(row, column, cell);
     }
 
-    pub fn cell_clear_contents(&mut self, row: i32, column: i32) -> Result<(), String> {
+    pub fn cell_clear_contents(&mut self, row: i32, column: i32) {
         let s = self.get_style(row, column);
         let cell = Cell::EmptyCell { s };
-        self.update_cell(row, column, cell)
+        self.update_cell(row, column, cell);
     }
 
-    pub fn cell_clear_contents_with_style(
+    pub fn cell_clear_contents_with_style(&mut self, row: i32, column: i32, style: i32) {
-        &mut self,
-        row: i32,
-        column: i32,
-        style: i32,
-    ) -> Result<(), String> {
         let cell = Cell::EmptyCell { s: style };
-        self.update_cell(row, column, cell)
+        self.update_cell(row, column, cell);
     }
 
     pub fn set_frozen_rows(&mut self, frozen_rows: i32) -> Result<(), String> {
@@ -446,7 +394,7 @@ impl Worksheet {
     }
 
     /// Calculates dimension of the sheet. This function isn't cheap to calculate.
-    pub fn dimension(&self) -> WorksheetDimension {
+    pub fn get_dimension(&self) -> WorksheetDimension {
         // FIXME: It's probably better to just track the size as operations happen.
         if self.sheet_data.is_empty() {
             return WorksheetDimension {

bindings/python/.gitignore

@@ -1,5 +0,0 @@
-target/*
-venv/*
-sphinx-venv/*
-html/*
-tests/__pycache*

bindings/python/Cargo.lock

@@ -1,884 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bumpalo"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets",
-]
-
-[[package]]
-name = "chrono-tz"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc529705a6e0028189c83f0a5dd9fb214105116f7e3c0eeab7ff0369766b0d1"
-dependencies = [
- "chrono",
- "chrono-tz-build",
- "phf",
-]
-
-[[package]]
-name = "chrono-tz-build"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751"
-dependencies = [
- "parse-zoneinfo",
- "phf",
- "phf_codegen",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
-[[package]]
-name = "flate2"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "indoc"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "ironcalc"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "ironcalc_base",
- "itertools",
- "roxmltree",
- "serde",
- "serde_json",
- "thiserror",
- "zip",
-]
-
-[[package]]
-name = "ironcalc_base"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "chrono-tz",
- "js-sys",
- "once_cell",
- "rand",
- "regex",
- "ryu",
- "serde",
- "serde_json",
- "serde_repr",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-
-[[package]]
-name = "js-sys"
-version = "0.3.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.150"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
-
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-
-[[package]]
-name = "memchr"
-version = "2.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parse-zoneinfo"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
-dependencies = [
- "regex",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "pyo3"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38"
-dependencies = [
- "cfg-if",
- "indoc",
- "libc",
- "memoffset",
- "parking_lot",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5"
-dependencies = [
- "once_cell",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pyroncalc"
-version = "0.1.0"
-dependencies = [
- "ironcalc",
- "pyo3",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "roxmltree"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671"
-dependencies = [
- "xmlparser",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "serde"
-version = "1.0.192"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.192"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.108"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "smallvec"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
-
-[[package]]
-name = "thiserror"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unindent"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "xmlparser"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
-
-[[package]]
-name = "zip"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
-dependencies = [
- "byteorder",
- "bzip2",
- "crc32fast",
- "flate2",
- "thiserror",
- "time",
-]

bindings/python/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "pyroncalc"
-version = "0.1.2"
-edition = "2021"
-
-
-[lib]
-name = "ironcalc"
-crate-type = ["cdylib"]
-
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-xlsx = { package= "ironcalc", path = "../../xlsx", version = "0.2.0" }
-pyo3 = { version = "0.22.3", features = ["extension-module"] }
-
-
-[features]
-extension-module = ["pyo3/extension-module"]
-default = ["extension-module"]
-
-[tool.maturin]
-features = ["pyo3/extension-module"]

bindings/python/LICENSE-Apache-2.0.md

@@ -1,191 +0,0 @@
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2023 EqualTo GmbH, 2023 Nicolás Hatcher
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

bindings/python/LICENSE-MIT.md

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2023 EqualTo GmbH, 2023 Nicolás Hatcher
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bindings/python/README.md

@@ -1,31 +0,0 @@
-# IronCalc python bindings
-
-With IronCalc you can create, read and manipulate xlsx files.
-You can manage sheets, add, remove, delete rename.
-You can add cell values, retrieve them and most importantly you can evaluate spreadsheets.
-
-## Installation
-
-```bash
-pip install ironcalc
-```
-
-
-
-
-## Compile and test
-
-To compile this and test it:
-
-```bash
-$ python3 -m venv venv
-$ source venv/bin/activate
-$ pip install maturin
-$ maturin develop
-$ cd examples
-examples $ python example.py
-```
-
-From there if you use `python` you can `import ironcalc`. You can either create a new file, read it from a JSON string or import from Excel.
-
-Hopefully the API is straightforward.

bindings/python/docs/conf.py

@@ -1,14 +0,0 @@
-
-project = 'IronCalc'
-author = 'Nicolás Hatcher'
-
-release = '0.1'
-version = '0.1.2'
-
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.napoleon']
-
-templates_path = ['_templates']
-
-exclude_patterns = []
-
-html_theme = 'alabaster'

bindings/python/docs/examples/simple.py

@@ -1,8 +0,0 @@
-import ironcalc as ic
-
-model = ic.create("model", "en", "UTC")
-
-model.set_user_input(0, 1, 1, "=21*2")
-model.evaluate()
-
-assert model.get_formatted_cell_value(0, 1, 1), 42

bindings/python/docs/index.rst

@@ -1,13 +0,0 @@
-IronCalc: The democratization of spreadsheets
-=============================================
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
-
-IronCalc is a spreadsheet engine that allows you to create, modify and safe spreadsheets.
-
-A simple example that creates a model, sets a formula, evaluates it and gets the result back:
-
-.. literalinclude:: examples/simple.py
-   :language: python

bindings/python/pyproject.toml

@@ -1,36 +0,0 @@
-[project]
-name = "ironcalc"
-version = "0.1.2"
-description = "Create, edit and evaluate Excel spreadsheets"
-requires-python = ">=3.10"
-keywords = [
-  "xlsx",
-  "spreadsheet",
-]
-classifiers = [
-  "License :: OSI Approved :: MIT License",
-  "License :: OSI Approved :: Apache Software License",
-  "Development Status :: 3 - Alpha",
-  "Intended Audience :: Developers",
-  "Operating System :: OS Independent",
-  "Programming Language :: Python :: 3",
-  "Topic :: Software Development :: Libraries",
-  "Topic :: Software Development :: Libraries :: Python Modules",
-  "Office/Business :: Financial :: Spreadsheet",
-]
-authors = [
-  { name = "Nicolás Hatcher", email = "nicolas@theuniverse.today" },
-]
-
-[project.urls]
-Homepage = "https://www.ironcalc.com/"
-Source = "https://github.com/ironcalc/ironcalc"
-Tracker = "https://github.com/ironcalc/ironcalc/issues"
-
-[build-system]
-requires = ["maturin>=1.0,<2.0"]
-build-backend = "maturin"
-
-
-[tool.maturin]
-features = ["pyo3/extension-module"]

bindings/python/run_examples.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Define the directory containing the Python files
-EXAMPLES_DIR="docs/examples"
-
-# Check if the directory exists
-if [ ! -d "$EXAMPLES_DIR" ]; then
-  echo "Directory $EXAMPLES_DIR does not exist."
-  exit 1
-fi
-
-# Iterate over all Python files in the examples directory
-for file in "$EXAMPLES_DIR"/*.py; do
-  # Check if there are any Python files
-  if [ -f "$file" ]; then
-    echo "Running $file..."
-    python "$file"
-    
-    # Check if the script ran successfully
-    if [ $? -ne 0 ]; then
-      echo "Error running $file"
-    else
-      echo "$file ran successfully"
-    fi
-  else
-    echo "No Python files found in $EXAMPLES_DIR"
-    exit 1
-  fi
-done

bindings/python/run_tests.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-python -m venv venv
-source venv/bin/activate
-# not sure why this is needed
-pip install patchelf
-pip install maturin
-pip install pytest
-maturin develop
-pytest tests/