From 9b2f2fbbc36695bb02f230ac7cbbc3f9e6b333ae Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Sat, 14 Dec 2024 08:09:20 -0500 Subject: [PATCH] chore: renames and other housekeeping --- src/ui/cmd.rs | 4 ++-- src/ui/mod.rs | 2 +- src/ui/test.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/cmd.rs b/src/ui/cmd.rs index f6d7b31..edaeed3 100644 --- a/src/ui/cmd.rs +++ b/src/ui/cmd.rs @@ -5,7 +5,7 @@ use slice_utils::{Measured, Peekable, Seekable, Span, StrCursor}; #[derive(Debug, PartialEq, Eq)] pub enum Cmd<'a> { Write(Option<&'a str>), - InsertRow(usize), + InsertRows(usize), InsertColumns(usize), RenameSheet(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 `?"); } let arg = input.span(0..).trim(); - return Ok(Some(Cmd::InsertRow(if arg.is_empty() { + return Ok(Some(Cmd::InsertRows(if arg.is_empty() { 1 } else { if let Ok(count) = arg.parse() { diff --git a/src/ui/mod.rs b/src/ui/mod.rs index d013e9a..bc208c9 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -425,7 +425,7 @@ impl<'ws> Workspace<'ws> { self.book.evaluate(); Ok(None) } - Ok(Some(Cmd::InsertRow(count))) => { + Ok(Some(Cmd::InsertRows(count))) => { self.book.insert_rows(self.book.location.row, count)?; self.book.evaluate(); Ok(None) diff --git a/src/ui/test.rs b/src/ui/test.rs index 47ed76e..fce996e 100644 --- a/src/ui/test.rs +++ b/src/ui/test.rs @@ -35,7 +35,7 @@ fn test_insert_rows_cmd() { let output = result.unwrap(); assert!(output.is_some()); let cmd = output.unwrap(); - assert_eq!(cmd, Cmd::InsertRow(1)); + assert_eq!(cmd, Cmd::InsertRows(1)); } #[test] @@ -46,7 +46,7 @@ fn test_insert_rows_cmd_short() { let output = result.unwrap(); assert!(output.is_some()); let cmd = output.unwrap(); - assert_eq!(cmd, Cmd::InsertRow(1)); + assert_eq!(cmd, Cmd::InsertRows(1)); } #[test]