git.iko.soy/helix
on master help sign in
Refactor our Markdown construction in completion doc
0f844efGokul Soumya
helix-term/src/ui/completion.rs+13−27
compare with master
unifiedsplit
@@ -399,6 +399,16 @@ impl Component for Completion {
399 .expect("cursor must be in view");
399 .expect("cursor must be in view");
400 let cursor_pos = coords.row as u16;
400 let cursor_pos = coords.row as u16;
401
401
402+ let markdowned = |lang: &str, detail: Option<&str>, doc: Option<&str>| {
403+ let md = match (detail, doc) {
404+ (Some(detail), Some(doc)) => format!("```{lang}\n{detail}\n```\n{doc}"),
405+ (Some(detail), None) => format!("```{lang}\n{detail}\n```"),
406+ (None, Some(doc)) => doc.to_string(),
407+ (None, None) => String::new(),
408+ };
409+ Markdown::new(md, cx.editor.syn_loader.clone())
410+ };
411+
402 let mut markdown_doc = match &option.documentation {
412 let mut markdown_doc = match &option.documentation {
403 Some(lsp::Documentation::String(contents))
413 Some(lsp::Documentation::String(contents))
404 | Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
414 | Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
@@ -406,42 +416,18 @@ impl Component for Completion {
406 value: contents,
416 value: contents,
407 })) => {
417 })) => {
408 // TODO: convert to wrapped text
418 // TODO: convert to wrapped text
409− Markdown::new(
410− format!(
411− "```{}\n{}\n```\n{}",
412− language,
413− option.detail.as_deref().unwrap_or_default(),
419+ markdowned(language, option.detail.as_deref(), Some(contents))
414− contents
415− ),
416− cx.editor.syn_loader.clone(),
417− )
418 }
420 }
419 Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
421 Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
420 kind: lsp::MarkupKind::Markdown,
422 kind: lsp::MarkupKind::Markdown,
421 value: contents,
423 value: contents,
422 })) => {
424 })) => {
423 // TODO: set language based on doc scope
425 // TODO: set language based on doc scope
424− if let Some(detail) = &option.detail.as_deref() {
426+ markdowned(language, option.detail.as_deref(), Some(contents))
425− Markdown::new(
426− format!("```{}\n{}\n```\n{}", language, detail, contents),
427− cx.editor.syn_loader.clone(),
428− )
429− } else {
430− Markdown::new(contents.to_string(), cx.editor.syn_loader.clone())
431− }
432 }
427 }
433 None if option.detail.is_some() => {
428 None if option.detail.is_some() => {
434− // TODO: copied from above
435−
436 // TODO: set language based on doc scope
429 // TODO: set language based on doc scope
437− Markdown::new(
438− format!(
439− "```{}\n{}\n```",
440− language,
441− option.detail.as_deref().unwrap_or_default(),
430+ markdowned(language, option.detail.as_deref(), None)
442− ),
443− cx.editor.syn_loader.clone(),
444− )
445 }
431 }
446 None => return,
432 None => return,
447 };
433 };