nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2311

Browse Source 
2311: See through Macros for SignatureHelp r=matklad a=kjeremy

Note: we meed to skip the trivia filter to make sure that
`covers!(call_info_bad_offset)` succeeds otherwise we exit call_info
too early.

Also the test doesn't pass: `FnCallNode::with_node` always detects
a MacroCall which is obviously wrong.

Fixes #2310 

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

43
crates/ra_ide/src/call_info.rs
View File

@ -1,24 +1,26 @@
//! FIXME: write short doc here
use ra_db::SourceDatabase;
use hir::db::AstDatabase;
use ra_syntax::{
algo::ancestors_at_offset,
ast::{self, ArgListOwner},
match_ast, AstNode, SyntaxNode, TextUnit,
match_ast, AstNode, SyntaxNode,
};
use test_utils::tested_by;
use crate::{db::RootDatabase, CallInfo, FilePosition, FunctionSignature};
use crate::{
db::RootDatabase, expand::descend_into_macros, CallInfo, FilePosition, FunctionSignature,
};
/// Computes parameter information for the given call expression.
pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<CallInfo> {
let parse = db.parse(position.file_id);
let syntax = parse.tree().syntax().clone();
let file = db.parse_or_expand(position.file_id.into())?;
let token = file.token_at_offset(position.offset).next()?;
let token = descend_into_macros(db, position.file_id, token);
// Find the calling expression and it's NameRef
let calling_node = FnCallNode::with_node(&syntax, position.offset)?;
let calling_node = FnCallNode::with_node(&token.value.parent())?;
let name_ref = calling_node.name_ref()?;
let name_ref = hir::InFile::new(position.file_id.into(), name_ref.syntax());
let name_ref = token.with_value(name_ref.syntax());
let analyzer = hir::SourceAnalyzer::new(db, name_ref, None);
let (mut call_info, has_self) = match &calling_node {
@ -93,8 +95,8 @@ enum FnCallNode {
}
impl FnCallNode {
fn with_node(syntax: &SyntaxNode, offset: TextUnit) -> Option<FnCallNode> {
ancestors_at_offset(syntax, offset).find_map(|node| {
fn with_node(syntax: &SyntaxNode) -> Option<FnCallNode> {
syntax.ancestors().find_map(|node| {
match_ast! {
match node {
ast::CallExpr(it) => { Some(FnCallNode::CallExpr(it)) },
@ -589,4 +591,25 @@ fn f() {
assert_eq!(info.label(), "foo!()");
assert_eq!(info.doc().map(|it| it.into()), Some("empty macro".to_string()));
}
#[test]
fn fn_signature_for_call_in_macro() {
let info = call_info(
r#"
macro_rules! id {
($($tt:tt)*) => { $($tt)* }
}
fn foo() {
}
id! {
fn bar() {
foo(<|>);
}
}
"#,
);
assert_eq!(info.label(), "fn foo()");
}
}