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

rename MFileId -> HirFileId

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-01 23:21:16 +03:00
parent 9c65e61849
commit 37ed2f35ba
13 changed files with 135 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ use crate::{
/// Locates the module by `FileId`. Picks topmost module in the file.
pub fn module_from_file_id(db: &impl HirDatabase, file_id: FileId) -> Cancelable<Option<Module>> {
let module_source = ModuleSource::new_file(file_id);
let module_source = ModuleSource::new_file(file_id.into());
module_from_source(db, module_source)
}
@ -50,8 +50,8 @@ pub fn module_from_position(
) -> Cancelable<Option<Module>> {
let file = db.source_file(position.file_id);
let module_source = match find_node_at_offset::<ast::Module>(file.syntax(), position.offset) {
Some(m) if !m.has_semi() => ModuleSource::new_inline(db, position.file_id, m),
_ => ModuleSource::new_file(position.file_id),
Some(m) if !m.has_semi() => ModuleSource::new_inline(db, position.file_id.into(), m),
_ => ModuleSource::new_file(position.file_id.into()),
};
module_from_source(db, module_source)
}
@ -67,9 +67,9 @@ pub fn module_from_child_node(
.filter_map(ast::Module::cast)
.find(|it| !it.has_semi())
{
ModuleSource::new_inline(db, file_id, m)
ModuleSource::new_inline(db, file_id.into(), m)
} else {
ModuleSource::new_file(file_id)
ModuleSource::new_file(file_id.into())
};
module_from_source(db, module_source)
}
@ -78,7 +78,7 @@ fn module_from_source(
db: &impl HirDatabase,
module_source: ModuleSource,
) -> Cancelable<Option<Module>> {
let source_root_id = db.file_source_root(module_source.file_id());
let source_root_id = db.file_source_root(module_source.file_id().as_original_file());
let module_tree = db.module_tree(source_root_id)?;
let m = module_tree
.modules_with_sources()
@ -102,11 +102,11 @@ pub fn function_from_module(
module: &Module,
fn_def: ast::FnDef,
) -> Function {
let mfile_id = module.source().file_id().into();
let file_items = db.file_items(mfile_id);
let item_id = file_items.id_of(mfile_id, fn_def.syntax());
let file_id = module.source().file_id();
let file_items = db.file_items(file_id);
let item_id = file_items.id_of(file_id, fn_def.syntax());
let source_item_id = SourceItemId {
mfile_id,
file_id,
item_id: Some(item_id),
};
let def_loc = DefLoc {