1208: [WIP] Goto for Macro's r=matklad a=Lapz

Adds goto definition for macros. Currently only works for macros in the current crate ~~otherwise it panics~~. Proper macro resolution needs to be added for it to resolve macros in other crates.

Todo
- [X] Allow goto from macro calls
- [X] Fix panics
- [x] Add tests



![Screen Recording 2019-04-25 at 18 00 24](https://user-images.githubusercontent.com/19998186/56754499-1dd01c00-6785-11e9-9e9a-1e36de70cfa3.gif)



Co-authored-by: Lenard Pratt <l3np27@gmail.com>
This commit is contained in:
bors[bot] 2019-05-04 18:38:10 +00:00
commit aa7bdfd37f
9 changed files with 97 additions and 6 deletions

View file

@ -89,6 +89,7 @@ pub enum CompletionItemKind {
TypeAlias,
Method,
TypeParam,
Macro,
}
#[derive(Debug, PartialEq, Eq, Copy, Clone)]

View file

@ -213,6 +213,15 @@ impl NavigationTarget {
}
}
pub(crate) fn from_macro_def(
db: &RootDatabase,
macro_call: hir::MacroByExampleDef,
) -> NavigationTarget {
let (file_id, node) = macro_call.source(db);
log::debug!("nav target {}", node.syntax().debug_dump());
NavigationTarget::from_named(file_id.original_file(db), &*node)
}
#[cfg(test)]
pub(crate) fn assert_match(&self, expected: &str) {
let actual = self.debug_render();
@ -289,6 +298,7 @@ impl NavigationTarget {
.visit(doc_comments::<ast::StaticDef>)
.visit(doc_comments::<ast::NamedFieldDef>)
.visit(doc_comments::<ast::EnumVariant>)
.visit(doc_comments::<ast::MacroCall>)
.accept(&node)?
}

View file

@ -59,6 +59,21 @@ pub(crate) fn reference_definition(
return Exact(NavigationTarget::from_function(db, func));
}
}
//it could be a macro call
if let Some(macro_call) = name_ref
.syntax()
.parent()
.and_then(|node| node.parent())
.and_then(|node| node.parent())
.and_then(ast::MacroCall::cast)
{
tested_by!(goto_definition_works_for_macros);
if let Some(macro_call) = analyzer.resolve_macro_call(db, file_id, macro_call) {
return Exact(NavigationTarget::from_macro_def(db, macro_call));
}
}
// It could also be a field access
if let Some(field_expr) = name_ref.syntax().parent().and_then(ast::FieldExpr::cast) {
tested_by!(goto_definition_works_for_fields);
@ -97,6 +112,10 @@ pub(crate) fn reference_definition(
hir::PathResolution::GenericParam(..) => {
// FIXME: go to the generic param def
}
hir::PathResolution::Macro(def) => {
let nav = NavigationTarget::from_macro_def(db, def);
return Exact(nav);
}
hir::PathResolution::SelfType(impl_block) => {
let ty = impl_block.target_ty(db);
@ -156,6 +175,7 @@ fn named_target(file_id: FileId, node: &SyntaxNode) -> Option<NavigationTarget>
.visit(|node: &ast::TraitDef| NavigationTarget::from_named(file_id, node))
.visit(|node: &ast::NamedFieldDef| NavigationTarget::from_named(file_id, node))
.visit(|node: &ast::Module| NavigationTarget::from_named(file_id, node))
.visit(|node: &ast::MacroCall| NavigationTarget::from_named(file_id, node))
.accept(node)
}
@ -227,6 +247,26 @@ mod tests {
);
}
#[test]
fn goto_definition_works_for_macros() {
covers!(goto_definition_works_for_macros);
check_goto(
"
//- /lib.rs
macro_rules! foo {
() => {
{}
};
}
fn bar() {
<|>foo!();
}
",
"foo MACRO_CALL FileId(1) [0; 50) [13; 16)",
);
}
#[test]
fn goto_definition_works_for_methods() {
covers!(goto_definition_works_for_methods);

View file

@ -1,5 +1,6 @@
test_utils::marks!(
inserts_parens_for_function_calls
goto_definition_works_for_macros
goto_definition_works_for_methods
goto_definition_works_for_fields
goto_definition_works_for_named_fields