From ff0312fa32715ce42f134fd9f049c4df5956d042 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 16 Jul 2020 13:00:56 +0200 Subject: Semantical call info --- crates/ra_ide/src/call_hierarchy.rs | 10 +- crates/ra_ide/src/call_info.rs | 332 ++++++++++++------------ crates/ra_ide/src/completion/presentation.rs | 7 +- crates/ra_ide/src/display/function_signature.rs | 21 -- crates/ra_ide/src/inlay_hints.rs | 10 +- 5 files changed, 177 insertions(+), 203 deletions(-) (limited to 'crates/ra_ide') diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs index cb7e62cd6..6af251d23 100644 --- a/crates/ra_ide/src/call_hierarchy.rs +++ b/crates/ra_ide/src/call_hierarchy.rs @@ -95,9 +95,9 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio if let Some(func_target) = match &call_node { FnCallNode::CallExpr(expr) => { //FIXME: Type::as_callable is broken - let callable_def = sema.type_of_expr(&expr.expr()?)?.as_callable()?; - match callable_def { - hir::CallableDefId::FunctionId(it) => { + let callable = sema.type_of_expr(&expr.expr()?)?.as_callable(db)?; + match callable.kind() { + hir::CallableKind::Function(it) => { let fn_def: hir::Function = it.into(); let nav = fn_def.to_nav(db); Some(nav) @@ -109,10 +109,6 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio let function = sema.resolve_method_call(&expr)?; Some(function.to_nav(db)) } - FnCallNode::MacroCallExpr(macro_call) => { - let macro_def = sema.resolve_macro_call(¯o_call)?; - Some(macro_def.to_nav(db)) - } } { Some((func_target, name_ref.syntax().text_range())) } else { diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs index 1fe1c21de..a2d23b2ec 100644 --- a/crates/ra_ide/src/call_info.rs +++ b/crates/ra_ide/src/call_info.rs @@ -1,20 +1,41 @@ //! FIXME: write short doc here -use hir::Semantics; +use hir::{Docs, HirDisplay, Semantics, Type}; use ra_ide_db::RootDatabase; use ra_syntax::{ ast::{self, ArgListOwner}, - match_ast, AstNode, SyntaxNode, SyntaxToken, + match_ast, AstNode, SyntaxNode, SyntaxToken, TextRange, TextSize, }; +use stdx::format_to; use test_utils::mark; -use crate::{FilePosition, FunctionSignature}; +use crate::FilePosition; /// Contains information about a call site. Specifically the /// `FunctionSignature`and current parameter. #[derive(Debug)] pub struct CallInfo { - pub signature: FunctionSignature, + pub doc: Option, + pub signature: String, pub active_parameter: Option, + parameters: Vec, +} + +impl CallInfo { + pub fn parameter_labels(&self) -> impl Iterator + '_ { + self.parameters.iter().map(move |&it| &self.signature[it]) + } + pub fn parameter_ranges(&self) -> &[TextRange] { + &self.parameters + } + fn push_param(&mut self, param: &str) { + if !self.signature.ends_with('(') { + self.signature.push_str(", "); + } + let start = TextSize::of(&self.signature); + self.signature.push_str(param); + let end = TextSize::of(&self.signature); + self.parameters.push(TextRange::new(start, end)) + } } /// Computes parameter information for the given call expression. @@ -24,105 +45,127 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option Option { - call_info(db, position)?.into_active_parameter() + let mut res = + CallInfo { doc: None, signature: String::new(), parameters: vec![], active_parameter }; + + match callable.kind() { + hir::CallableKind::Function(func) => { + res.doc = func.docs(db).map(|it| it.as_str().to_string()); + format_to!(res.signature, "fn {}", func.name(db)); + } + hir::CallableKind::TupleStruct(strukt) => { + res.doc = strukt.docs(db).map(|it| it.as_str().to_string()); + format_to!(res.signature, "struct {}", strukt.name(db)); + } + hir::CallableKind::TupleEnumVariant(variant) => { + res.doc = variant.docs(db).map(|it| it.as_str().to_string()); + format_to!( + res.signature, + "enum {}::{}", + variant.parent_enum(db).name(db), + variant.name(db) + ); + } } - pub(crate) fn at_token(sema: &Semantics, token: SyntaxToken) -> Option { - call_info_for_token(sema, token)?.into_active_parameter() + res.signature.push('('); + { + if let Some(self_param) = callable.receiver_param(db) { + format_to!(res.signature, "{}", self_param) + } + let mut buf = String::new(); + for (pat, ty) in callable.params(db) { + buf.clear(); + if let Some(pat) = pat { + format_to!(buf, "{}: ", pat); + } + format_to!(buf, "{}", ty.display(db)); + res.push_param(&buf); + } } + res.signature.push(')'); + + match callable.kind() { + hir::CallableKind::Function(_) => { + let ret_type = callable.return_type(); + if !ret_type.is_unit() { + format_to!(res.signature, " -> {}", ret_type.display(db)); + } + } + hir::CallableKind::TupleStruct(_) | hir::CallableKind::TupleEnumVariant(_) => {} + } + Some(res) } -fn call_info_for_token(sema: &Semantics, token: SyntaxToken) -> Option { +fn call_info_impl( + sema: &Semantics, + token: SyntaxToken, +) -> Option<(hir::Callable, Option)> { // Find the calling expression and it's NameRef let calling_node = FnCallNode::with_node(&token.parent())?; - let signature = match &calling_node { - FnCallNode::CallExpr(call) => { - //FIXME: Type::as_callable is broken - let callable_def = sema.type_of_expr(&call.expr()?)?.as_callable()?; - match callable_def { - hir::CallableDefId::FunctionId(it) => { - let fn_def = it.into(); - FunctionSignature::from_hir(sema.db, fn_def) - } - hir::CallableDefId::StructId(it) => { - FunctionSignature::from_struct(sema.db, it.into())? - } - hir::CallableDefId::EnumVariantId(it) => { - FunctionSignature::from_enum_variant(sema.db, it.into())? - } - } - } - FnCallNode::MethodCallExpr(method_call) => { - let function = sema.resolve_method_call(&method_call)?; - FunctionSignature::from_hir(sema.db, function) - } - FnCallNode::MacroCallExpr(macro_call) => { - let macro_def = sema.resolve_macro_call(¯o_call)?; - FunctionSignature::from_macro(sema.db, macro_def)? + let callable = match &calling_node { + FnCallNode::CallExpr(call) => sema.type_of_expr(&call.expr()?)?.as_callable(sema.db)?, + FnCallNode::MethodCallExpr(call) => sema.resolve_method_call_as_callable(call)?, + }; + let active_param = if let Some(arg_list) = calling_node.arg_list() { + // Number of arguments specified at the call site + let num_args_at_callsite = arg_list.args().count(); + + let arg_list_range = arg_list.syntax().text_range(); + if !arg_list_range.contains_inclusive(token.text_range().start()) { + mark::hit!(call_info_bad_offset); + return None; } + let param = std::cmp::min( + num_args_at_callsite, + arg_list + .args() + .take_while(|arg| arg.syntax().text_range().end() <= token.text_range().start()) + .count(), + ); + + Some(param) + } else { + None }; + Some((callable, active_param)) +} - // If we have a calling expression let's find which argument we are on - let num_params = signature.parameters.len(); - - let active_parameter = match num_params { - 0 => None, - 1 if signature.has_self_param => None, - 1 => Some(0), - _ => { - if let Some(arg_list) = calling_node.arg_list() { - // Number of arguments specified at the call site - let num_args_at_callsite = arg_list.args().count(); - - let arg_list_range = arg_list.syntax().text_range(); - if !arg_list_range.contains_inclusive(token.text_range().start()) { - mark::hit!(call_info_bad_offset); - return None; - } +#[derive(Debug)] +pub(crate) struct ActiveParameter { + pub(crate) ty: Type, + pub(crate) name: String, +} - let mut param = std::cmp::min( - num_args_at_callsite, - arg_list - .args() - .take_while(|arg| { - arg.syntax().text_range().end() <= token.text_range().start() - }) - .count(), - ); - - // If we are in a method account for `self` - if signature.has_self_param { - param += 1; - } +impl ActiveParameter { + pub(crate) fn at(db: &RootDatabase, position: FilePosition) -> Option { + let sema = Semantics::new(db); + let file = sema.parse(position.file_id); + let file = file.syntax(); + let token = file.token_at_offset(position.offset).next()?; + let token = sema.descend_into_macros(token); + Self::at_token(&sema, token) + } - Some(param) - } else { - None - } - } - }; + pub(crate) fn at_token(sema: &Semantics, token: SyntaxToken) -> Option { + let (signature, active_parameter) = call_info_impl(&sema, token)?; - Some(CallInfo { signature, active_parameter }) + let idx = active_parameter?; + let mut params = signature.params(sema.db); + let (pat, ty) = params.swap_remove(idx); + let name = pat?.to_string(); + Some(ActiveParameter { ty, name }) + } } #[derive(Debug)] pub(crate) enum FnCallNode { CallExpr(ast::CallExpr), MethodCallExpr(ast::MethodCallExpr), - MacroCallExpr(ast::MacroCall), } impl FnCallNode { @@ -138,7 +181,6 @@ impl FnCallNode { } Some(FnCallNode::MethodCallExpr(it)) }, - ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)), _ => None, } } @@ -150,7 +192,6 @@ impl FnCallNode { match node { ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)), ast::MethodCallExpr(it) => Some(FnCallNode::MethodCallExpr(it)), - ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)), _ => None, } } @@ -166,8 +207,6 @@ impl FnCallNode { FnCallNode::MethodCallExpr(call_expr) => { call_expr.syntax().children().filter_map(ast::NameRef::cast).next() } - - FnCallNode::MacroCallExpr(call_expr) => call_expr.path()?.segment()?.name_ref(), } } @@ -175,21 +214,10 @@ impl FnCallNode { match self { FnCallNode::CallExpr(expr) => expr.arg_list(), FnCallNode::MethodCallExpr(expr) => expr.arg_list(), - FnCallNode::MacroCallExpr(_) => None, } } } -impl CallInfo { - fn into_active_parameter(self) -> Option { - let idx = self.active_parameter?; - let ty = self.signature.parameter_types.get(idx)?.clone(); - let name = self.signature.parameter_names.get(idx)?.clone(); - let res = ActiveParameter { ty, name }; - Some(res) - } -} - #[cfg(test)] mod tests { use expect::{expect, Expect}; @@ -202,20 +230,18 @@ mod tests { let call_info = analysis.call_info(position).unwrap(); let actual = match call_info { Some(call_info) => { - let docs = match &call_info.signature.doc { + let docs = match &call_info.doc { None => "".to_string(), Some(docs) => format!("{}\n------\n", docs.as_str()), }; let params = call_info - .signature - .parameters - .iter() + .parameter_labels() .enumerate() .map(|(i, param)| { if Some(i) == call_info.active_parameter { format!("<{}>", param) } else { - param.clone() + param.to_string() } }) .collect::>() @@ -296,10 +322,8 @@ fn foo(x: T, y: U) -> u32 fn bar() { foo(<|>3, ); } "#, expect![[r#" - fn foo(x: T, y: U) -> u32 - where T: Copy + Display, - U: Debug - (, y: U) + fn foo(x: i32, y: {unknown}) -> u32 + (, y: {unknown}) "#]], ); } @@ -312,8 +336,7 @@ fn foo() -> T where T: Copy + Display {} fn bar() { foo(<|>); } "#, expect![[r#" - fn foo() -> T - where T: Copy + Display + fn foo() -> {unknown} () "#]], ); @@ -323,11 +346,14 @@ fn bar() { foo(<|>); } fn test_fn_signature_for_impl() { check( r#" -struct F; impl F { pub fn new() { F{}} } -fn bar() {let _ : F = F::new(<|>);} +struct F; +impl F { pub fn new() { } } +fn bar() { + let _ : F = F::new(<|>); +} "#, expect![[r#" - pub fn new() + fn new() () "#]], ); @@ -346,8 +372,8 @@ fn bar() { } "#, expect![[r#" - pub fn do_it(&self) - (&self) + fn do_it(&self) + () "#]], ); } @@ -365,8 +391,8 @@ fn bar() { } "#, expect![[r#" - pub fn do_it(&self, x: i32) - (&self, ) + fn do_it(&self, x: i32) + () "#]], ); } @@ -425,7 +451,7 @@ pub fn do() { assert_eq!(6, my_crate::add_one(5)); ``` ------ - pub fn add_one(x: i32) -> i32 + fn add_one(x: i32) -> i32 () "##]], ); @@ -467,7 +493,7 @@ pub fn do_it() { assert_eq!(6, my_crate::add_one(5)); ``` ------ - pub fn add_one(x: i32) -> i32 + fn add_one(x: i32) -> i32 () "##]], ); @@ -505,8 +531,8 @@ pub fn foo(mut r: WriteHandler<()>) { By default this method stops actor's `Context`. ------ - fn finished(&mut self, ctx: &mut Self::Context) - (&mut self, ) + fn finished(&mut self, ctx: &mut {unknown}) + () "#]], ); } @@ -539,7 +565,7 @@ fn main() { "#, expect![[r#" fn bar(&self, _: u32) - (&self, <_: u32>) + (<_: u32>) "#]], ); } @@ -549,15 +575,15 @@ fn main() { check( r#" /// A cool tuple struct -struct TS(u32, i32); +struct S(u32, i32); fn main() { - let s = TS(0, <|>); + let s = S(0, <|>); } "#, expect![[r#" A cool tuple struct ------ - struct TS(u32, i32) -> TS + struct S(u32, i32) (u32, ) "#]], ); @@ -567,31 +593,18 @@ fn main() { fn generic_struct() { check( r#" -struct TS(T); +struct S(T); fn main() { - let s = TS(<|>); + let s = S(<|>); } "#, expect![[r#" - struct TS(T) -> TS - () + struct S({unknown}) + (<{unknown}>) "#]], ); } - #[test] - fn cant_call_named_structs() { - check( - r#" -struct TS { x: u32, y: i32 } -fn main() { - let s = TS(<|>); -} -"#, - expect![[""]], - ); - } - #[test] fn works_for_enum_variants() { check( @@ -612,27 +625,19 @@ fn main() { expect![[r#" A Variant ------ - E::A(0: i32) - (<0: i32>) + enum E::A(i32) + () "#]], ); } #[test] - fn cant_call_enum_records() { + fn cant_call_struct_record() { check( r#" -enum E { - /// A Variant - A(i32), - /// Another - B, - /// And C - C { a: i32, b: i32 } -} - +struct S { x: u32, y: i32 } fn main() { - let a = E::C(<|>); + let s = S(<|>); } "#, expect![[""]], @@ -640,24 +645,23 @@ fn main() { } #[test] - fn fn_signature_for_macro() { + fn cant_call_enum_record() { check( r#" -/// empty macro -macro_rules! foo { - () => {} +enum E { + /// A Variant + A(i32), + /// Another + B, + /// And C + C { a: i32, b: i32 } } -fn f() { - foo!(<|>); +fn main() { + let a = E::C(<|>); } "#, - expect![[r#" - empty macro - ------ - foo!() - () - "#]], + expect![[""]], ); } diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs index 64349dcb8..e6b4737aa 100644 --- a/crates/ra_ide/src/completion/presentation.rs +++ b/crates/ra_ide/src/completion/presentation.rs @@ -329,15 +329,10 @@ pub(crate) fn compute_score( ty: &Type, name: &str, ) -> Option { - // FIXME: this should not fall back to string equality. - let ty = &ty.display(ctx.db).to_string(); let (active_name, active_type) = if let Some(record_field) = &ctx.record_field_syntax { mark::hit!(record_field_type_match); let (struct_field, _local) = ctx.sema.resolve_record_field(record_field)?; - ( - struct_field.name(ctx.db).to_string(), - struct_field.signature_ty(ctx.db).display(ctx.db).to_string(), - ) + (struct_field.name(ctx.db).to_string(), struct_field.signature_ty(ctx.db)) } else if let Some(active_parameter) = &ctx.active_parameter { mark::hit!(active_param_type_match); (active_parameter.name.clone(), active_parameter.ty.clone()) diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs index 1d39544d3..709a85f65 100644 --- a/crates/ra_ide/src/display/function_signature.rs +++ b/crates/ra_ide/src/display/function_signature.rs @@ -149,27 +149,6 @@ impl FunctionSignature { has_self_param: false, }) } - - pub(crate) fn from_macro(db: &RootDatabase, macro_def: hir::MacroDef) -> Option { - let node: ast::MacroCall = macro_def.source(db).value; - - let params = vec![]; - - Some(FunctionSignature { - kind: CallableKind::Macro, - visibility: None, - qualifier: Default::default(), - name: node.name().map(|n| n.text().to_string()), - ret_type: None, - parameters: params, - parameter_names: vec![], - parameter_types: vec![], - generic_parameters: vec![], - where_predicates: vec![], - doc: macro_def.docs(db), - has_self_param: false, - }) - } } impl From<&'_ ast::FnDef> for FunctionSignature { diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs index 3cbae8a45..2e021f032 100644 --- a/crates/ra_ide/src/inlay_hints.rs +++ b/crates/ra_ide/src/inlay_hints.rs @@ -322,15 +322,15 @@ fn get_fn_signature(sema: &Semantics, expr: &ast::Expr) -> Option< match expr { ast::Expr::CallExpr(expr) => { // FIXME: Type::as_callable is broken for closures - let callable_def = sema.type_of_expr(&expr.expr()?)?.as_callable()?; - match callable_def { - hir::CallableDefId::FunctionId(it) => { + let callable = sema.type_of_expr(&expr.expr()?)?.as_callable(sema.db)?; + match callable.kind() { + hir::CallableKind::Function(it) => { Some(FunctionSignature::from_hir(sema.db, it.into())) } - hir::CallableDefId::StructId(it) => { + hir::CallableKind::TupleStruct(it) => { FunctionSignature::from_struct(sema.db, it.into()) } - hir::CallableDefId::EnumVariantId(it) => { + hir::CallableKind::TupleEnumVariant(it) => { FunctionSignature::from_enum_variant(sema.db, it.into()) } } -- cgit v1.2.3