Oliver/neoscim
1
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases Wiki Activity

closes #1

Browse Source
This commit is contained in:
Rushmore75
2025-11-10 16:21:23 -07:00
parent 6ed6cbfd62
commit 7c453f5d6a
2 changed files with 131 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
src/app/mode.rs
View File

@@ -6,7 +6,7 @@ use ratatui::{
widgets::{Paragraph, Widget},
};
use crate::app::app::App;
use crate::app::{self, app::App};
pub enum Mode {
Insert(Editor),
@@ -35,52 +35,107 @@ impl Display for Mode {
}
impl Mode {
pub fn process_key(app: &mut App, key: char) {
match key {
// <
'h' => {
app.grid.selected_cell.0 = app.grid.selected_cell.0.saturating_sub(1);
return;
}
// v
'j' => {
app.grid.selected_cell.1 = app.grid.selected_cell.1.saturating_add(1);
return;
}
// ^
'k' => {
app.grid.selected_cell.1 = app.grid.selected_cell.1.saturating_sub(1);
return;
}
// >
'l' => {
app.grid.selected_cell.0 = app.grid.selected_cell.0.saturating_add(1);
return;
}
_ => {}
}
if let Mode::Normal = app.mode {
match key {
// edit cell
'i' | 'a' => {
let (x, y) = app.grid.selected_cell;
let val = app.grid.get_cell_raw(x, y).as_ref().map(|f| f.as_raw_string()).unwrap_or(String::new());
app.mode = Mode::Insert(Editor::new(val, (x, y)));
pub fn process_cmd(app: &mut App) {
if let Mode::Command(editor) = &mut app.mode {
// [':', 'q']
match editor.as_string().as_bytes()[1] as char {
'w' => {
if let Some(file) = &app.file {
unimplemented!("Figure out how we want to save Grid to a csv or something")
} else {
// TODO figure out how to get an error message to the user
}
}
'I' => { /* insert col before */ }
'A' => { /* insert col after */ }
'o' => { /* insert row below */ }
'O' => { /* insert row above */ }
'v' => app.mode = Mode::Visual(app.grid.selected_cell),
':' => app.mode = Mode::Command(Chord::new(':')),
// loose chars will put you into chord mode
c => app.mode = Mode::Chord(Chord::new(c)),
'q' => app.exit = true,
_ => {}
}
}
}
pub fn process_key(app: &mut App, key: char) {
match &mut app.mode {
// FIXME this will break visual movement
Mode::Normal => {
match key {
// <
'h' => {
app.grid.selected_cell.0 = app.grid.selected_cell.0.saturating_sub(1);
return;
}
// v
'j' => {
app.grid.selected_cell.1 = app.grid.selected_cell.1.saturating_add(1);
return;
}
// ^
'k' => {
app.grid.selected_cell.1 = app.grid.selected_cell.1.saturating_sub(1);
return;
}
// >
'l' => {
app.grid.selected_cell.0 = app.grid.selected_cell.0.saturating_add(1);
return;
}
'0' => {
app.grid.selected_cell.0 = 0;
return;
}
// edit cell
'i' | 'a' => {
let (x, y) = app.grid.selected_cell;
let val =
app.grid.get_cell_raw(x, y).as_ref().map(|f| f.as_raw_string()).unwrap_or(String::new());
app.mode = Mode::Insert(Editor::new(val, (x, y)));
}
'I' => { /* insert col before */ }
'A' => { /* insert col after */ }
'o' => { /* insert row below */ }
'O' => { /* insert row above */ }
'v' => app.mode = Mode::Visual(app.grid.selected_cell),
':' => app.mode = Mode::Command(Chord::new(':')),
// loose chars will put you into chord mode
c => app.mode = Mode::Chord(Chord::new(c)),
}
}
Mode::Chord(chord) => {
chord.add_char(key);
match chord.as_string()[0..chord.as_string().len() - 1].parse::<usize>() {
// For chords that can take a numeric input
Ok(num) => match key {
'G' => {
let sel = app.grid.selected_cell;
app.grid.selected_cell = (sel.0, num);
app.mode = Mode::Normal;
}
_ => {
if key.is_alphabetic() {
app.mode = Mode::Normal;
for _ in 0..num {
Mode::process_key(app, key);
}
}
}
},
Err(_) => match chord.as_string().as_str() {
"d " | "dw" => {
let loc = app.grid.selected_cell;
app.grid.set_cell_raw(loc, String::new());
app.mode = Mode::Normal;
}
"gg" => {
app.grid.selected_cell.1 = 0;
app.mode = Mode::Normal;
}
_ => {}
},
}
}
_ => todo!(),
}
}
}
pub struct Editor {