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_hir/src/expr.rs | 4 ++++ crates/ra_hir/src/expr/scope.rs | 6 +++++- crates/ra_hir/src/resolve.rs | 26 ++++++++++++++++---------- crates/ra_hir/src/source_binder.rs | 28 ++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 11 deletions(-) (limited to 'crates/ra_hir/src') diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 6c294bf10..e78ba889e 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs @@ -69,6 +69,10 @@ impl Body { pub fn owner(&self) -> Function { self.owner } + + pub fn syntax_mapping(&self, db: &impl HirDatabase) -> Arc { + db.body_syntax_mapping(self.owner) + } } // needs arbitrary_self_types to be a method... or maybe move to the def? diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs index 23f1c5e7f..9202e3671 100644 --- a/crates/ra_hir/src/expr/scope.rs +++ b/crates/ra_hir/src/expr/scope.rs @@ -58,6 +58,10 @@ impl ExprScopes { scopes } + pub fn body(&self) -> Arc { + self.body.clone() + } + pub fn entries(&self, scope: ScopeId) -> &[ScopeEntry] { &self.scopes[scope].entries } @@ -220,7 +224,7 @@ impl ScopesWithSyntaxMapping { .collect() } - fn scope_for(&self, node: &SyntaxNode) -> Option { + pub fn scope_for(&self, node: &SyntaxNode) -> Option { node.ancestors() .map(SyntaxNodePtr::new) .filter_map(|ptr| self.syntax_mapping.syntax_expr(ptr)) diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index 30cf9c69e..871f7d8f7 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs @@ -9,7 +9,7 @@ use crate::{ name::{Name, KnownName}, nameres::{PerNs, ItemMap}, generics::GenericParams, - expr::{scope::{ExprScopes, ScopeId}, PatId}, + expr::{scope::{ExprScopes, ScopeId}, PatId, Body}, impl_block::ImplBlock, path::Path, }; @@ -106,15 +106,21 @@ impl Resolver { } fn module(&self) -> Option<(&ItemMap, Module)> { - for scope in self.scopes.iter().rev() { - match scope { - Scope::ModuleScope(m) => { - return Some((&m.item_map, m.module.clone())); - } - _ => {} - } - } - None + self.scopes.iter().rev().find_map(|scope| match scope { + Scope::ModuleScope(m) => Some((&*m.item_map, m.module.clone())), + + Scope::ModuleScopeRef(m) => Some((m.item_map, m.module.clone())), + + _ => None, + }) + } + + /// The body from which any `LocalBinding` resolutions in this resolver come. + pub fn body(&self) -> Option> { + self.scopes.iter().rev().find_map(|scope| match scope { + Scope::ExprScope(expr_scope) => Some(expr_scope.expr_scopes.body()), + _ => None, + }) } } diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 998158b3e..621215bfb 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs @@ -229,3 +229,31 @@ pub fn resolver_for_position(db: &impl HirDatabase, position: FilePosition) -> R }) .unwrap_or_default() } + +pub fn resolver_for_node( + db: &impl HirDatabase, + file_id: FileId, + node: &SyntaxNode, +) -> Resolver<'static> { + node.ancestors() + .find_map(|node| { + if ast::Expr::cast(node).is_some() || ast::Block::cast(node).is_some() { + if let Some(func) = function_from_child_node(db, file_id, node) { + let scopes = func.scopes(db); + let scope = scopes.scope_for(&node); + Some(expr::resolver_for_scope(func.body(db), db, scope)) + } else { + // TODO const/static/array length + None + } + } else if let Some(module) = ast::Module::cast(node) { + Some(module_from_declaration(db, file_id, module)?.resolver(db)) + } else if let Some(_) = ast::SourceFile::cast(node) { + Some(module_from_source(db, file_id.into(), None)?.resolver(db)) + } else { + // TODO add missing cases + None + } + }) + .unwrap_or_default() +} -- cgit v1.2.3