language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Take number of arguments at the call-site into account for signature help

Browse source 
Fixes #1065
This commit is contained in:
kjeremy 2019-03-27 10:00:51 -04:00
parent eeb21dc8cc
commit 7b34c4c002
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/ra_ide_api/src/call_info.rs
View file

@ -28,6 +28,7 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
let function = hir::source_binder::function_from_source(db, symbol.file_id, fn_def)?; let function = hir::source_binder::function_from_source(db, symbol.file_id, fn_def)?;
let mut call_info = CallInfo::new(db, function, fn_def)?; let mut call_info = CallInfo::new(db, function, fn_def)?;
// If we have a calling expression let's find which argument we are on // If we have a calling expression let's find which argument we are on
let num_params = call_info.parameters.len(); let num_params = call_info.parameters.len();
let has_self = fn_def.param_list().and_then(|l| l.self_param()).is_some(); let has_self = fn_def.param_list().and_then(|l| l.self_param()).is_some();
@ -38,7 +39,15 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
} }
} else if num_params > 1 { } else if num_params > 1 {
// Count how many parameters into the call we are. // Count how many parameters into the call we are.
if let Some(ref arg_list) = calling_node.arg_list() { if let Some(arg_list) = calling_node.arg_list() {
// Number of arguments specified at the caller site
let mut num_args_of_call = arg_list.args().count();
// If we are calling a method account for the `self` argument.
if has_self {
num_args_of_call = num_args_of_call + 1;
}
let arg_list_range = arg_list.syntax().range(); let arg_list_range = arg_list.syntax().range();
if !arg_list_range.contains_inclusive(position.offset) { if !arg_list_range.contains_inclusive(position.offset) {
tested_by!(call_info_bad_offset); tested_by!(call_info_bad_offset);
@ -49,6 +58,7 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
.args() .args()
.position(|arg| arg.syntax().range().contains(position.offset)) .position(|arg| arg.syntax().range().contains(position.offset))
.or(Some(num_params - 1)) .or(Some(num_params - 1))
.min(Some(num_args_of_call))
.unwrap(); .unwrap();
call_info.active_parameter = Some(param); call_info.active_parameter = Some(param);
@ -155,6 +165,17 @@ fn bar() { foo(3, <|>); }"#,
assert_eq!(info.active_parameter, Some(1)); assert_eq!(info.active_parameter, Some(1));
} }
#[test]
fn test_fn_signature_two_args_empty() {
let info = call_info(
r#"fn foo(x: u32, y: u32) -> u32 {x + y}
fn bar() { foo(<|>); }"#,
);
assert_eq!(info.parameters, vec!("x".to_string(), "y".to_string()));
assert_eq!(info.active_parameter, Some(0));
}
#[test] #[test]
fn test_fn_signature_for_impl() { fn test_fn_signature_for_impl() {
let info = call_info( let info = call_info(