nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2097

Browse Source 
2097: Be more precise with function signatures r=matklad a=kjeremy

Finds the closest call expr.

Fixes #2093

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2019-10-28 11:53:16 +00:00 committed by GitHub
commit 02828520a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
crates/ra_ide_api/src/call_info.rs
View File

@ -2,7 +2,7 @@
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use ra_syntax::{ use ra_syntax::{
algo::find_node_at_offset, algo::ancestors_at_offset,
ast::{self, ArgListOwner}, ast::{self, ArgListOwner},
AstNode, SyntaxNode, TextUnit, AstNode, SyntaxNode, TextUnit,
}; };
@ -82,13 +82,15 @@ enum FnCallNode {
impl FnCallNode { impl FnCallNode {
fn with_node(syntax: &SyntaxNode, offset: TextUnit) -> Option<FnCallNode> { fn with_node(syntax: &SyntaxNode, offset: TextUnit) -> Option<FnCallNode> {
if let Some(expr) = find_node_at_offset::<ast::CallExpr>(syntax, offset) { ancestors_at_offset(syntax, offset).find_map(|node| {
return Some(FnCallNode::CallExpr(expr)); if let Some(expr) = ast::CallExpr::cast(node.clone()) {
} Some(FnCallNode::CallExpr(expr))
if let Some(expr) = find_node_at_offset::<ast::MethodCallExpr>(syntax, offset) { } else if let Some(expr) = ast::MethodCallExpr::cast(node.clone()) {
return Some(FnCallNode::MethodCallExpr(expr)); Some(FnCallNode::MethodCallExpr(expr))
} } else {
None None
}
})
} }
fn name_ref(&self) -> Option<ast::NameRef> { fn name_ref(&self) -> Option<ast::NameRef> {
@ -438,4 +440,26 @@ By default this method stops actor's `Context`."#
let call_info = analysis.call_info(position).unwrap(); let call_info = analysis.call_info(position).unwrap();
assert!(call_info.is_none()); assert!(call_info.is_none());
} }
#[test]
fn test_nested_method_in_lamba() {
let info = call_info(
r#"struct Foo;
impl Foo {
fn bar(&self, _: u32) { }
}
fn bar(_: u32) { }
fn main() {
let foo = Foo;
std::thread::spawn(move || foo.bar(<|>));
}"#,
);
assert_eq!(info.parameters(), ["&self", "_: u32"]);
assert_eq!(info.active_parameter, Some(1));
assert_eq!(info.label(), "fn bar(&self, _: u32)");
}
} }