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

Completion: Render non-markdown docs too

Browse source
This commit is contained in:
Blaž Hrastnik 2021-05-30 00:26:27 +09:00
parent 2c48d65b15
commit 3810650a6b
1 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
helix-term/src/ui/completion.rs
View file

@ -230,32 +230,52 @@ impl Component for Completion {
// option.detail // option.detail
// --- // ---
// option.documentation // option.documentation
match &option.documentation {
Some(lsp::Documentation::String(s)) let doc = match &option.documentation {
Some(lsp::Documentation::String(contents))
| Some(lsp::Documentation::MarkupContent(lsp::MarkupContent { | Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
kind: lsp::MarkupKind::PlainText, kind: lsp::MarkupKind::PlainText,
value: s, value: contents,
})) => { })) => {
// TODO: convert to wrapped text // TODO: convert to wrapped text
let doc = s; Markdown::new(format!(
"```rust\n{}\n```\n{}",
option.detail.as_deref().unwrap_or_default(),
contents.clone()
))
} }
Some(lsp::Documentation::MarkupContent(lsp::MarkupContent { Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
kind: lsp::MarkupKind::Markdown, kind: lsp::MarkupKind::Markdown,
value: contents, value: contents,
})) => { })) => {
let doc = Markdown::new(contents.clone()); // TODO: set language based on doc scope
let half = area.height / 2; Markdown::new(format!(
let height = 15.min(half); "```rust\n{}\n```\n{}",
// -2 to subtract command line + statusline. a bit of a hack, because of splits. option.detail.as_deref().unwrap_or_default(),
let area = Rect::new(0, area.height - height - 2, area.width, height); contents.clone()
))
// clear area
let background = cx.editor.theme.get("ui.popup");
surface.clear_with(area, background);
doc.render(area, surface, cx);
} }
None => (), None if option.detail.is_some() => {
} // TODO: copied from above
// TODO: set language based on doc scope
Markdown::new(format!(
"```rust\n{}\n```",
option.detail.as_deref().unwrap_or_default(),
))
}
None => return,
};
let half = area.height / 2;
let height = 15.min(half);
// -2 to subtract command line + statusline. a bit of a hack, because of splits.
let area = Rect::new(0, area.height - height - 2, area.width, height);
// clear area
let background = cx.editor.theme.get("ui.popup");
surface.clear_with(area, background);
doc.render(area, surface, cx);
} }
} }
} }