leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement all modit motions required

Browse source
This commit is contained in:
Jeremy Soller 2023-11-12 19:01:20 -07:00
parent fbc33c183a
commit d001e5c09e
1 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/edit/vi.rs
View file

@ -344,6 +344,10 @@ impl<'a> Edit for ViEditor<'a> {
} }
Event::Motion(motion) => { Event::Motion(motion) => {
match motion { match motion {
Motion::Around => {
//TODO: what to do for this psuedo-motion?
return;
}
Motion::Down => Action::Down, Motion::Down => Action::Down,
Motion::End => Action::End, Motion::End => Action::End,
Motion::GotoLine(line) => Action::GotoLine(line.saturating_sub(1)), Motion::GotoLine(line) => Action::GotoLine(line.saturating_sub(1)),
@ -351,7 +355,15 @@ impl<'a> Edit for ViEditor<'a> {
Action::GotoLine(editor.buffer().lines.len().saturating_sub(1)) Action::GotoLine(editor.buffer().lines.len().saturating_sub(1))
} }
Motion::Home => Action::Home, Motion::Home => Action::Home,
Motion::Inside => {
//TODO: what to do for this psuedo-motion?
return;
}
Motion::Left => Action::Left, Motion::Left => Action::Left,
Motion::Line => {
//TODO: what to do for this psuedo-motion?
return;
}
Motion::NextChar(find_c) => { Motion::NextChar(find_c) => {
let mut cursor = editor.cursor(); let mut cursor = editor.cursor();
let buffer = editor.buffer(); let buffer = editor.buffer();
@ -448,6 +460,8 @@ impl<'a> Edit for ViEditor<'a> {
editor.set_cursor(cursor); editor.set_cursor(cursor);
return; return;
} }
Motion::PageDown => Action::PageDown,
Motion::PageUp => Action::PageUp,
Motion::PreviousChar(find_c) => { Motion::PreviousChar(find_c) => {
let mut cursor = editor.cursor(); let mut cursor = editor.cursor();
let buffer = editor.buffer(); let buffer = editor.buffer();
@ -556,12 +570,41 @@ impl<'a> Edit for ViEditor<'a> {
return; return;
} }
Motion::Right => Action::Right, Motion::Right => Action::Right,
Motion::SoftHome => Action::SoftHome, Motion::ScreenHigh => {
Motion::Up => Action::Up, //TODO: is this efficient?
_ => { if let Some(first) = editor.buffer().layout_runs().next() {
log::info!("TODO: {:?}", motion); Action::GotoLine(first.line_i)
} else {
return;
}
}
Motion::ScreenLow => {
//TODO: is this efficient?
if let Some(last) = editor.buffer().layout_runs().last() {
Action::GotoLine(last.line_i)
} else {
return;
}
}
Motion::ScreenMiddle => {
//TODO: is this efficient?
let mut layout_runs = editor.buffer().layout_runs();
if let Some(first) = layout_runs.next() {
if let Some(last) = layout_runs.last() {
Action::GotoLine((last.line_i + first.line_i) / 2)
} else {
return;
}
} else {
return;
}
}
Motion::Selection => {
//TODO: what to do for this psuedo-motion?
return; return;
} }
Motion::SoftHome => Action::SoftHome,
Motion::Up => Action::Up,
} }
} }
}; };