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

Use ItemPtr for id

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-28 02:13:52 +03:00
parent 3922503205
commit c2abd17f57
4 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_analysis/src/hir/function/mod.rs
View file

@ -11,8 +11,8 @@ use ra_syntax::{
};
use crate::{
hir::HirDatabase,
syntax_ptr::SyntaxPtr, FileId,
hir::{HirDatabase, SourceItemId},
FileId,
};
pub(crate) use self::scope::FnScopes;
@ -20,8 +20,10 @@ pub(crate) use crate::loc2id::FnId;
impl FnId {
pub(crate) fn get(db: &impl HirDatabase, file_id: FileId, fn_def: ast::FnDef) -> FnId {
let ptr = SyntaxPtr::new(file_id, fn_def.syntax());
db.id_maps().fn_id(ptr)
let file_items = db.file_items(file_id);
let item_id = file_items.id_of(fn_def.syntax());
let item_id = SourceItemId { file_id, item_id };
db.id_maps().fn_id(item_id)
}
}