From afce8e442639fa9ed954b3659a2d1eccb7d80113 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Tue, 29 Jan 2019 20:49:31 +0100 Subject: Use the new Resolver API for goto def --- crates/ra_ide_api/src/goto_definition.rs | 49 +++++++++++++++++++------------- 1 file changed, 30 insertions(+), 19 deletions(-) (limited to 'crates/ra_ide_api/src/goto_definition.rs') diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs index 2a20c20ee..f7dd28c7c 100644 --- a/crates/ra_ide_api/src/goto_definition.rs +++ b/crates/ra_ide_api/src/goto_definition.rs @@ -48,14 +48,7 @@ pub(crate) fn reference_definition( if let Some(function) = hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax()) { - let scope = function.scopes(db); - // First try to resolve the symbol locally - if let Some(entry) = scope.resolve_local_name(name_ref) { - let nav = NavigationTarget::from_scope_entry(file_id, &entry); - return Exact(nav); - }; - - // Next check if it is a method + // Check if it is a method if let Some(method_call) = name_ref .syntax() .parent() @@ -86,19 +79,37 @@ pub(crate) fn reference_definition( }; } } - // Then try module name resolution - if let Some(module) = hir::source_binder::module_from_child_node(db, file_id, name_ref.syntax()) + // Try name resolution + let resolver = hir::source_binder::resolver_for_node(db, file_id, name_ref.syntax()); + if let Some(path) = name_ref + .syntax() + .ancestors() + .find_map(ast::Path::cast) + .and_then(hir::Path::from_ast) { - if let Some(path) = name_ref - .syntax() - .ancestors() - .find_map(ast::Path::cast) - .and_then(hir::Path::from_ast) - { - let resolved = module.resolve_path(db, &path); - if let Some(def_id) = resolved.take_types().or(resolved.take_values()) { - return Exact(NavigationTarget::from_def(db, def_id)); + let resolved = resolver.resolve_path(db, &path); + match resolved.clone().take_types().or(resolved.take_values()) { + 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 name = path + .as_ident() + .cloned() + .expect("local binding from a multi-segment path"); + let nav = NavigationTarget::from_scope_entry(file_id, name, ptr); + return Exact(nav); + } + Some(Resolution::GenericParam { .. }) => { + // TODO go to the generic param def + } + Some(Resolution::SelfType(_impl_block)) => { + // TODO go to the implemented type } + None => {} } } // If that fails try the index based approach. -- cgit v1.2.3 From d3df80dfe41e4e3ab7644ae576119a264ba0e7f1 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 27 Jan 2019 17:23:49 +0100 Subject: Cleanup --- crates/ra_ide_api/src/goto_definition.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'crates/ra_ide_api/src/goto_definition.rs') diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs index f7dd28c7c..48080b6e1 100644 --- a/crates/ra_ide_api/src/goto_definition.rs +++ b/crates/ra_ide_api/src/goto_definition.rs @@ -4,6 +4,7 @@ use ra_syntax::{ algo::find_node_at_offset, }; use test_utils::tested_by; +use hir::Resolution; use crate::{FilePosition, NavigationTarget, db::RootDatabase, RangeInfo}; -- cgit v1.2.3 From d571d26955148befd6986008a5112fff3a901c43 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Wed, 30 Jan 2019 22:41:44 +0100 Subject: Make the Resolution variants tuple variants --- crates/ra_ide_api/src/goto_definition.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_ide_api/src/goto_definition.rs') diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs index 48080b6e1..88efcea2a 100644 --- a/crates/ra_ide_api/src/goto_definition.rs +++ b/crates/ra_ide_api/src/goto_definition.rs @@ -90,8 +90,8 @@ pub(crate) fn reference_definition( { let resolved = resolver.resolve_path(db, &path); match resolved.clone().take_types().or(resolved.take_values()) { - Some(Resolution::Def { def }) => return Exact(NavigationTarget::from_def(db, def)), - Some(Resolution::LocalBinding { pat }) => { + 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 @@ -104,7 +104,7 @@ pub(crate) fn reference_definition( let nav = NavigationTarget::from_scope_entry(file_id, name, ptr); return Exact(nav); } - Some(Resolution::GenericParam { .. }) => { + Some(Resolution::GenericParam(..)) => { // TODO go to the generic param def } Some(Resolution::SelfType(_impl_block)) => { -- cgit v1.2.3