Skip to content

Commit 0000c77

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #2600
2600: Plumbing for local items support r=matklad a=matklad bors r+ Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents 90f3b31 + 9ccad60 commit 0000c77

File tree

8 files changed

+78
-62
lines changed

8 files changed

+78
-62
lines changed

‎crates/ra_hir_def/src/body.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::{
1717
nameres::{BuiltinShadowMode, CrateDefMap},
1818
path::{ModPath, Path},
1919
src::HasSource,
20-
DefWithBodyId, HasModule, Lookup, ModuleId,
20+
DefWithBodyId, HasModule, Lookup, ModuleDefId, ModuleId,
2121
};
2222

2323
struct Expander {
@@ -119,6 +119,7 @@ pub struct Body {
119119
pub params: Vec<PatId>,
120120
/// The `ExprId` of the actual body expression.
121121
pub body_expr: ExprId,
122+
pub defs: Vec<ModuleDefId>,
122123
}
123124

124125
pub type ExprPtr = Either<AstPtr<ast::Expr>, AstPtr<ast::RecordField>>;

‎crates/ra_hir_def/src/body/lower.rs

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ pub(super) fn lower(
4141
pats: Arena::default(),
4242
params: Vec::new(),
4343
body_expr: ExprId::dummy(),
44+
defs: Vec::new(),
4445
},
4546
}
4647
.collect(params, body)

‎crates/ra_hir_def/src/child_by_source.rs

+55-42
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use crate::{
1111
dyn_map::DynMap,
1212
keys,
1313
src::{HasChildSource, HasSource},
14-
AdtId, AssocItemId, EnumId, EnumVariantId, ImplId, Lookup, ModuleDefId, ModuleId,
15-
StructFieldId, TraitId, VariantId,
14+
AdtId, AssocItemId, DefWithBodyId, EnumId, EnumVariantId, ImplId, Lookup, ModuleDefId,
15+
ModuleId, StructFieldId, TraitId, VariantId,
1616
};
1717

