language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

module-scoped defloc

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-04 23:01:53 +03:00
parent 45fce90349
commit 947e3350e0
3 changed files with 43 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ra_hir/src/lib.rs
View file

@ -61,15 +61,18 @@ impl FnId {
pub struct DefId(u32);
ra_db::impl_numeric_id!(DefId);
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub(crate) enum DefKind {
Module,
Item,
}
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum DefLoc {
Module {
id: ModuleId,
source_root: SourceRootId,
},
Item {
source_item_id: SourceItemId,
},
pub struct DefLoc {
pub(crate) kind: DefKind,
source_root_id: SourceRootId,
module_id: ModuleId,
source_item_id: SourceItemId,
}
impl DefId {
@ -92,12 +95,12 @@ pub enum Def {
impl DefId {
pub fn resolve(self, db: &impl HirDatabase) -> Cancelable<Def> {
let loc = self.loc(db);
let res = match loc {
DefLoc::Module { id, source_root } => {
let descr = Module::new(db, source_root, id)?;
let res = match loc.kind {
DefKind::Module => {
let descr = Module::new(db, loc.source_root_id, loc.module_id)?;
Def::Module(descr)
}
DefLoc::Item { .. } => Def::Item,
DefKind::Item => Def::Item,
};
Ok(res)
}