git.iko.soy/helix
on master help sign in
completion: Don't panic on timeout/no result, just do nothing.
6ec0f8eBlaž Hrastnik
helix-term/src/commands.rs+28−24
compare with master
unifiedsplit
@@ -851,31 +851,35 @@ pub fn completion(cx: &mut Context) {
851 .timeout(Duration::from_secs(2)),
851 .timeout(Duration::from_secs(2)),
852 )
852 )
853 .expect("completion failed!")
853 .expect("completion failed!")
854− .expect("completion failed!");
854+ .unwrap_or_default(); // if timeout, just return
855+
856+ // TODO: if no completion, show some message or something
857+ if !res.is_empty() {
858+ let picker = ui::Picker::new(
859+ res,
860+ |item| {
861+ // format_fn
862+ item.label.as_str().into()
863+
864+ // TODO: use item.filter_text for filtering
865+ },
866+ |editor: &mut Editor, item| {
867+ // if item.text_edit is Some we use that, else
868+ // let insert_text = &item.insert_text.unwrap_or(item.label);
869+ // and we insert at position.
870+ //
871+ // merge this with additional_text_edits
872+ },
873+ );
855
874
856− let picker = ui::Picker::new(
875+ cx.callback = Some(Box::new(
857− res,
876+ move |compositor: &mut Compositor, editor: &mut Editor| {
858− |item| {
877+ compositor.push(Box::new(picker));
859− // format_fn
878+ },
860− item.label.as_str().into()
879+ ));
861
880
862− // TODO: use item.filter_text for filtering
881+ // TODO!: when iterating over items, show the docs in popup
863− },
864− |editor: &mut Editor, item| {
865− // if item.text_edit is Some we use that, else
866− // let insert_text = &item.insert_text.unwrap_or(item.label);
867− // and we insert at position.
868− //
869− // merge this with additional_text_edits
870− },
871− );
872
882
873− cx.callback = Some(Box::new(
874− move |compositor: &mut Compositor, editor: &mut Editor| {
875− compositor.push(Box::new(picker));
876− },
877− ));
878−
879− // TODO: when iterating over items, show the docs in popup
880− // language server client needs to be accessible via a registry of some sort
883+ // language server client needs to be accessible via a registry of some sort
884+ }
881}
885}