use ra_db::{FileId, SourceDatabase};
use ra_syntax::{
AstNode, ast,
- algo::find_node_at_offset,
+ algo::{find_node_at_offset, visit::{visitor, Visitor}},
+ SyntaxNode,
};
use test_utils::tested_by;
-use hir::Resolution;
+use hir::{Pat, Resolution};
use crate::{FilePosition, NavigationTarget, db::RootDatabase, RangeInfo};
name_ref: &ast::NameRef,
) -> ReferenceResult {
use self::ReferenceResult::*;
- if let Some(function) =
- hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())
- {
+
+ let function = hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax());
+
+ if let Some(function) = function {
// Check if it is a method
if let Some(method_call) = name_ref.syntax().parent().and_then(ast::MethodCallExpr::cast) {
tested_by!(goto_definition_works_for_methods);
let infer_result = function.infer(db);
- let syntax_mapping = function.body_syntax_mapping(db);
+ let source_map = function.body_source_map(db);
let expr = ast::Expr::cast(method_call.syntax()).unwrap();
if let Some(func) =
- syntax_mapping.node_expr(expr).and_then(|it| infer_result.method_resolution(it))
+ source_map.node_expr(expr).and_then(|it| infer_result.method_resolution(it))
{
return Exact(NavigationTarget::from_function(db, func));
};
if let Some(field_expr) = name_ref.syntax().parent().and_then(ast::FieldExpr::cast) {
tested_by!(goto_definition_works_for_fields);
let infer_result = function.infer(db);
- let syntax_mapping = function.body_syntax_mapping(db);
+ let source_map = function.body_source_map(db);
let expr = ast::Expr::cast(field_expr.syntax()).unwrap();
if let Some(field) =
- syntax_mapping.node_expr(expr).and_then(|it| infer_result.field_resolution(it))
+ source_map.node_expr(expr).and_then(|it| infer_result.field_resolution(it))
{
return Exact(NavigationTarget::from_field(db, field));
};
}
+
+ // It could also be a named field
+ if let Some(field_expr) = name_ref.syntax().parent().and_then(ast::NamedField::cast) {
+ tested_by!(goto_definition_works_for_named_fields);
+
+ let infer_result = function.infer(db);
+ let source_map = function.body_source_map(db);
+
+ let struct_lit = field_expr.syntax().ancestors().find_map(ast::StructLit::cast);
+
+ if let Some(expr) = struct_lit.and_then(|lit| source_map.node_expr(lit.into())) {
+ let ty = infer_result[expr].clone();
+ if let hir::Ty::Adt { def_id, .. } = ty {
+ if let hir::AdtDef::Struct(s) = def_id {
+ let hir_path = hir::Path::from_name_ref(name_ref);
+ let hir_name = hir_path.as_ident().unwrap();
+
+ if let Some(field) = s.field(db, hir_name) {
+ return Exact(NavigationTarget::from_field(db, field));
+ }
+ }
+ }
+ }
+ }
}
+
// Try name resolution
let resolver = hir::source_binder::resolver_for_node(db, file_id, name_ref.syntax());
if let Some(path) =
Some(Resolution::Def(def)) => return Exact(NavigationTarget::from_def(db, def)),
Some(Resolution::LocalBinding(pat)) => {
let body = resolver.body().expect("no body for local binding");
- let syntax_mapping = body.syntax_mapping(db);
- let ptr =
- syntax_mapping.pat_syntax(pat).expect("pattern not found in syntax mapping");
+ let source_map = body.owner().body_source_map(db);
+ let ptr = source_map.pat_syntax(pat).expect("pattern not found in syntax mapping");
let name =
path.as_ident().cloned().expect("local binding from a multi-segment path");
let nav = NavigationTarget::from_scope_entry(file_id, name, ptr);
Some(Resolution::SelfType(_impl_block)) => {
// TODO: go to the implemented type
}
- None => {}
+ None => {
+ // If we failed to resolve then check associated items
+ if let Some(function) = function {
+ // Resolve associated item for path expressions
+ if let Some(path_expr) =
+ name_ref.syntax().ancestors().find_map(ast::PathExpr::cast)
+ {
+ let infer_result = function.infer(db);
+ let source_map = function.body_source_map(db);
+
+ if let Some(expr) = ast::Expr::cast(path_expr.syntax()) {
+ if let Some(res) = source_map
+ .node_expr(expr)
+ .and_then(|it| infer_result.assoc_resolutions_for_expr(it.into()))
+ {
+ return Exact(NavigationTarget::from_impl_item(db, res));
+ }
+ }
+ }
+
+ // Resolve associated item for path patterns
+ if let Some(path_pat) =
+ name_ref.syntax().ancestors().find_map(ast::PathPat::cast)
+ {
+ let infer_result = function.infer(db);
+
+ if let Some(p) = path_pat.path().and_then(hir::Path::from_ast) {
+ if let Some(pat_id) =
+ function.body(db).pats().find_map(|(pat_id, pat)| match pat {
+ Pat::Path(ref path) if *path == p => Some(pat_id),
+ _ => None,
+ })
+ {
+ if let Some(res) =
+ infer_result.assoc_resolutions_for_pat(pat_id.into())
+ {
+ return Exact(NavigationTarget::from_impl_item(db, res));
+ }
+ }
+ }
+ }
+ }
+ }
}
}
+
// If that fails try the index based approach.
let navs = crate::symbol_index::index_resolve(db, name_ref)
.into_iter()
Approximate(navs)
}
-fn name_definition(
+pub(crate) fn name_definition(
db: &RootDatabase,
file_id: FileId,
name: &ast::Name,
) -> Option<Vec<NavigationTarget>> {
- if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) {
+ let parent = name.syntax().parent()?;
+
+ if let Some(module) = ast::Module::cast(&parent) {
if module.has_semi() {
if let Some(child_module) =
hir::source_binder::module_from_declaration(db, file_id, module)
}
}
}
+
+ if let Some(nav) = named_target(file_id, &parent) {
+ return Some(vec![nav]);
+ }
+
None
}
+fn named_target(file_id: FileId, node: &SyntaxNode) -> Option<NavigationTarget> {
+ visitor()
+ .visit(|node: &ast::StructDef| NavigationTarget::from_named(file_id, node))
+ .visit(|node: &ast::EnumDef| NavigationTarget::from_named(file_id, node))
+ .visit(|node: &ast::EnumVariant| NavigationTarget::from_named(file_id, node))
+ .visit(|node: &ast::FnDef| NavigationTarget::from_named(file_id, node))
+ .visit(|node: &ast::TypeAliasDef| NavigationTarget::from_named(file_id, node))
+ .visit(|node: &ast::ConstDef| NavigationTarget::from_named(file_id, node))
+ .visit(|node: &ast::StaticDef| NavigationTarget::from_named(file_id, node))
+ .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))
+ .accept(node)
+}
+
#[cfg(test)]
mod tests {
use test_utils::covers;
"spam NAMED_FIELD_DEF FileId(1) [17; 26) [17; 21)",
);
}
+
+ #[test]
+ fn goto_definition_works_for_named_fields() {
+ covers!(goto_definition_works_for_named_fields);
+ check_goto(
+ "
+ //- /lib.rs
+ struct Foo {
+ spam: u32,
+ }
+
+ fn bar() -> Foo {
+ Foo {
+ spam<|>: 0,
+ }
+ }
+ ",
+ "spam NAMED_FIELD_DEF FileId(1) [17; 26) [17; 21)",
+ );
+ }
+
+ #[test]
+ fn goto_definition_works_when_used_on_definition_name_itself() {
+ check_goto(
+ "
+ //- /lib.rs
+ struct Foo<|> { value: u32 }
+ ",
+ "Foo STRUCT_DEF FileId(1) [0; 25) [7; 10)",
+ );
+
+ check_goto(
+ r#"
+ //- /lib.rs
+ struct Foo {
+ field<|>: string,
+ }
+ "#,
+ "field NAMED_FIELD_DEF FileId(1) [17; 30) [17; 22)",
+ );
+
+ check_goto(
+ "
+ //- /lib.rs
+ fn foo_test<|>() {
+ }
+ ",
+ "foo_test FN_DEF FileId(1) [0; 17) [3; 11)",
+ );
+
+ check_goto(
+ "
+ //- /lib.rs
+ enum Foo<|> {
+ Variant,
+ }
+ ",
+ "Foo ENUM_DEF FileId(1) [0; 25) [5; 8)",
+ );
+
+ check_goto(
+ "
+ //- /lib.rs
+ enum Foo {
+ Variant1,
+ Variant2<|>,
+ Variant3,
+ }
+ ",
+ "Variant2 ENUM_VARIANT FileId(1) [29; 37) [29; 37)",
+ );
+
+ check_goto(
+ r#"
+ //- /lib.rs
+ static inner<|>: &str = "";
+ "#,
+ "inner STATIC_DEF FileId(1) [0; 24) [7; 12)",
+ );
+
+ check_goto(
+ r#"
+ //- /lib.rs
+ const inner<|>: &str = "";
+ "#,
+ "inner CONST_DEF FileId(1) [0; 23) [6; 11)",
+ );
+
+ check_goto(
+ r#"
+ //- /lib.rs
+ type Thing<|> = Option<()>;
+ "#,
+ "Thing TYPE_ALIAS_DEF FileId(1) [0; 24) [5; 10)",
+ );
+
+ check_goto(
+ r#"
+ //- /lib.rs
+ trait Foo<|> {
+ }
+ "#,
+ "Foo TRAIT_DEF FileId(1) [0; 13) [6; 9)",
+ );
+
+ check_goto(
+ r#"
+ //- /lib.rs
+ mod bar<|> {
+ }
+ "#,
+ "bar MODULE FileId(1) [0; 11) [4; 7)",
+ );
+ }
}
projects / rust.git / blobdiff