user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #501

Browse source 
501: Switch hover to use MarkupContent r=matklad a=kjeremy

MarkedString is deprecated

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2019-01-12 11:02:42 +00:00
commit e9e397e705
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -4,7 +4,7 @@ use gen_lsp_server::ErrorCode;
use languageserver_types::{
CodeActionResponse, Command, Diagnostic, DiagnosticSeverity, DocumentFormattingParams,
DocumentHighlight, DocumentSymbol, Documentation, FoldingRange, FoldingRangeKind,
FoldingRangeParams, Hover, HoverContents, Location, MarkedString, MarkupContent, MarkupKind,
FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, MarkupKind,
ParameterInformation, ParameterLabel, Position, PrepareRenameResponse, Range, RenameParams,
SignatureInformation, SymbolInformation, TextDocumentIdentifier, TextEdit, WorkspaceEdit,
};
@ -515,7 +515,10 @@ pub fn handle_hover(
let line_index = world.analysis.file_line_index(position.file_id);
let range = info.range.conv_with(&line_index);
let res = Hover {
contents: HoverContents::Scalar(MarkedString::String(info.info)),
contents: HoverContents::Markup(MarkupContent {
kind: MarkupKind::Markdown,
value: info.info,
}),
range: Some(range),
};
Ok(Some(res))