kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

completion: Don't panic on timeout/no result, just do nothing.

Browse source
This commit is contained in:
Blaž Hrastnik 2021-01-06 13:44:29 +09:00
parent 3cbab20908
commit 6ec0f8e80f
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
helix-term/src/commands.rs
View file

@ -851,31 +851,35 @@ pub fn completion(cx: &mut Context) {
.timeout(Duration::from_secs(2)), .timeout(Duration::from_secs(2)),
) )
.expect("completion failed!") .expect("completion failed!")
.expect("completion failed!"); .unwrap_or_default(); // if timeout, just return
let picker = ui::Picker::new( // TODO: if no completion, show some message or something
res, if !res.is_empty() {
|item| { let picker = ui::Picker::new(
// format_fn res,
item.label.as_str().into() |item| {
// format_fn
item.label.as_str().into()
// TODO: use item.filter_text for filtering // TODO: use item.filter_text for filtering
}, },
|editor: &mut Editor, item| { |editor: &mut Editor, item| {
// if item.text_edit is Some we use that, else // if item.text_edit is Some we use that, else
// let insert_text = &item.insert_text.unwrap_or(item.label); // let insert_text = &item.insert_text.unwrap_or(item.label);
// and we insert at position. // and we insert at position.
// //
// merge this with additional_text_edits // merge this with additional_text_edits
}, },
); );
cx.callback = Some(Box::new( cx.callback = Some(Box::new(
move |compositor: &mut Compositor, editor: &mut Editor| { move |compositor: &mut Compositor, editor: &mut Editor| {
compositor.push(Box::new(picker)); compositor.push(Box::new(picker));
}, },
)); ));
// TODO: when iterating over items, show the docs in popup // TODO!: when iterating over items, show the docs in popup
// language server client needs to be accessible via a registry of some sort
// language server client needs to be accessible via a registry of some sort
}
} }