squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Confluent ModuleSource usage

Browse source
This commit is contained in:
ice1000 2019-12-03 15:28:40 -05:00
parent 38853459e3
commit 5c5f90ba57
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_hir/src/code_model/src.rs
View file

@ -26,11 +26,7 @@ impl Module {
/// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
pub fn definition_source(self, db: &impl DefDatabase) -> InFile<ModuleSource> {
let def_map = db.crate_def_map(self.id.krate);
let src = def_map[self.id.local_id].definition_source(db);
src.map(|it| match it {
Either::Left(it) => ModuleSource::SourceFile(it),
Either::Right(it) => ModuleSource::Module(it),
})
def_map[self.id.local_id].definition_source(db)
}
/// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`.

18
crates/ra_hir_def/src/nameres.rs
View file

@ -57,7 +57,6 @@ mod tests;
use std::sync::Arc;
use either::Either;
use hir_expand::{
ast_id_map::FileAstId, diagnostics::DiagnosticSink, name::Name, InFile, MacroDefId,
};
@ -154,20 +153,16 @@ impl ModuleOrigin {
/// Returns a node which defines this module.
/// That is, a file or a `mod foo {}` with items.
pub fn definition_source(
&self,
db: &impl DefDatabase,
) -> InFile<Either<ast::SourceFile, ast::Module>> {
pub fn definition_source(&self, db: &impl DefDatabase) -> InFile<ModuleSource> {
match self {
ModuleOrigin::File(_, file_id) | ModuleOrigin::Root(Some(file_id)) => {
let file_id = *file_id;
let sf = db.parse(file_id).tree();
return InFile::new(file_id.into(), Either::Left(sf));
return InFile::new(file_id.into(), ModuleSource::SourceFile(sf));
}
ModuleOrigin::Root(None) => unreachable!(),
ModuleOrigin::Inline(m) => InFile::new(m.file_id, Either::Right(m.to_node(db))),
// FIXME: right now it's never constructed, so it's fine to omit
ModuleOrigin::Block(_b) => unimplemented!(),
ModuleOrigin::Inline(m) => InFile::new(m.file_id, ModuleSource::Module(m.to_node(db))),
ModuleOrigin::Block(b) => InFile::new(b.file_id, ModuleSource::Block(b.to_node(db))),
}
}
}
@ -348,10 +343,7 @@ impl CrateDefMap {
impl ModuleData {
/// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
pub fn definition_source(
&self,
db: &impl DefDatabase,
) -> InFile<Either<ast::SourceFile, ast::Module>> {
pub fn definition_source(&self, db: &impl DefDatabase) -> InFile<ModuleSource> {
self.origin.definition_source(db)
}