diff options
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 89e96a33a..b96deb061 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -3,8 +3,8 @@ use lsp_types::{ | |||
3 | CodeActionResponse, CodeLens, Command, Diagnostic, DiagnosticSeverity, CodeAction, | 3 | CodeActionResponse, CodeLens, Command, Diagnostic, DiagnosticSeverity, CodeAction, |
4 | DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, | 4 | DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, |
5 | FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, | 5 | FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, |
6 | MarkupKind, ParameterInformation, ParameterLabel, Position, PrepareRenameResponse, Range, | 6 | MarkupKind, Position, PrepareRenameResponse, Range, |
7 | RenameParams, SignatureInformation, SymbolInformation, TextDocumentIdentifier, TextEdit, | 7 | RenameParams,SymbolInformation, TextDocumentIdentifier, TextEdit, |
8 | WorkspaceEdit, | 8 | WorkspaceEdit, |
9 | }; | 9 | }; |
10 | use ra_ide_api::{ | 10 | use ra_ide_api::{ |
@@ -403,26 +403,13 @@ pub fn handle_signature_help( | |||
403 | ) -> Result<Option<req::SignatureHelp>> { | 403 | ) -> Result<Option<req::SignatureHelp>> { |
404 | let position = params.try_conv_with(&world)?; | 404 | let position = params.try_conv_with(&world)?; |
405 | if let Some(call_info) = world.analysis().call_info(position)? { | 405 | if let Some(call_info) = world.analysis().call_info(position)? { |
406 | let parameters: Vec<ParameterInformation> = call_info | 406 | let active_parameter = call_info.active_parameter.map(|it| it as i64); |
407 | .parameters | 407 | let sig_info = call_info.signature.conv(); |
408 | .into_iter() | ||
409 | .map(|param| ParameterInformation { | ||
410 | label: ParameterLabel::Simple(param.clone()), | ||
411 | documentation: None, | ||
412 | }) | ||
413 | .collect(); | ||
414 | 408 | ||
415 | let documentation = call_info.doc.map(|it| it.conv()); | ||
416 | |||
417 | let sig_info = SignatureInformation { | ||
418 | label: call_info.label, | ||
419 | documentation, | ||
420 | parameters: Some(parameters), | ||
421 | }; | ||
422 | Ok(Some(req::SignatureHelp { | 409 | Ok(Some(req::SignatureHelp { |
423 | signatures: vec![sig_info], | 410 | signatures: vec![sig_info], |
424 | active_signature: Some(0), | 411 | active_signature: Some(0), |
425 | active_parameter: call_info.active_parameter.map(|it| it as i64), | 412 | active_parameter, |
426 | })) | 413 | })) |
427 | } else { | 414 | } else { |
428 | Ok(None) | 415 | Ok(None) |