From 4a3f76d3bb6cf75ab5a9ba3384c312a76c70564b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 1 Jan 2019 21:17:52 +0300 Subject: wip --- crates/ra_hir/src/query_definitions.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'crates/ra_hir/src/query_definitions.rs') diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs index 0c07f1444..3c90e29fe 100644 --- a/crates/ra_hir/src/query_definitions.rs +++ b/crates/ra_hir/src/query_definitions.rs @@ -128,11 +128,12 @@ pub(super) fn input_module_items( ) -> Cancelable> { let module_tree = db.module_tree(source_root)?; let source = module_id.source(&module_tree); - let file_items = db.file_items(source.file_id().into()); + let mfile_id = source.file_id().into(); + let file_items = db.file_items(mfile_id); let res = match source.resolve(db) { ModuleSourceNode::SourceFile(it) => { let items = it.borrowed().items(); - InputModuleItems::new(&file_items, items) + InputModuleItems::new(mfile_id, &file_items, items) } ModuleSourceNode::Module(it) => { let items = it @@ -140,7 +141,7 @@ pub(super) fn input_module_items( .item_list() .into_iter() .flat_map(|it| it.items()); - InputModuleItems::new(&file_items, items) + InputModuleItems::new(mfile_id, &file_items, items) } }; Ok(Arc::new(res)) -- cgit v1.2.3