From 24964ca58e057b3f32d5cbb17d84e46f2a236ff6 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 21 Nov 2019 13:28:04 +0300
Subject: Move expr resolver to resolve

---
 crates/ra_hir/src/resolve.rs | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'crates/ra_hir/src/resolve.rs')

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index f4165babd..899959532 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -4,6 +4,7 @@ use std::sync::Arc;
 use hir_def::{
     builtin_type::BuiltinType,
     db::DefDatabase2,
+    expr::ExprId,
     generics::GenericParams,
     nameres::CrateDefMap,
     path::{Path, PathKind},
@@ -15,10 +16,10 @@ use rustc_hash::FxHashSet;
 
 use crate::{
     code_model::Crate,
-    db::DefDatabase,
+    db::{DefDatabase, HirDatabase},
     expr::{ExprScopes, PatId, ScopeId},
-    Adt, Const, Container, DefWithBody, EnumVariant, Function, GenericDef, ImplBlock, Local,
-    MacroDef, Module, ModuleDef, PerNs, Static, Struct, Trait, TypeAlias,
+    Adt, Const, Container, DefWithBody, EnumVariant, Function, GenericDef, HasBody, ImplBlock,
+    Local, MacroDef, Module, ModuleDef, PerNs, Static, Struct, Trait, TypeAlias,
 };
 
 #[derive(Debug, Clone, Default)]
@@ -492,6 +493,30 @@ impl Scope {
     }
 }
 
+// needs arbitrary_self_types to be a method... or maybe move to the def?
+pub(crate) fn resolver_for_expr(
+    db: &impl HirDatabase,
+    owner: DefWithBody,
+    expr_id: ExprId,
+) -> Resolver {
+    let scopes = owner.expr_scopes(db);
+    resolver_for_scope(db, owner, scopes.scope_for(expr_id))
+}
+
+pub(crate) fn resolver_for_scope(
+    db: &impl HirDatabase,
+    owner: DefWithBody,
+    scope_id: Option<ScopeId>,
+) -> Resolver {
+    let mut r = owner.resolver(db);
+    let scopes = owner.expr_scopes(db);
+    let scope_chain = scopes.scope_chain(scope_id).collect::<Vec<_>>();
+    for scope in scope_chain.into_iter().rev() {
+        r = r.push_expr_scope(owner.into(), Arc::clone(&scopes), scope);
+    }
+    r
+}
+
 pub(crate) trait HasResolver {
     /// Builds a resolver for type references inside this def.
     fn resolver(self, db: &impl DefDatabase) -> Resolver;
-- 
cgit v1.2.3