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

switched to lowerd module

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-18 16:36:56 +03:00
parent b93c6bc557
commit c0aeb5204c
9 changed files with 284 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_hir/src/code_model_impl/module.rs
View file

@ -5,7 +5,7 @@ use crate::{
Module, ModuleSource, Problem,
Crate, DefId, DefLoc, DefKind, Name, Path, PathKind, PerNs, Def,
module_tree::ModuleId,
nameres::ModuleScope,
nameres::{ModuleScope, lower::LoweredImport},
db::HirDatabase,
};
@ -37,7 +37,7 @@ impl Module {
Some(link.name(&module_tree).clone())
}
pub fn definition_source_impl(&self, db: &impl HirDatabase) -> (FileId, ModuleSource) {
pub(crate) fn definition_source_impl(&self, db: &impl HirDatabase) -> (FileId, ModuleSource) {
let loc = self.def_id.loc(db);
let file_id = loc.source_item_id.file_id.as_original_file();
let syntax_node = db.file_item(loc.source_item_id);
@ -50,7 +50,7 @@ impl Module {
(file_id, module_source)
}
pub fn declaration_source_impl(
pub(crate) fn declaration_source_impl(
&self,
db: &impl HirDatabase,
) -> Option<(FileId, TreeArc<ast::Module>)> {
@ -66,6 +66,17 @@ impl Module {
Some((file_id, src))
}
pub(crate) fn import_source_impl(
&self,
db: &impl HirDatabase,
import: LoweredImport,
) -> TreeArc<ast::PathSegment> {
let loc = self.def_id.loc(db);
let source_map = db.lower_module_source_map(loc.source_root_id, loc.module_id);
let (_, source) = self.definition_source(db);
source_map.get(&source, import)
}
pub(crate) fn krate_impl(&self, db: &impl HirDatabase) -> Option<Crate> {
let root = self.crate_root(db);
let loc = root.def_id.loc(db);