1818
pub trait ChildBySource {
@@ -76,47 +76,11 @@ impl ChildBySource for ModuleId {
7676
let mut res = DynMap::default();
7777

7878
let crate_def_map = db.crate_def_map(self.krate);
79-
for item in crate_def_map[self.local_id].scope.declarations() {
80-
match item {
81-
ModuleDefId::FunctionId(func) => {
82-
let src = func.lookup(db).source(db);
83-
res[keys::FUNCTION].insert(src, func)
84-
}
85-
ModuleDefId::ConstId(konst) => {
86-
let src = konst.lookup(db).source(db);
87-
res[keys::CONST].insert(src, konst)
88-
}
89-
ModuleDefId::StaticId(statik) => {
90-
let src = statik.lookup(db).source(db);
91-
res[keys::STATIC].insert(src, statik)
92-
}
93-
ModuleDefId::TypeAliasId(ty) => {
94-
let src = ty.lookup(db).source(db);
95-
res[keys::TYPE_ALIAS].insert(src, ty)
96-
}
97-
ModuleDefId::TraitId(trait_) => {
98-
let src = trait_.lookup(db).source(db);
99-
res[keys::TRAIT].insert(src, trait_)
100-
}
101-
ModuleDefId::AdtId(adt) => match adt {
102-
AdtId::StructId(strukt) => {
103-
let src = strukt.lookup(db).source(db);
104-
res[keys::STRUCT].insert(src, strukt)
105-
}
106-
AdtId::UnionId(union_) => {
107-
let src = union_.lookup(db).source(db);
108-
res[keys::UNION].insert(src, union_)
109-
}
110-
AdtId::EnumId(enum_) => {
111-
let src = enum_.lookup(db).source(db);
112-
res[keys::ENUM].insert(src, enum_)
113-
}
114-
},
115-
_ => (),
116-
}
117-
}
79+
let module_data = &crate_def_map[self.local_id];
11880

119-
for &impl_ in crate_def_map[self.local_id].impls.iter() {
81+
module_data.scope.declarations().for_each(|item| add_module_def(db, &mut res, item));
82+
83+
for &impl_ in module_data.impls.iter() {
12084
let src = impl_.lookup(db).source(db);
12185
res[keys::IMPL].insert(src, impl_)
12286
}
@@ -125,6 +89,46 @@ impl ChildBySource for ModuleId {
12589
}
12690
}
12791

92+
fn add_module_def(db: &impl DefDatabase, map: &mut DynMap, item: ModuleDefId) {
93+
match item {
94+
ModuleDefId::FunctionId(func) => {
95+
let src = func.lookup(db).source(db);
96+
map[keys::FUNCTION].insert(src, func)
97+
}
98+
ModuleDefId::ConstId(konst) => {
99+
let src = konst.lookup(db).source(db);
100+
map[keys::CONST].insert(src, konst)
101+
}
102+
ModuleDefId::StaticId(statik) => {
103+
let src = statik.lookup(db).source(db);
104+
map[keys::STATIC].insert(src, statik)
105+
}
106+
ModuleDefId::TypeAliasId(ty) => {
107+
let src = ty.lookup(db).source(db);
108+
map[keys::TYPE_ALIAS].insert(src, ty)
109+
}
110+
ModuleDefId::TraitId(trait_) => {
111+
let src = trait_.lookup(db).source(db);
112+
map[keys::TRAIT].insert(src, trait_)
113+
}
114+
ModuleDefId::AdtId(adt) => match adt {
115+
AdtId::StructId(strukt) => {
116+
let src = strukt.lookup(db).source(db);
117+
map[keys::STRUCT].insert(src, strukt)
118+
}
119+
AdtId::UnionId(union_) => {
120+
let src = union_.lookup(db).source(db);
121+
map[keys::UNION].insert(src, union_)
122+
}
123+
AdtId::EnumId(enum_) => {
124+
let src = enum_.lookup(db).source(db);
125+
map[keys::ENUM].insert(src, enum_)
126+
}
127+
},
128+
_ => (),
129+
}
130+
}
131+
128132
impl ChildBySource for VariantId {
129133
fn child_by_source(&self, db: &impl DefDatabase) -> DynMap {
130134
let mut res = DynMap::default();
@@ -160,3 +164,12 @@ impl ChildBySource for EnumId {
160164
res
161165
}
162166
}
167+
168+
impl ChildBySource for DefWithBodyId {
169+
fn child_by_source(&self, db: &impl DefDatabase) -> DynMap {
170+
let mut res = DynMap::default();
171+
let body = db.body(*self);
172+
body.defs.iter().copied().for_each(|item| add_module_def(db, &mut res, item));
173+
res
174+
}
175+
}

‎crates/ra_hir_def/src/lib.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ pub enum ContainerId {
335335
ModuleId(ModuleId),
336336
ImplId(ImplId),
337337
TraitId(TraitId),
338+
DefWithBodyId(DefWithBodyId),
338339
}
339340

340341
/// A Data Type
@@ -478,33 +479,32 @@ pub trait HasModule {
478479
fn module(&self, db: &impl db::DefDatabase) -> ModuleId;
479480
}
480481

481-
impl HasModule for FunctionLoc {
482+
impl HasModule for ContainerId {
482483
fn module(&self, db: &impl db::DefDatabase) -> ModuleId {
483-
match self.container {
484+
match *self {
484485
ContainerId::ModuleId(it) => it,
485486
ContainerId::ImplId(it) => it.lookup(db).container,
486487
ContainerId::TraitId(it) => it.lookup(db).container,
488+
ContainerId::DefWithBodyId(it) => it.module(db),
487489
}
488490
}
489491
}
490492

493+
impl HasModule for FunctionLoc {
494+
fn module(&self, db: &impl db::DefDatabase) -> ModuleId {
495+
self.container.module(db)
496+
}
497+
}
498+
491499
impl HasModule for TypeAliasLoc {
492500
fn module(&self, db: &impl db::DefDatabase) -> ModuleId {
493-
match self.container {
494-
ContainerId::ModuleId(it) => it,
495-
ContainerId::ImplId(it) => it.lookup(db).container,
496-
ContainerId::TraitId(it) => it.lookup(db).container,
497-
}
501+
self.container.module(db)
498502
}
499503
}
500504

501505
impl HasModule for ConstLoc {
502506
fn module(&self, db: &impl db::DefDatabase) -> ModuleId {
503-
match self.container {
504-
ContainerId::ModuleId(it) => it,
505-
ContainerId::ImplId(it) => it.lookup(db).container,
506-
ContainerId::TraitId(it) => it.lookup(db).container,
507-
}
507+
self.container.module(db)
508508
}
509509
}
510510

‎crates/ra_hir_def/src/resolver.rs

+1
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ impl HasResolver for ContainerId {
586586
ContainerId::TraitId(it) => it.resolver(db),
587587
ContainerId::ImplId(it) => it.resolver(db),
588588
ContainerId::ModuleId(it) => it.resolver(db),
589+
ContainerId::DefWithBodyId(it) => it.resolver(db),
589590
}
590591
}
591592
}

‎crates/ra_hir_ty/src/infer/path.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
237237
}));
238238
Some(substs)
239239
}
240-
ContainerId::ModuleId(_) => None,
240+
ContainerId::ModuleId(_) | ContainerId::DefWithBodyId(_) => None,
241241
};
242242

