mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Plaintext textDocument/hover

Browse Source
This commit is contained in:
vsrs 2021-10-29 18:22:48 +03:00
parent 057558b756
commit 2f862cd6fe
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/rust-analyzer/src/cli/lsif.rs
View File

@ -136,6 +136,7 @@ impl LsifManager<'_> {
result: lsp_types::Hover {
contents: lsp_types::HoverContents::Markup(to_proto::markup_content(
hover.markup,
ide::HoverDocFormat::Markdown,
)),
range: None,
},

7
crates/rust-analyzer/src/handlers.rs
View File

@ -920,9 +920,14 @@ pub(crate) fn handle_hover(
let line_index = snap.file_line_index(file_range.file_id)?;
let range = to_proto::range(&line_index, info.range);
let markup_kind =
snap.config.hover().documentation.map_or(ide::HoverDocFormat::Markdown, |kind| kind);
let hover = lsp_ext::Hover {
hover: lsp_types::Hover {
contents: HoverContents::Markup(to_proto::markup_content(info.info.markup)),
contents: HoverContents::Markup(to_proto::markup_content(
info.info.markup,
markup_kind,
)),
range: Some(range),
},
actions: if snap.config.hover_actions().none() {

11
crates/rust-analyzer/src/to_proto.rs
View File

@ -1202,9 +1202,16 @@ pub(crate) fn reference_title(count: usize) -> String {
}
}
pub(crate) fn markup_content(markup: Markup) -> lsp_types::MarkupContent {
pub(crate) fn markup_content(
markup: Markup,
kind: ide::HoverDocFormat,
) -> lsp_types::MarkupContent {
let kind = match kind {
ide::HoverDocFormat::Markdown => lsp_types::MarkupKind::Markdown,
ide::HoverDocFormat::PlainText => lsp_types::MarkupKind::PlainText,
};
let value = crate::markdown::format_docs(markup.as_str());
lsp_types::MarkupContent { kind: lsp_types::MarkupKind::Markdown, value }
lsp_types::MarkupContent { kind, value }
}
pub(crate) fn rename_error(err: RenameError) -> crate::LspError {