Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-def/src/nameres.rs')
| -rw-r--r-- | crates/hir-def/src/nameres.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crates/hir-def/src/nameres.rs b/crates/hir-def/src/nameres.rs index a32513cf65..c67046dfda 100644 --- a/crates/hir-def/src/nameres.rs +++ b/crates/hir-def/src/nameres.rs @@ -70,7 +70,7 @@ use syntax::{ast, SmolStr}; use crate::{ db::DefDatabase, item_scope::{BuiltinShadowMode, ItemScope}, - item_tree::TreeId, + item_tree::{ItemTreeId, Mod, TreeId}, nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode}, path::ModPath, per_ns::PerNs, @@ -141,9 +141,11 @@ pub enum ModuleOrigin { File { is_mod_rs: bool, declaration: AstId<ast::Module>, + declaration_tree_id: ItemTreeId<Mod>, definition: FileId, }, Inline { + definition_tree_id: ItemTreeId<Mod>, definition: AstId<ast::Module>, }, /// Pseudo-module introduced by a block scope (contains only inner items). @@ -186,7 +188,7 @@ impl ModuleOrigin { let sf = db.parse(file_id).tree(); InFile::new(file_id.into(), ModuleSource::SourceFile(sf)) } - ModuleOrigin::Inline { definition } => InFile::new( + ModuleOrigin::Inline { definition, .. } => InFile::new( definition.file_id, ModuleSource::Module(definition.to_node(db.upcast())), ), |