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

fix tests

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-06 13:41:12 +03:00
parent 8c4d277036
commit 61687b9db6
4 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_hir/src/code_model_api.rs
View file

@ -1,4 +1,5 @@
use ra_db::{CrateId, Cancelable};
use ra_db::{CrateId, Cancelable, FileId};
use ra_syntax::ast;
use crate::{Name, db::HirDatabase, DefId};
@ -17,6 +18,9 @@ pub struct CrateDependency {
}
impl Crate {
pub fn crate_id(&self) -> CrateId {
self.crate_id
}
pub fn dependencies(&self, db: &impl HirDatabase) -> Vec<CrateDependency> {
self.dependencies_impl(db)
}
@ -31,6 +35,10 @@ pub struct Module {
}
impl Module {
pub fn source(&self, db: &impl HirDatabase) -> (FileId, Option<ast::ModuleNode>) {
self.source_impl(db)
}
/// Returns the crate this module is part of.
pub fn krate(&self, db: &impl HirDatabase) -> Cancelable<Option<Crate>> {
self.krate_impl(db)

19
crates/ra_hir/src/code_model_impl.rs
View file

@ -1,4 +1,5 @@
use ra_db::{CrateId, Cancelable};
use ra_db::{CrateId, Cancelable, FileId};
use ra_syntax::{AstNode, ast};
use crate::{HirFileId, db::HirDatabase, Crate, CrateDependency, AsName, DefId, DefLoc, DefKind, Name};
@ -48,6 +49,22 @@ impl Module {
crate::code_model_api::Module { def_id }
}
pub(crate) fn source_impl(&self, db: &impl HirDatabase) -> (FileId, Option<ast::ModuleNode>) {
let loc = self.def_id.loc(db);
let source_item_id = loc.source_item_id;
let module = match source_item_id.item_id {
None => None,
Some(_) => {
let syntax_node = db.file_item(source_item_id);
let module = ast::Module::cast(syntax_node.borrowed()).unwrap().owned();
Some(module)
}
};
// FIXME: remove `as_original_file` here
let file_id = source_item_id.file_id.as_original_file();
(file_id, module)
}
pub(crate) fn krate_impl(&self, db: &impl HirDatabase) -> Cancelable<Option<Crate>> {
let root = self.crate_root(db)?;
let loc = root.def_id.loc(db);

4
crates/ra_hir/src/module/nameres/tests.rs
View file

@ -17,7 +17,7 @@ fn item_map(fixture: &str) -> (Arc<hir::ItemMap>, hir::ModuleId) {
let module = hir::source_binder::module_from_position(&db, pos)
.unwrap()
.unwrap();
let module_id = module.module_id;
let module_id = module.def_id.loc(&db).module_id;
(db.item_map(source_root).unwrap(), module_id)
}
@ -155,7 +155,7 @@ fn item_map_across_crates() {
let module = hir::source_binder::module_from_file_id(&db, main_id)
.unwrap()
.unwrap();
let module_id = module.module_id;
let module_id = module.def_id.loc(&db).module_id;
let item_map = db.item_map(source_root).unwrap();
check_module_item_map(