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

Adapt to newer modit

Browse source
This commit is contained in:
Jeremy Soller 2023-11-08 11:57:02 -07:00
parent 7a4cf29d4d
commit aece6486b9
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/edit/vi.rs
View file

@ -182,6 +182,7 @@ impl<'a> Edit for ViEditor<'a> {
fn action(&mut self, font_system: &mut FontSystem, action: Action) { fn action(&mut self, font_system: &mut FontSystem, action: Action) {
let editor = &mut self.editor; let editor = &mut self.editor;
log::info!("Action {:?}", action);
let c = match action { let c = match action {
Action::Escape => modit::ESCAPE, Action::Escape => modit::ESCAPE,
Action::Insert(c) => c, Action::Insert(c) => c,
@ -192,18 +193,26 @@ impl<'a> Edit for ViEditor<'a> {
}; };
//TODO: redraw on parser mode change //TODO: redraw on parser mode change
self.parser.parse(c, false, |event| { self.parser.parse(c, false, |event| {
log::info!("{:?}", event); log::info!(" Event {:?}", event);
let action = match event { let action = match event {
Event::Redraw => {
editor.buffer_mut().set_redraw(true);
return;
}
Event::Backspace => Action::Backspace, Event::Backspace => Action::Backspace,
Event::Delete => Action::Delete, Event::Delete => Action::Delete,
Event::Down => Action::Down,
Event::End => Action::End,
Event::Escape => Action::Escape, Event::Escape => Action::Escape,
Event::Home => Action::Home,
Event::Insert(c) => Action::Insert(c), Event::Insert(c) => Action::Insert(c),
Event::Left => Action::Left,
Event::NewLine => Action::Enter, Event::NewLine => Action::Enter,
Event::Operator(count, operator, motion, text_object_opt) => { Event::Paste => {
log::info!("TODO");
return;
}
Event::Undo => {
log::info!("TODO");
return;
}
Event::Cmd(count, operator, motion, text_object_opt) => {
let start = editor.cursor(); let start = editor.cursor();
for _ in 0..count { for _ in 0..count {
@ -429,21 +438,6 @@ impl<'a> Edit for ViEditor<'a> {
println!("start {:?}, end {:?}", start, end); println!("start {:?}, end {:?}", start, end);
return; return;
} }
Event::Paste => {
log::info!("TODO");
return;
}
Event::Replace(char) => {
log::info!("TODO");
return;
}
Event::Right => Action::Right,
Event::SoftHome => Action::SoftHome,
Event::Undo => {
log::info!("TODO");
return;
}
Event::Up => Action::Up,
}; };
editor.action(font_system, action); editor.action(font_system, action);
}); });
@ -590,8 +584,7 @@ impl<'a> Edit for ViEditor<'a> {
false false
} else { } else {
match self.parser.mode { match self.parser.mode {
ViMode::Normal(_) => true, ViMode::Insert | ViMode::Replace => false,
ViMode::Insert => false,
_ => true, /*TODO: determine block cursor in other modes*/ _ => true, /*TODO: determine block cursor in other modes*/
} }
}; };