Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix diagnostic for method calls

Browse source
This commit is contained in:
Jonas Schievink 2020-07-09 15:51:32 +02:00
parent d04f3604d5
commit 3ce4407dcb
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_hir_ty/src/expr.rs
View file

@ -157,18 +157,23 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
return Some(()); return Some(());
} }
let is_method_call;
let (callee, args) = match expr { let (callee, args) = match expr {
Expr::Call { callee, args } => { Expr::Call { callee, args } => {
is_method_call = false;
let callee = &self.infer.type_of_expr[*callee]; let callee = &self.infer.type_of_expr[*callee];
let (callable, _) = callee.as_callable()?; let (callable, _) = callee.as_callable()?;
let callee = match callable { let callee = match callable {
CallableDef::FunctionId(func) => func, CallableDef::FunctionId(func) => func,
// FIXME: Handle tuple struct/variant constructor calls.
_ => return None, _ => return None,
}; };
(callee, args.clone()) (callee, args.clone())
} }
Expr::MethodCall { receiver, args, .. } => { Expr::MethodCall { receiver, args, .. } => {
is_method_call = true;
let callee = self.infer.method_resolution(call_id)?; let callee = self.infer.method_resolution(call_id)?;
let mut args = args.clone(); let mut args = args.clone();
args.insert(0, *receiver); args.insert(0, *receiver);
@ -182,15 +187,19 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
let params = ast.value.param_list()?; let params = ast.value.param_list()?;
let mut param_count = params.params().count(); let mut param_count = params.params().count();
let mut arg_count = args.len();
if params.self_param().is_some() { if params.self_param().is_some() {
param_count += 1; param_count += 1;
} }
let arg_count = args.len();
if arg_count != param_count { if arg_count != param_count {
let (_, source_map): (Arc<Body>, Arc<BodySourceMap>) = let (_, source_map) = db.body_with_source_map(self.func.into());
db.body_with_source_map(self.func.into());
if let Ok(source_ptr) = source_map.expr_syntax(call_id) { if let Ok(source_ptr) = source_map.expr_syntax(call_id) {
if is_method_call {
param_count -= 1;
arg_count -= 1;
}
self.sink.push(MismatchedArgCount { self.sink.push(MismatchedArgCount {
file: source_ptr.file_id, file: source_ptr.file_id,
call_expr: source_ptr.value, call_expr: source_ptr.value,