zaphar/sheetsui
1
0
Fork 0
mirror of https://github.com/zaphar/sheetsui.git synced 2025-07-22 21:09:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cargo fmt

Browse Source
This commit is contained in:
Jeremy Wall 2025-03-14 18:31:47 -04:00
parent f3f18da254
commit 3c23142f32
7 changed files with 383 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/book/test.rs
View File

@ -36,8 +36,15 @@ fn test_book_default() {
#[test] #[test]
fn test_book_insert_cell_new_row() { fn test_book_insert_cell_new_row() {
let mut book = Book::default(); let mut book = Book::default();
book.update_cell(&Address { sheet: 0, row: 2, col: 1 }, "1") book.update_cell(
.expect("failed to edit cell"); &Address {
sheet: 0,
row: 2,
col: 1,
},
"1",
)
.expect("failed to edit cell");
book.evaluate(); book.evaluate();
let WorksheetDimension { let WorksheetDimension {
min_row, min_row,
@ -52,8 +59,15 @@ fn test_book_insert_cell_new_row() {
#[test] #[test]
fn test_book_insert_cell_new_column() { fn test_book_insert_cell_new_column() {
let mut book = Book::default(); let mut book = Book::default();
book.update_cell(&Address { sheet: 0, row: 1, col: 2 }, "1") book.update_cell(
.expect("failed to edit cell"); &Address {
sheet: 0,
row: 1,
col: 2,
},
"1",
)
.expect("failed to edit cell");
let WorksheetDimension { let WorksheetDimension {
min_row, min_row,
max_row, max_row,
@ -67,14 +81,32 @@ fn test_book_insert_cell_new_column() {
#[test] #[test]
fn test_book_insert_rows() { fn test_book_insert_rows() {
let mut book = Book::default(); let mut book = Book::default();
book.update_cell(&Address { sheet: 0, row: 2, col: 2 }, "1") book.update_cell(
.expect("failed to edit cell"); &Address {
book.move_to(&Address { sheet: 0, row: 2, col: 2 }) sheet: 0,
.expect("Failed to move to location"); row: 2,
col: 2,
},
"1",
)
.expect("failed to edit cell");
book.move_to(&Address {
sheet: 0,
row: 2,
col: 2,
})
.expect("Failed to move to location");
assert_eq!((2, 2), book.get_size().expect("Failed to get size")); assert_eq!((2, 2), book.get_size().expect("Failed to get size"));
book.insert_rows(1, 5).expect("Failed to insert rows"); book.insert_rows(1, 5).expect("Failed to insert rows");
assert_eq!((7, 2), book.get_size().expect("Failed to get size")); assert_eq!((7, 2), book.get_size().expect("Failed to get size"));
assert_eq!(Address { sheet: 0, row: 7, col: 2 }, book.location); assert_eq!(
Address {
sheet: 0,
row: 7,
col: 2
},
book.location
);
assert_eq!( assert_eq!(
"1", "1",
book.get_current_cell_rendered() book.get_current_cell_rendered()
@ -85,14 +117,32 @@ fn test_book_insert_rows() {
#[test] #[test]
fn test_book_insert_columns() { fn test_book_insert_columns() {
let mut book = Book::default(); let mut book = Book::default();
book.update_cell(&Address { sheet: 0, row: 2, col: 2 }, "1") book.update_cell(
.expect("failed to edit cell"); &Address {
book.move_to(&Address { sheet: 0, row: 2, col: 2 }) sheet: 0,
.expect("Failed to move to location"); row: 2,
col: 2,
},
"1",
)
.expect("failed to edit cell");
book.move_to(&Address {
sheet: 0,
row: 2,
col: 2,
})
.expect("Failed to move to location");
assert_eq!((2, 2), book.get_size().expect("Failed to get size")); assert_eq!((2, 2), book.get_size().expect("Failed to get size"));
book.insert_columns(1, 5).expect("Failed to insert rows"); book.insert_columns(1, 5).expect("Failed to insert rows");
assert_eq!((2, 7), book.get_size().expect("Failed to get size")); assert_eq!((2, 7), book.get_size().expect("Failed to get size"));
assert_eq!(Address { sheet: 0, row: 2, col: 7 }, book.location); assert_eq!(
Address {
sheet: 0,
row: 2,
col: 7
},
book.location
);
assert_eq!( assert_eq!(
"1", "1",
book.get_current_cell_rendered() book.get_current_cell_rendered()
@ -103,8 +153,15 @@ fn test_book_insert_columns() {
#[test] #[test]
fn test_book_col_size() { fn test_book_col_size() {
let mut book = Book::default(); let mut book = Book::default();
book.update_cell(&Address { sheet: 0, row: 2, col: 2 }, "1") book.update_cell(
.expect("failed to edit cell"); &Address {
sheet: 0,
row: 2,
col: 2,
},
"1",
)
.expect("failed to edit cell");
book.set_col_size(1, 20).expect("Failed to set column size"); book.set_col_size(1, 20).expect("Failed to set column size");
assert_eq!(20, book.get_col_size(1).expect("Failed to get column size")); assert_eq!(20, book.get_col_size(1).expect("Failed to get column size"));
} }
@ -112,17 +169,34 @@ fn test_book_col_size() {
#[test] #[test]
fn test_book_get_exportable_rows() { fn test_book_get_exportable_rows() {
let mut book = Book::default(); let mut book = Book::default();
book.update_cell(&Address { sheet: 0, row: 1, col: 3 }, "1-3") book.update_cell(
.expect("failed to edit cell"); &Address {
book.update_cell(&Address { sheet: 0, row: 3, col: 6 }, "3-6") sheet: 0,
.expect("failed to edit cell"); row: 1,
col: 3,
},
"1-3",
)
.expect("failed to edit cell");
book.update_cell(
&Address {
sheet: 0,
row: 3,
col: 6,
},
"3-6",
)
.expect("failed to edit cell");
let rows = book.get_export_rows().expect("Failed to get export rows"); let rows = book.get_export_rows().expect("Failed to get export rows");
assert_eq!(4, rows.len()); assert_eq!(4, rows.len());
assert_eq!(rows, vec![ assert_eq!(
vec!["", "" , "", "", "", "", ""], rows,
vec!["", "" , "", "1-3", "", "", ""], vec![
vec!["", "" , "", "", "", "", ""], vec!["", "", "", "", "", "", ""],
vec!["", "" , "", "", "", "", "3-6"], vec!["", "", "", "1-3", "", "", ""],
]); vec!["", "", "", "", "", "", ""],
vec!["", "", "", "", "", "", "3-6"],
]
);
} }

78
src/ui/mod.rs
View File

@ -7,13 +7,16 @@ use anyhow::{anyhow, Result};
use crossterm::event::{self, Event, KeyCode, KeyEventKind, KeyModifiers}; use crossterm::event::{self, Event, KeyCode, KeyEventKind, KeyModifiers};
use ironcalc::base::{expressions::types::Area, Model}; use ironcalc::base::{expressions::types::Area, Model};
use ratatui::{ use ratatui::{
buffer::Buffer, layout::{Constraint, Flex, Layout}, style::{Modifier, Style}, widgets::Block buffer::Buffer,
layout::{Constraint, Flex, Layout},
style::{Modifier, Style},
widgets::Block,
}; };
use tui_prompts::{State, Status, TextPrompt, TextState}; use tui_prompts::{State, Status, TextPrompt, TextState};
use tui_textarea::{CursorMove, TextArea}; use tui_textarea::{CursorMove, TextArea};
mod help;
mod cmd; mod cmd;
mod help;
pub mod render; pub mod render;
#[cfg(test)] #[cfg(test)]
mod test; mod test;
@ -332,16 +335,16 @@ impl<'ws> Workspace<'ws> {
fn handle_quit_dialog(&mut self, key: event::KeyEvent) -> Result<Option<ExitCode>> { fn handle_quit_dialog(&mut self, key: event::KeyEvent) -> Result<Option<ExitCode>> {
if key.kind == KeyEventKind::Press { if key.kind == KeyEventKind::Press {
match key.code { match key.code {
KeyCode::Esc | KeyCode::Char('n') | KeyCode::Char('N') => { KeyCode::Esc | KeyCode::Char('n') | KeyCode::Char('N') => {
self.exit_quit_mode()?; self.exit_quit_mode()?;
return Ok(Some(ExitCode::SUCCESS)) return Ok(Some(ExitCode::SUCCESS));
}, }
KeyCode::Char('y') | KeyCode::Char('Y') => { KeyCode::Char('y') | KeyCode::Char('Y') => {
// We have been asked to save the file first. // We have been asked to save the file first.
self.save_file()?; self.save_file()?;
self.exit_quit_mode()?; self.exit_quit_mode()?;
return Ok(Some(ExitCode::SUCCESS)); return Ok(Some(ExitCode::SUCCESS));
}, }
_ => return Ok(None), _ => return Ok(None),
} }
} }
@ -428,7 +431,8 @@ impl<'ws> Workspace<'ws> {
Ok(None) Ok(None)
} }
Ok(Some(Cmd::ExportCsv(path))) => { Ok(Some(Cmd::ExportCsv(path))) => {
self.book.save_sheet_to_csv(self.book.location.sheet, path)?; self.book
.save_sheet_to_csv(self.book.location.sheet, path)?;
Ok(None) Ok(None)
} }
Ok(Some(Cmd::InsertColumns(count))) => { Ok(Some(Cmd::InsertColumns(count))) => {
@ -510,7 +514,10 @@ impl<'ws> Workspace<'ws> {
Ok(None) Ok(None)
} }
Ok(None) => { Ok(None) => {
self.enter_dialog_mode(Markdown::from_str(&format!("Unrecognized commmand {}", cmd_text))); self.enter_dialog_mode(Markdown::from_str(&format!(
"Unrecognized commmand {}",
cmd_text
)));
Ok(None) Ok(None)
} }
Err(msg) => { Err(msg) => {
@ -545,18 +552,12 @@ impl<'ws> Workspace<'ws> {
} }
KeyCode::Char('D') => { KeyCode::Char('D') => {
if let Some((start, end)) = self.state.range_select.get_range() { if let Some((start, end)) = self.state.range_select.get_range() {
self.book.clear_cell_range_all( self.book.clear_cell_range_all(start, end)?;
start,
end,
)?;
} }
} }
KeyCode::Char('d') => { KeyCode::Char('d') => {
if let Some((start, end)) = self.state.range_select.get_range() { if let Some((start, end)) = self.state.range_select.get_range() {
self.book.clear_cell_range( self.book.clear_cell_range(start, end)?;
start,
end,
)?;
} }
} }
KeyCode::Char('h') => { KeyCode::Char('h') => {
@ -777,7 +778,11 @@ impl<'ws> Workspace<'ws> {
} }
KeyCode::Char('l') if key.modifiers == KeyModifiers::CONTROL => { KeyCode::Char('l') if key.modifiers == KeyModifiers::CONTROL => {
self.run_with_prefix(|ws: &mut Workspace<'_>| -> Result<()> { self.run_with_prefix(|ws: &mut Workspace<'_>| -> Result<()> {
let Address { sheet: _, row: _, col } = &ws.book.location; let Address {
sheet: _,
row: _,
col,
} = &ws.book.location;
ws.book ws.book
.set_col_size(*col, ws.book.get_col_size(*col)? + 1)?; .set_col_size(*col, ws.book.get_col_size(*col)? + 1)?;
Ok(()) Ok(())
@ -785,7 +790,11 @@ impl<'ws> Workspace<'ws> {
} }
KeyCode::Char('h') if key.modifiers == KeyModifiers::CONTROL => { KeyCode::Char('h') if key.modifiers == KeyModifiers::CONTROL => {
self.run_with_prefix(|ws: &mut Workspace<'_>| -> Result<()> { self.run_with_prefix(|ws: &mut Workspace<'_>| -> Result<()> {
let Address { sheet: _, row: _, col } = &ws.book.location; let Address {
sheet: _,
row: _,
col,
} = &ws.book.location;
let curr_size = ws.book.get_col_size(*col)?; let curr_size = ws.book.get_col_size(*col)?;
if curr_size > 1 { if curr_size > 1 {
ws.book.set_col_size(*col, curr_size - 1)?; ws.book.set_col_size(*col, curr_size - 1)?;
@ -876,21 +885,31 @@ impl<'ws> Workspace<'ws> {
return Ok(None); return Ok(None);
} }
fn toggle_bool_style(&mut self, current_val: Option<bool>, path: &str, address: &Address) -> Result<(), anyhow::Error> { fn toggle_bool_style(
&mut self,
current_val: Option<bool>,
path: &str,
address: &Address,
) -> Result<(), anyhow::Error> {
let value = if let Some(b_val) = current_val { let value = if let Some(b_val) = current_val {
if b_val { "false" } else { "true" } if b_val {
"false"
} else {
"true"
}
} else { } else {
"true" "true"
}; };
self.book.set_cell_style( self.book.set_cell_style(
&[(path, value)], &[(path, value)],
&Area { &Area {
sheet: address.sheet, sheet: address.sheet,
row: address.row as i32, row: address.row as i32,
column: address.col as i32, column: address.col as i32,
width: 1, width: 1,
height: 1, height: 1,
})?; },
)?;
Ok(()) Ok(())
} }
@ -983,7 +1002,7 @@ impl<'ws> Workspace<'ws> {
self.state.pop_modality(); self.state.pop_modality();
Ok(None) Ok(None)
} }
fn exit_command_mode(&mut self) -> Result<Option<ExitCode>> { fn exit_command_mode(&mut self) -> Result<Option<ExitCode>> {
let cmd = self.state.command_state.value().to_owned(); let cmd = self.state.command_state.value().to_owned();
self.state.command_state.blur(); self.state.command_state.blur();
@ -1047,14 +1066,13 @@ impl<'ws> Workspace<'ws> {
self.book.save_to_xlsx(path.into().as_str())?; self.book.save_to_xlsx(path.into().as_str())?;
Ok(()) Ok(())
} }
fn quit_app(&mut self) -> std::result::Result<Option<ExitCode>, anyhow::Error> { fn quit_app(&mut self) -> std::result::Result<Option<ExitCode>, anyhow::Error> {
if self.enter_quit_mode() { if self.enter_quit_mode() {
return Ok(None); return Ok(None);
} }
return Ok(Some(ExitCode::SUCCESS)) return Ok(Some(ExitCode::SUCCESS));
} }
} }
fn load_book(path: &PathBuf, locale: &str, tz: &str) -> Result<Book, anyhow::Error> { fn load_book(path: &PathBuf, locale: &str, tz: &str) -> Result<Book, anyhow::Error> {

12
src/ui/render/dialog.rs
View File

@ -42,16 +42,22 @@ impl<'w> Widget for Dialog<'w> {
let content_width = self.content.width(); let content_width = self.content.width();
let content_height = self.content.height(); let content_height = self.content.height();
let vertical_margin = if ((content_height as u16) + 2) <= area.height { let vertical_margin = if ((content_height as u16) + 2) <= area.height {
area.height.saturating_sub((content_height as u16) + 2).saturating_div(2) area.height
.saturating_sub((content_height as u16) + 2)
.saturating_div(2)
} else { } else {
area.height - 2 area.height - 2
}; };
let horizontal_margin = area.width.saturating_sub((content_width as u16) + 2).saturating_div(2); let horizontal_margin = area
.width
.saturating_sub((content_width as u16) + 2)
.saturating_div(2);
let [_, dialog_vertical, _] = Layout::vertical(vec![ let [_, dialog_vertical, _] = Layout::vertical(vec![
Constraint::Length(vertical_margin), Constraint::Length(vertical_margin),
Constraint::Fill(1), Constraint::Fill(1),
Constraint::Length(vertical_margin), Constraint::Length(vertical_margin),
]).areas(area); ])
.areas(area);
let [_, dialog_area, _] = Layout::horizontal(vec![ let [_, dialog_area, _] = Layout::horizontal(vec![
Constraint::Length(horizontal_margin), Constraint::Length(horizontal_margin),
Constraint::Fill(1), Constraint::Fill(1),

12
src/ui/render/mod.rs
View File

@ -100,12 +100,18 @@ impl<'widget, 'ws: 'widget> Widget for &'widget mut Workspace<'ws> {
Self: Sized, Self: Sized,
{ {
if self.state.modality() == &Modality::Dialog { if self.state.modality() == &Modality::Dialog {
let lines = self.state.popup.as_ref().map(|md| md.get_text()).unwrap_or_else(|| Text::raw("Popup message here")); let lines = self
.state
.popup
.as_ref()
.map(|md| md.get_text())
.unwrap_or_else(|| Text::raw("Popup message here"));
let popup = dialog::Dialog::new(lines, "Help").scroll(self.state.dialog_scroll); let popup = dialog::Dialog::new(lines, "Help").scroll(self.state.dialog_scroll);
popup.render(area, buf); popup.render(area, buf);
} else if self.state.modality() == &Modality::Quit { } else if self.state.modality() == &Modality::Quit {
let popup = dialog::Dialog::new(Text::raw("File is not yet saved. Save it first?"), "Quit") let popup =
.with_bottom_title("Y/N"); dialog::Dialog::new(Text::raw("File is not yet saved. Save it first?"), "Quit")
.with_bottom_title("Y/N");
popup.render(area, buf); popup.render(area, buf);
} else { } else {
let outer_block = Block::bordered() let outer_block = Block::bordered()

28
src/ui/render/test.rs
View File

@ -14,8 +14,11 @@ fn test_viewport_get_visible_columns() {
let default_size = book.get_col_size(1).expect("Failed to get column size"); let default_size = book.get_col_size(1).expect("Failed to get column size");
let width = default_size * 12 / 2; let width = default_size * 12 / 2;
let app_state = AppState::default(); let app_state = AppState::default();
let viewport = Viewport::new(&book, Some(&app_state.range_select)) let viewport = Viewport::new(&book, Some(&app_state.range_select)).with_selected(Address {
.with_selected(Address { sheet: 0, row: 1, col: 17 }); sheet: 0,
row: 1,
col: 17,
});
let cols = viewport let cols = viewport
.get_visible_columns((width + 5) as u16, &mut state) .get_visible_columns((width + 5) as u16, &mut state)
.expect("Failed to get visible columns"); .expect("Failed to get visible columns");
@ -31,8 +34,11 @@ fn test_viewport_get_visible_rows() {
); );
let height = 6; let height = 6;
let app_state = AppState::default(); let app_state = AppState::default();
let viewport = Viewport::new(&book, Some(&app_state.range_select)) let viewport = Viewport::new(&book, Some(&app_state.range_select)).with_selected(Address {
.with_selected(Address { sheet: 0, row: 17, col: 1 }); sheet: 0,
row: 17,
col: 1,
});
let rows = viewport.get_visible_rows(height as u16, &mut state); let rows = viewport.get_visible_rows(height as u16, &mut state);
assert_eq!(height - 1, rows.len()); assert_eq!(height - 1, rows.len());
assert_eq!( assert_eq!(
@ -52,8 +58,11 @@ fn test_viewport_visible_columns_after_length_change() {
let width = default_size * 12 / 2; let width = default_size * 12 / 2;
{ {
let app_state = AppState::default(); let app_state = AppState::default();
let viewport = Viewport::new(&book, Some(&app_state.range_select)) let viewport = Viewport::new(&book, Some(&app_state.range_select)).with_selected(Address {
.with_selected(Address { sheet: 0, row: 1, col: 17 }); sheet: 0,
row: 1,
col: 17,
});
let cols = viewport let cols = viewport
.get_visible_columns((width + 5) as u16, &mut state) .get_visible_columns((width + 5) as u16, &mut state)
.expect("Failed to get visible columns"); .expect("Failed to get visible columns");
@ -65,8 +74,11 @@ fn test_viewport_visible_columns_after_length_change() {
.expect("Failed to set column size"); .expect("Failed to set column size");
{ {
let app_state = AppState::default(); let app_state = AppState::default();
let viewport = Viewport::new(&book, Some(&app_state.range_select)) let viewport = Viewport::new(&book, Some(&app_state.range_select)).with_selected(Address {
.with_selected(Address { sheet: 0, row: 1, col: 1 }); sheet: 0,
row: 1,
col: 1,
});
let cols = viewport let cols = viewport
.get_visible_columns((width + 5) as u16, &mut state) .get_visible_columns((width + 5) as u16, &mut state)
.expect("Failed to get visible columns"); .expect("Failed to get visible columns");

42
src/ui/render/viewport.rs
View File

@ -7,8 +7,8 @@ use ratatui::{
widgets::{Block, Cell, Row, StatefulWidget, Table, Widget}, widgets::{Block, Cell, Row, StatefulWidget, Table, Widget},
}; };
use crate::book;
use super::{Address, Book, RangeSelection}; use super::{Address, Book, RangeSelection};
use crate::book;
/// A visible column to show in our Viewport. /// A visible column to show in our Viewport.
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -150,7 +150,11 @@ impl<'ws> Viewport<'ws> {
|VisibleColumn { idx: ci, length: _ }| { |VisibleColumn { idx: ci, length: _ }| {
let content = self let content = self
.book .book
.get_cell_addr_rendered(&Address { row: ri, col: *ci, sheet: self.book.location.sheet}) .get_cell_addr_rendered(&Address {
row: ri,
col: *ci,
sheet: self.book.location.sheet,
})
.unwrap(); .unwrap();
self.compute_cell_style(ri, *ci, Cell::new(Text::raw(content))) self.compute_cell_style(ri, *ci, Cell::new(Text::raw(content)))
}, },
@ -192,29 +196,27 @@ impl<'ws> Viewport<'ws> {
mut cell: Cell<'widget>, mut cell: Cell<'widget>,
) -> Cell<'widget> { ) -> Cell<'widget> {
// TODO(zaphar): Should probably create somekind of formatter abstraction. // TODO(zaphar): Should probably create somekind of formatter abstraction.
if let Some(style) = self if let Some(style) = self.book.get_cell_style(&Address {
.book sheet: self.book.location.sheet,
.get_cell_style(&Address { sheet: self.book.location.sheet, row: ri, col: ci }) { row: ri,
col: ci,
}) {
cell = self.compute_cell_colors(&style, ri, ci, cell); cell = self.compute_cell_colors(&style, ri, ci, cell);
cell = if style.font.b { cell = if style.font.b { cell.bold() } else { cell };
cell.bold() cell = if style.font.i { cell.italic() } else { cell };
} else { cell };
cell = if style.font.i {
cell.italic()
} else { cell };
} }
cell cell
} }
fn compute_cell_colors<'widget>(&self, style: &ironcalc::base::types::Style, ri: usize, ci: usize, mut cell: Cell<'widget>) -> Cell<'widget> { fn compute_cell_colors<'widget>(
let bg_color = map_color( &self,
style.fill.bg_color.as_ref(), style: &ironcalc::base::types::Style,
Color::Rgb(35, 33, 54), ri: usize,
); ci: usize,
let fg_color = map_color( mut cell: Cell<'widget>,
style.fill.fg_color.as_ref(), ) -> Cell<'widget> {
Color::White, let bg_color = map_color(style.fill.bg_color.as_ref(), Color::Rgb(35, 33, 54));
); let fg_color = map_color(style.fill.fg_color.as_ref(), Color::White);
if let Some((start, end)) = &self.range_selection.map_or(None, |r| r.get_range()) { if let Some((start, end)) = &self.range_selection.map_or(None, |r| r.get_range()) {
if ri >= start.row && ri <= end.row && ci >= start.col && ci <= end.col { if ri >= start.row && ri <= end.row && ci >= start.col && ci <= end.col {
// This is a selected range // This is a selected range

209
src/ui/test.rs
View File

@ -554,9 +554,7 @@ fn test_range_copy() {
assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last()); assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last());
let address = Address::default(); let address = Address::default();
ws.book ws.book.move_to(&address).expect("Failed to move to row");
.move_to(&address)
.expect("Failed to move to row");
let original_loc = ws.book.location.clone(); let original_loc = ws.book.location.clone();
script() script()
.ctrl('r') .ctrl('r')
@ -576,7 +574,11 @@ fn test_range_copy() {
.run(&mut ws) .run(&mut ws)
.expect("Failed to handle key sequence"); .expect("Failed to handle key sequence");
assert_eq!( assert_eq!(
Some(Address { sheet: 0, row: 1, col: 2 }), Some(Address {
sheet: 0,
row: 1,
col: 2
}),
ws.state.range_select.start ws.state.range_select.start
); );
@ -588,18 +590,40 @@ fn test_range_copy() {
assert!(ws.state.range_select.original_location.is_none()); assert!(ws.state.range_select.original_location.is_none());
assert_eq!( assert_eq!(
Some(Address { sheet: 0, row: 1, col: 2 }), Some(Address {
sheet: 0,
row: 1,
col: 2
}),
ws.state.range_select.start ws.state.range_select.start
); );
assert_eq!(Some(Address { sheet: 0, row: 2, col: 2 }), ws.state.range_select.end); assert_eq!(
Some(Address {
sheet: 0,
row: 2,
col: 2
}),
ws.state.range_select.end
);
assert_eq!(original_loc, ws.book.location); assert_eq!(original_loc, ws.book.location);
assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last()); assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last());
ws.book ws.book
.move_to(&Address { sheet: 0, row: 5, col: 5 }) .move_to(&Address {
sheet: 0,
row: 5,
col: 5,
})
.expect("Failed to move to row"); .expect("Failed to move to row");
let original_loc_2 = ws.book.location.clone(); let original_loc_2 = ws.book.location.clone();
assert_eq!(Address { sheet: 0, row: 5, col: 5 }, original_loc_2); assert_eq!(
Address {
sheet: 0,
row: 5,
col: 5
},
original_loc_2
);
script() script()
.char('v') .char('v')
@ -619,7 +643,11 @@ fn test_range_copy() {
.run(&mut ws) .run(&mut ws)
.expect("Failed to handle key sequence"); .expect("Failed to handle key sequence");
assert_eq!( assert_eq!(
Some(Address { sheet: 0, row: 5, col: 5 }), Some(Address {
sheet: 0,
row: 5,
col: 5
}),
ws.state.range_select.start ws.state.range_select.start
); );
@ -631,11 +659,29 @@ fn test_range_copy() {
assert!(ws.state.range_select.original_location.is_none()); assert!(ws.state.range_select.original_location.is_none());
assert_eq!( assert_eq!(
Some(Address { sheet: 0, row: 5, col: 5 }), Some(Address {
sheet: 0,
row: 5,
col: 5
}),
ws.state.range_select.start ws.state.range_select.start
); );
assert_eq!(Some(Address { sheet: 0, row: 5, col: 4 }), ws.state.range_select.end); assert_eq!(
assert_eq!(Address { sheet: 0, row: 4, col: 5 }, ws.book.location); Some(Address {
sheet: 0,
row: 5,
col: 4
}),
ws.state.range_select.end
);
assert_eq!(
Address {
sheet: 0,
row: 4,
col: 5
},
ws.book.location
);
assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last()); assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last());
} }
@ -664,14 +710,28 @@ fn test_gg_movement() {
.char('j') .char('j')
.run(&mut ws) .run(&mut ws)
.expect("failed to handle event sequence"); .expect("failed to handle event sequence");
assert_eq!(ws.book.location, Address { sheet: 0, row: 3, col: 1 }); assert_eq!(
ws.book.location,
Address {
sheet: 0,
row: 3,
col: 1
}
);
script() script()
.char('l') .char('l')
.char('g') .char('g')
.char('g') .char('g')
.run(&mut ws) .run(&mut ws)
.expect("failed to handle event sequence"); .expect("failed to handle event sequence");
assert_eq!(ws.book.location, Address { sheet: 0, row: 1, col: 2 }); assert_eq!(
ws.book.location,
Address {
sheet: 0,
row: 1,
col: 2
}
);
} }
#[test] #[test]
@ -684,14 +744,28 @@ fn test_h_j_k_l_movement() {
.char('l') .char('l')
.run(&mut ws) .run(&mut ws)
.expect("failed to handle event sequence"); .expect("failed to handle event sequence");
assert_eq!(ws.book.location, Address { sheet: 0, row: 3, col: 2 }); assert_eq!(
ws.book.location,
Address {
sheet: 0,
row: 3,
col: 2
}
);
script() script()
.char('h') .char('h')
.char('2') .char('2')
.char('k') .char('k')
.run(&mut ws) .run(&mut ws)
.expect("failed to handle event sequence"); .expect("failed to handle event sequence");
assert_eq!(ws.book.location, Address { sheet: 0, row: 1, col: 1 }); assert_eq!(
ws.book.location,
Address {
sheet: 0,
row: 1,
col: 1
}
);
} }
macro_rules! assert_copy_paste { macro_rules! assert_copy_paste {
@ -930,8 +1004,16 @@ fn test_command_mode_enter() {
fn test_edit_mode_paste() { fn test_edit_mode_paste() {
let mut ws = new_workspace(); let mut ws = new_workspace();
assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last()); assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last());
ws.state.range_select.start = Some(Address { sheet: 0, row: 1, col: 1 }); ws.state.range_select.start = Some(Address {
ws.state.range_select.end = Some(Address { sheet: 0, row: 2, col: 2 }); sheet: 0,
row: 1,
col: 1,
});
ws.state.range_select.end = Some(Address {
sheet: 0,
row: 2,
col: 2,
});
script() script()
.char('e') .char('e')
.ctrl('p') .ctrl('p')
@ -979,8 +1061,16 @@ macro_rules! assert_range_clear {
($script : expr) => {{ ($script : expr) => {{
let mut ws = new_workspace(); let mut ws = new_workspace();
assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last()); assert_eq!(Some(&Modality::Navigate), ws.state.modality_stack.last());
let first_corner = Address { sheet: 0, row: 1, col: 1 }; let first_corner = Address {
let second_corner = Address { sheet: 0, row: 2, col: 2 }; sheet: 0,
row: 1,
col: 1,
};
let second_corner = Address {
sheet: 0,
row: 2,
col: 2,
};
ws.book ws.book
.update_cell(&first_corner, "foo") .update_cell(&first_corner, "foo")
.expect("Failed to update cell"); .expect("Failed to update cell");
@ -1050,7 +1140,14 @@ fn test_range_select_movement() {
.char('k') .char('k')
.run(&mut ws) .run(&mut ws)
.expect("failed to run script"); .expect("failed to run script");
assert_eq!(&Address { sheet: 0, row: 3, col: 3 }, &ws.book.location); assert_eq!(
&Address {
sheet: 0,
row: 3,
col: 3
},
&ws.book.location
);
script() script()
.ctrl('n') .ctrl('n')
.run(&mut ws) .run(&mut ws)
@ -1071,8 +1168,16 @@ fn test_range_select_clear_lower_d() {
macro_rules! assert_range_copy { macro_rules! assert_range_copy {
($script: expr) => {{ ($script: expr) => {{
let mut ws = new_workspace(); let mut ws = new_workspace();
let top_left_addr = Address { sheet: 0, row: 2, col: 2 }; let top_left_addr = Address {
let bot_right_addr = Address { sheet: 0, row: 4, col: 4 }; sheet: 0,
row: 2,
col: 2,
};
let bot_right_addr = Address {
sheet: 0,
row: 4,
col: 4,
};
ws.book ws.book
.update_cell(&top_left_addr, "top_left") .update_cell(&top_left_addr, "top_left")
.expect("Failed to update top left"); .expect("Failed to update top left");
@ -1111,7 +1216,11 @@ macro_rules! assert_range_copy {
.expect("Didn't find a start of range") .expect("Didn't find a start of range")
); );
assert_eq!( assert_eq!(
&Address { sheet: 0, row: 1, col: 1 }, &Address {
sheet: 0,
row: 1,
col: 1
},
ws.state ws.state
.range_select .range_select
.original_location .original_location
@ -1179,7 +1288,11 @@ fn test_extend_to_range() {
.expect("Unable to run script"); .expect("Unable to run script");
let extended_cell = ws let extended_cell = ws
.book .book
.get_cell_addr_contents(&Address { sheet: 0, row: 2, col: 1 }) .get_cell_addr_contents(&Address {
sheet: 0,
row: 2,
col: 1,
})
.expect("Failed to get cell contents"); .expect("Failed to get cell contents");
assert_eq!("=B2+1".to_string(), extended_cell); assert_eq!("=B2+1".to_string(), extended_cell);
} }
@ -1199,7 +1312,11 @@ fn test_color_cells() {
for ci in 1..=3 { for ci in 1..=3 {
let style = ws let style = ws
.book .book
.get_cell_style(&Address { sheet: ws.book.location.sheet, row: ri, col: ci }) .get_cell_style(&Address {
sheet: ws.book.location.sheet,
row: ri,
col: ci,
})
.expect("failed to get style"); .expect("failed to get style");
assert_eq!( assert_eq!(
"#800000", "#800000",
@ -1225,7 +1342,11 @@ fn test_color_row() {
for ci in [1, book::LAST_COLUMN] { for ci in [1, book::LAST_COLUMN] {
let style = ws let style = ws
.book .book
.get_cell_style(&Address { sheet: ws.book.location.sheet, row: 1, col: ci as usize }) .get_cell_style(&Address {
sheet: ws.book.location.sheet,
row: 1,
col: ci as usize,
})
.expect("failed to get style"); .expect("failed to get style");
assert_eq!( assert_eq!(
"#800000", "#800000",
@ -1250,7 +1371,11 @@ fn test_color_col() {
for ri in [1, book::LAST_ROW] { for ri in [1, book::LAST_ROW] {
let style = ws let style = ws
.book .book
.get_cell_style(&Address { sheet: ws.book.location.sheet, row: ri as usize, col: 1 }) .get_cell_style(&Address {
sheet: ws.book.location.sheet,
row: ri as usize,
col: 1,
})
.expect("failed to get style"); .expect("failed to get style");
assert_eq!( assert_eq!(
"#800000", "#800000",
@ -1268,7 +1393,11 @@ fn test_bold_text() {
let mut ws = new_workspace(); let mut ws = new_workspace();
let before_style = ws let before_style = ws
.book .book
.get_cell_style(&Address { sheet: 0, row: 1, col: 1 }) .get_cell_style(&Address {
sheet: 0,
row: 1,
col: 1,
})
.expect("Failed to get style"); .expect("Failed to get style");
assert!(!before_style.font.b); assert!(!before_style.font.b);
script() script()
@ -1277,7 +1406,11 @@ fn test_bold_text() {
.expect("Unable to run script"); .expect("Unable to run script");
let style = ws let style = ws
.book .book
.get_cell_style(&Address { sheet: 0, row: 1, col: 1 }) .get_cell_style(&Address {
sheet: 0,
row: 1,
col: 1,
})
.expect("Failed to get style"); .expect("Failed to get style");
assert!(style.font.b); assert!(style.font.b);
script() script()
@ -1292,7 +1425,11 @@ fn test_italic_text() {
let mut ws = new_workspace(); let mut ws = new_workspace();
let before_style = ws let before_style = ws
.book .book
.get_cell_style(&Address { sheet: 0, row: 1, col: 1 }) .get_cell_style(&Address {
sheet: 0,
row: 1,
col: 1,
})
.expect("Failed to get style"); .expect("Failed to get style");
assert!(!before_style.font.i); assert!(!before_style.font.i);
script() script()
@ -1301,7 +1438,11 @@ fn test_italic_text() {
.expect("Unable to run script"); .expect("Unable to run script");
let style = ws let style = ws
.book .book
.get_cell_style(&Address { sheet: 0, row: 1, col: 1 }) .get_cell_style(&Address {
sheet: 0,
row: 1,
col: 1,
})
.expect("Failed to get style"); .expect("Failed to get style");
assert!(style.font.i); assert!(style.font.i);
script() script()
@ -1331,7 +1472,7 @@ fn test_quit_dialog() {
.run(&mut ws) .run(&mut ws)
.expect("Failed to run input script"); .expect("Failed to run input script");
assert!(result.is_some()); assert!(result.is_some());
script() script()
.chars("efoo") .chars("efoo")
.enter() .enter()
@ -1344,7 +1485,7 @@ fn test_quit_dialog() {
.expect("Failed to run input script"); .expect("Failed to run input script");
assert!(!result.is_some()); assert!(!result.is_some());
assert_eq!(ws.state.modality(), &Modality::Quit); assert_eq!(ws.state.modality(), &Modality::Quit);
script() script()
.char('n') .char('n')
.run(&mut ws) .run(&mut ws)