243243
self.write_assoc_resolution(id, item.into());

‎crates/ra_hir_ty/src/method_resolution.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use std::sync::Arc;
66

77
use arrayvec::ArrayVec;
88
use hir_def::{
9-
lang_item::LangItemTarget, resolver::Resolver, type_ref::Mutability, AssocItemId, FunctionId,
10-
HasModule, ImplId, Lookup, TraitId,
9+
lang_item::LangItemTarget, resolver::Resolver, type_ref::Mutability, AssocItemId, ContainerId,
10+
FunctionId, HasModule, ImplId, Lookup, TraitId,
1111
};
1212
use hir_expand::name::Name;
1313
use ra_db::CrateId;
@@ -451,12 +451,12 @@ fn transform_receiver_ty(
451451
self_ty: &Canonical<Ty>,
452452
) -> Option<Ty> {
453453
let substs = match function_id.lookup(db).container {
454-
hir_def::ContainerId::TraitId(_) => Substs::build_for_def(db, function_id)
454+
ContainerId::TraitId(_) => Substs::build_for_def(db, function_id)
455455
.push(self_ty.value.clone())
456456
.fill_with_unknown()
457457
.build(),
458-
hir_def::ContainerId::ImplId(impl_id) => inherent_impl_substs(db, impl_id, &self_ty)?,
459-
hir_def::ContainerId::ModuleId(_) => unreachable!(),
458+
ContainerId::ImplId(impl_id) => inherent_impl_substs(db, impl_id, &self_ty)?,
459+
ContainerId::ModuleId(_) | ContainerId::DefWithBodyId(_) => unreachable!(),
460460
};
461461
let sig = db.callable_item_signature(function_id.into());
462462
Some(sig.params()[0].clone().subst(&substs))

‎crates/ra_hir_ty/src/utils.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,6 @@ fn parent_generic_def(db: &impl DefDatabase, def: GenericDefId) -> Option<Generi
157157
match container {
158158
ContainerId::ImplId(it) => Some(it.into()),
159159
ContainerId::TraitId(it) => Some(it.into()),
160-
ContainerId::ModuleId(_) => None,
160+
ContainerId::ModuleId(_) | ContainerId::DefWithBodyId(_) => None,
161161
}
162162
}

0 commit comments

Comments
 (0)