suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle c-n, c-p, etc. autocompletion events.

pull/11/head
Blaž Hrastnik 2021-04-06 15:34:33 +09:00
parent 95d0bba81a
commit 7c44443994
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helix-term/src/ui/completion.rs
View File

@ -131,7 +131,7 @@ impl Completion {
let cursor = doc.selection(view.id).cursor(); let cursor = doc.selection(view.id).cursor();
if self.trigger_offset <= cursor { if self.trigger_offset <= cursor {
let fragment = doc.text().slice(self.trigger_offset..=cursor); let fragment = doc.text().slice(self.trigger_offset..cursor);
let text = Cow::from(fragment); let text = Cow::from(fragment);
// TODO: logic is same as ui/picker // TODO: logic is same as ui/picker
menu.score(&text); menu.score(&text);

48
helix-term/src/ui/editor.rs
View File

@ -500,7 +500,7 @@ impl Component for EditorView {
cx.editor.resize(Rect::new(0, 0, width, height - 1)); cx.editor.resize(Rect::new(0, 0, width, height - 1));
EventResult::Consumed(None) EventResult::Consumed(None)
} }
Event::Key(event) => { Event::Key(key) => {
let (view, doc) = cx.editor.current(); let (view, doc) = cx.editor.current();
let mode = doc.mode(); let mode = doc.mode();
@ -519,24 +519,50 @@ impl Component for EditorView {
if let Some(on_next_key) = self.on_next_key.take() { if let Some(on_next_key) = self.on_next_key.take() {
// if there's a command waiting input, do that first // if there's a command waiting input, do that first
on_next_key(&mut cxt, event); on_next_key(&mut cxt, key);
} else { } else {
match mode { match mode {
Mode::Insert => { Mode::Insert => {
// record last_insert key // record last_insert key
self.last_insert.1.push(event); self.last_insert.1.push(key);
self.insert_mode(&mut cxt, event);
// let completion swallow the event if necessary
let mut consumed = false;
if let Some(completion) = &mut self.completion { if let Some(completion) = &mut self.completion {
completion.update(&mut cxt); // use a fake context here
if completion.is_empty() { let mut cx = Context {
self.completion = None; editor: cxt.editor,
callbacks: cxt.callbacks,
executor: cx.executor,
scroll: None,
};
let res = completion.handle_event(event, &mut cx);
if let EventResult::Consumed(callback) = res {
consumed = true;
if callback.is_some() {
// assume close_fn
self.completion = None;
}
}
}
// if completion didn't take the event, we pass it onto commands
if !consumed {
self.insert_mode(&mut cxt, key);
// lastly we recalculate completion
if let Some(completion) = &mut self.completion {
completion.update(&mut cxt);
if completion.is_empty() {
self.completion = None;
}
// TODO: if exiting InsertMode, remove completion
} }
// TODO: if exiting InsertMode, remove completion
} }
} }
mode => self.command_mode(mode, &mut cxt, event), mode => self.command_mode(mode, &mut cxt, key),
} }
} }
self.on_next_key = cxt.on_next_key_callback.take(); self.on_next_key = cxt.on_next_key_callback.take();
@ -554,7 +580,7 @@ impl Component for EditorView {
// how we entered insert mode is important, and we should track that so // how we entered insert mode is important, and we should track that so
// we can repeat the side effect. // we can repeat the side effect.
self.last_insert.0 = self.keymap[&mode][&event]; self.last_insert.0 = self.keymap[&mode][&key];
self.last_insert.1.clear(); self.last_insert.1.clear();
}; };