language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Move expr resolver to resolve

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-21 13:28:04 +03:00
parent 0102fb4133
commit 24964ca58e
4 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/ra_hir/src/resolve.rs
View file

@ -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;