From 595b06a1b8fcd215c828d65ee1dd1a30c2697de9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 16 Jan 2020 17:33:07 +0100 Subject: Create modules via SourceBinder --- crates/ra_hir/src/from_source.rs | 38 ------------------------------ crates/ra_hir/src/lib.rs | 1 - crates/ra_hir/src/source_binder.rs | 47 +++++++++++++++++++++++--------------- 3 files changed, 28 insertions(+), 58 deletions(-) delete mode 100644 crates/ra_hir/src/from_source.rs (limited to 'crates/ra_hir') diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs deleted file mode 100644 index eb76aecb1..000000000 --- a/crates/ra_hir/src/from_source.rs +++ /dev/null @@ -1,38 +0,0 @@ -//! Finds a corresponding hir data structure for a syntax node in a specific -//! file. - -use hir_def::{nameres::ModuleSource, ModuleId}; -use ra_db::FileId; -use ra_prof::profile; - -use crate::{ - db::{DefDatabase, HirDatabase}, - InFile, Module, -}; - -impl Module { - pub fn from_definition(db: &impl HirDatabase, src: InFile) -> Option { - let _p = profile("Module::from_definition"); - let mut sb = crate::SourceBinder::new(db); - match src.value { - ModuleSource::Module(ref module) => { - assert!(!module.has_semi()); - return sb.to_def(InFile { file_id: src.file_id, value: module.clone() }); - } - ModuleSource::SourceFile(_) => (), - }; - - let original_file = src.file_id.original_file(db); - Module::from_file(db, original_file) - } - - fn from_file(db: &impl DefDatabase, file: FileId) -> Option { - let _p = profile("Module::from_file"); - let (krate, local_id) = db.relevant_crates(file).iter().find_map(|&crate_id| { - let crate_def_map = db.crate_def_map(crate_id); - let local_id = crate_def_map.modules_for_file(file).next()?; - Some((crate_id, local_id)) - })?; - Some(Module { id: ModuleId { krate, local_id } }) - } -} diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 11829f42a..e1c7b7a20 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs @@ -36,7 +36,6 @@ mod from_id; mod code_model; mod has_source; -mod from_source; pub use crate::{ code_model::{ diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 26eedbb2c..fa225a4ed 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs @@ -19,7 +19,8 @@ use ra_syntax::{ }; use rustc_hash::FxHashMap; -use crate::{db::HirDatabase, Local, Module, ModuleSource, SourceAnalyzer, TypeParam}; +use crate::{db::HirDatabase, Local, Module, SourceAnalyzer, TypeParam}; +use ra_db::FileId; pub struct SourceBinder<'a, DB> { pub db: &'a DB, @@ -60,6 +61,16 @@ impl SourceBinder<'_, DB> { T::to_def(self, src) } + pub fn to_module_def(&mut self, file: FileId) -> Option { + let _p = profile("SourceBinder::to_module_def"); + let (krate, local_id) = self.db.relevant_crates(file).iter().find_map(|&crate_id| { + let crate_def_map = self.db.crate_def_map(crate_id); + let local_id = crate_def_map.modules_for_file(file).next()?; + Some((crate_id, local_id)) + })?; + Some(Module { id: ModuleId { krate, local_id } }) + } + fn to_id(&mut self, src: InFile) -> Option { T::to_id(self, src) } @@ -107,8 +118,7 @@ impl SourceBinder<'_, DB> { return Some(res); } - let module_source = ModuleSource::from_child_node(self.db, src); - let c = crate::Module::from_definition(self.db, src.with_value(module_source))?; + let c = self.to_module_def(src.file_id.original_file(self.db))?; Some(c.id.into()) } @@ -248,14 +258,12 @@ impl ToId for ast::MacroCall { ) -> Option { let kind = MacroDefKind::Declarative; - let module_src = ModuleSource::from_child_node(sb.db, src.as_ref().map(|it| it.syntax())); - let module = crate::Module::from_definition(sb.db, InFile::new(src.file_id, module_src))?; - let krate = Some(module.krate().id); + let krate = sb.to_module_def(src.file_id.original_file(sb.db))?.id.krate; let ast_id = Some(AstId::new(src.file_id, sb.db.ast_id_map(src.file_id).ast_id(&src.value))); - Some(MacroDefId { krate, ast_id, kind }) + Some(MacroDefId { krate: Some(krate), ast_id, kind }) } } @@ -319,21 +327,22 @@ impl ToDef for ast::Module { ) -> Option { { let _p = profile("ast::Module::to_def"); - let parent_declaration = - src.value.syntax().ancestors().skip(1).find_map(ast::Module::cast); + let parent_declaration = src + .as_ref() + .map(|it| it.syntax()) + .cloned() + .ancestors_with_macros(sb.db) + .skip(1) + .find_map(|it| { + let m = ast::Module::cast(it.value.clone())?; + Some(it.with_value(m)) + }); let parent_module = match parent_declaration { - Some(parent_declaration) => { - let src_parent = InFile { file_id: src.file_id, value: parent_declaration }; - sb.to_def(src_parent) - } + Some(parent_declaration) => sb.to_def(parent_declaration), None => { - let source_file = sb.db.parse(src.file_id.original_file(sb.db)).tree(); - let src_parent = InFile { - file_id: src.file_id, - value: ModuleSource::SourceFile(source_file), - }; - Module::from_definition(sb.db, src_parent) + let file_id = src.file_id.original_file(sb.db); + sb.to_module_def(file_id) } }?; -- cgit v1.2.3