zaphar/sheetsui
1
0
Fork 0
mirror of https://github.com/zaphar/sheetsui.git synced 2025-07-28 07:49:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: zaphar:c758f65a5cf87a4121abc9f0583363b89f4fbdb4
Branches Tags
zaphar:main
zaphar:clipboard
zaphar:help_styling
zaphar:help_commands
zaphar:exporting
zaphar:save_prompt
zaphar:dialog_scrolling
zaphar:cell_styling
zaphar:address_refactor
zaphar:help
zaphar:user_model
zaphar:cell_operations
zaphar:documentation
zaphar:range_copy
zaphar:user_manual
..
compare: zaphar:f8faeacf39e471a28b6d1d3f09d8107e8c4f754f
Branches Tags
zaphar:clipboard
zaphar:main
zaphar:help_styling
zaphar:help_commands
zaphar:exporting
zaphar:save_prompt
zaphar:dialog_scrolling
zaphar:cell_styling
zaphar:address_refactor
zaphar:help
zaphar:user_model
zaphar:cell_operations
zaphar:documentation
zaphar:range_copy
zaphar:user_manual

No commits in common. "c758f65a5cf87a4121abc9f0583363b89f4fbdb4" and "f8faeacf39e471a28b6d1d3f09d8107e8c4f754f" have entirely different histories.
c758f65a5c ... f8faeacf39

3 changed files with 5 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
src/ui/cmd.rs
View File

@ -5,7 +5,7 @@ use slice_utils::{Measured, Peekable, Seekable, Span, StrCursor};
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub enum Cmd<'a> { pub enum Cmd<'a> {
Write(Option<&'a str>), Write(Option<&'a str>),
InsertRows(usize), InsertRow(usize),
InsertColumns(usize), InsertColumns(usize),
RenameSheet(Option<usize>, &'a str), RenameSheet(Option<usize>, &'a str),
NewSheet(Option<&'a str>), NewSheet(Option<&'a str>),
@ -155,7 +155,7 @@ fn try_consume_insert_row<'cmd, 'i: 'cmd>(
return Err("Invalid command: Did you mean to type `insert-rows <arg>`?"); return Err("Invalid command: Did you mean to type `insert-rows <arg>`?");
} }
let arg = input.span(0..).trim(); let arg = input.span(0..).trim();
return Ok(Some(Cmd::InsertRows(if arg.is_empty() { return Ok(Some(Cmd::InsertRow(if arg.is_empty() {
1 1
} else { } else {
if let Ok(count) = arg.parse() { if let Ok(count) = arg.parse() {

7
src/ui/mod.rs
View File

@ -425,7 +425,7 @@ impl<'ws> Workspace<'ws> {
self.book.evaluate(); self.book.evaluate();
Ok(None) Ok(None)
} }
Ok(Some(Cmd::InsertRows(count))) => { Ok(Some(Cmd::InsertRow(count))) => {
self.book.insert_rows(self.book.location.row, count)?; self.book.insert_rows(self.book.location.row, count)?;
self.book.evaluate(); self.book.evaluate();
Ok(None) Ok(None)
@ -657,11 +657,6 @@ impl<'ws> Workspace<'ws> {
KeyCode::Char('s') if key.modifiers == KeyModifiers::CONTROL => { KeyCode::Char('s') if key.modifiers == KeyModifiers::CONTROL => {
self.save_file()?; self.save_file()?;
} }
KeyCode::Char('s') if key.modifiers != KeyModifiers::CONTROL => {
self.book.clear_current_cell()?;
self.text_area = reset_text_area(String::new());
self.enter_edit_mode();
}
KeyCode::Char('r') if key.modifiers == KeyModifiers::CONTROL => { KeyCode::Char('r') if key.modifiers == KeyModifiers::CONTROL => {
self.enter_range_select_mode(); self.enter_range_select_mode();
} }

4
src/ui/test.rs
View File

@ -35,7 +35,7 @@ fn test_insert_rows_cmd() {
let output = result.unwrap(); let output = result.unwrap();
assert!(output.is_some()); assert!(output.is_some());
let cmd = output.unwrap(); let cmd = output.unwrap();
assert_eq!(cmd, Cmd::InsertRows(1)); assert_eq!(cmd, Cmd::InsertRow(1));
} }
#[test] #[test]
@ -46,7 +46,7 @@ fn test_insert_rows_cmd_short() {
let output = result.unwrap(); let output = result.unwrap();
assert!(output.is_some()); assert!(output.is_some());
let cmd = output.unwrap(); let cmd = output.unwrap();
assert_eq!(cmd, Cmd::InsertRows(1)); assert_eq!(cmd, Cmd::InsertRow(1));
} }
#[test] #[test]