language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Create modules via SourceBinder

Browse source
This commit is contained in:
Aleksey Kladov 2020-01-16 17:33:07 +01:00
parent 9a6c26e348
commit 595b06a1b8
10 changed files with 65 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/ra_hir/src/from_source.rs
View file

@ -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<ModuleSource>) -> Option<Self> {
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<Self> {
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 } })
}
}

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

@ -36,7 +36,6 @@ mod from_id;
mod code_model;
mod has_source;
mod from_source;
pub use crate::{
code_model::{

47
crates/ra_hir/src/source_binder.rs
View file

@ -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<DB: HirDatabase> SourceBinder<'_, DB> {
T::to_def(self, src)
}
pub fn to_module_def(&mut self, file: FileId) -> Option<Module> {
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<T: ToId>(&mut self, src: InFile<T>) -> Option<T::ID> {
T::to_id(self, src)
}
@ -107,8 +118,7 @@ impl<DB: HirDatabase> 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<Self::ID> {
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<Module> {
{
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)
}
}?;