From ae97a45c355cbfc0aa61c09ea7cb93373855b9ff Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 26 Jan 2019 22:43:07 +0300 Subject: remove dead code --- crates/ra_hir/src/ids.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index 7dd4b540e..631f6f6a1 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs @@ -367,10 +367,6 @@ impl SourceFileItems { self.arena.iter().map(|(_id, i)| i).collect::>(), ); } - pub fn id_of_parse(&self) -> SourceFileItemId { - let (id, _syntax) = self.arena.iter().next().unwrap(); - id - } } impl std::ops::Index for SourceFileItems { -- cgit v1.2.3 From 9c1a18a626770b60e8785aa34505dc2caf061c02 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 26 Jan 2019 22:48:04 +0300 Subject: store syntax ptr in FileItems we cache the tree in file_item query anyway --- crates/ra_hir/src/ids.rs | 29 ++++++++++------------------- crates/ra_hir/src/query_definitions.rs | 7 +++++-- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index 631f6f6a1..015d640e3 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs @@ -4,7 +4,7 @@ use std::{ }; use ra_db::{LocationIntener, FileId}; -use ra_syntax::{TreeArc, SyntaxNode, SourceFile, AstNode, ast}; +use ra_syntax::{TreeArc, SyntaxNode, SourceFile, AstNode, SyntaxNodePtr, ast}; use ra_arena::{Arena, RawId, ArenaId, impl_arena_id}; use crate::{ @@ -309,7 +309,7 @@ pub struct SourceItemId { #[derive(Debug, PartialEq, Eq)] pub struct SourceFileItems { file_id: HirFileId, - arena: Arena>, + arena: Arena, } impl SourceFileItems { @@ -329,15 +329,15 @@ impl SourceFileItems { // trait does not chage ids of top-level items, which helps caching. bfs(source_file.syntax(), |it| { if let Some(module_item) = ast::ModuleItem::cast(it) { - self.alloc(module_item.syntax().to_owned()); + self.alloc(module_item.syntax()); } else if let Some(macro_call) = ast::MacroCall::cast(it) { - self.alloc(macro_call.syntax().to_owned()); + self.alloc(macro_call.syntax()); } }) } - fn alloc(&mut self, item: TreeArc) -> SourceFileItemId { - self.arena.alloc(item) + fn alloc(&mut self, item: &SyntaxNode) -> SourceFileItemId { + self.arena.alloc(SyntaxNodePtr::new(item)) } pub(crate) fn id_of(&self, file_id: HirFileId, item: &SyntaxNode) -> SourceFileItemId { assert_eq!( @@ -348,17 +348,8 @@ impl SourceFileItems { self.id_of_unchecked(item) } pub(crate) fn id_of_unchecked(&self, item: &SyntaxNode) -> SourceFileItemId { - if let Some((id, _)) = self.arena.iter().find(|(_id, i)| *i == item) { - return id; - } - // This should not happen. Let's try to give a sensible diagnostics. - if let Some((id, i)) = self.arena.iter().find(|(_id, i)| i.range() == item.range()) { - // FIXME(#288): whyyy are we getting here? - log::error!( - "unequal syntax nodes with the same range:\n{:?}\n{:?}", - item, - i - ); + let ptr = SyntaxNodePtr::new(item); + if let Some((id, _)) = self.arena.iter().find(|(_id, i)| **i == ptr) { return id; } panic!( @@ -370,8 +361,8 @@ impl SourceFileItems { } impl std::ops::Index for SourceFileItems { - type Output = SyntaxNode; - fn index(&self, idx: SourceFileItemId) -> &SyntaxNode { + type Output = SyntaxNodePtr; + fn index(&self, idx: SourceFileItemId) -> &SyntaxNodePtr { &self.arena[idx] } } diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs index 61c93a964..380c06404 100644 --- a/crates/ra_hir/src/query_definitions.rs +++ b/crates/ra_hir/src/query_definitions.rs @@ -32,9 +32,12 @@ pub(super) fn file_item( db: &impl HirDatabase, source_item_id: SourceItemId, ) -> TreeArc { + let source_file = db.hir_parse(source_item_id.file_id); match source_item_id.item_id { - Some(id) => db.file_items(source_item_id.file_id)[id].to_owned(), - None => db.hir_parse(source_item_id.file_id).syntax().to_owned(), + Some(id) => db.file_items(source_item_id.file_id)[id] + .to_node(&source_file) + .to_owned(), + None => source_file.syntax().to_owned(), } } -- cgit v1.2.3 From a128075af9dd7286d444312ca3bbb9645c008f50 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 26 Jan 2019 23:25:18 +0300 Subject: remove Option hack --- crates/ra_hir/src/code_model_impl/module.rs | 10 +-- crates/ra_hir/src/db.rs | 7 +- crates/ra_hir/src/ids.rs | 5 +- crates/ra_hir/src/module_tree.rs | 99 ++++++++++++++++------------- crates/ra_hir/src/nameres.rs | 2 +- crates/ra_hir/src/nameres/lower.rs | 5 +- crates/ra_hir/src/query_definitions.rs | 13 ++-- crates/ra_hir/src/source_binder.rs | 28 ++++---- 8 files changed, 86 insertions(+), 83 deletions(-) diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs index 480ec27bf..418d59c91 100644 --- a/crates/ra_hir/src/code_model_impl/module.rs +++ b/crates/ra_hir/src/code_model_impl/module.rs @@ -25,9 +25,10 @@ impl Module { pub(crate) fn definition_source_impl(&self, db: &impl HirDatabase) -> (FileId, ModuleSource) { let module_tree = db.module_tree(self.krate); - let source = self.module_id.source(&module_tree); - let module_source = ModuleSource::from_source_item_id(db, source); - let file_id = source.file_id.as_original_file(); + let file_id = self.module_id.file_id(&module_tree); + let decl_id = self.module_id.decl_id(&module_tree); + let module_source = ModuleSource::new(db, file_id, decl_id); + let file_id = file_id.as_original_file(); (file_id, module_source) } @@ -39,8 +40,7 @@ impl Module { let link = self.module_id.parent_link(&module_tree)?; let file_id = link .owner(&module_tree) - .source(&module_tree) - .file_id + .file_id(&module_tree) .as_original_file(); let src = link.source(&module_tree, db); Some((file_id, src)) diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 5df4bd4a1..3f76b769d 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs @@ -16,6 +16,7 @@ use crate::{ adt::{StructData, EnumData}, impl_block::ModuleImplBlocks, generics::{GenericParams, GenericDef}, + ids::SourceFileItemId, }; #[salsa::query_group(HirDatabaseStorage)] @@ -51,7 +52,11 @@ pub trait HirDatabase: SourceDatabase + AsRef { fn file_item(&self, source_item_id: SourceItemId) -> TreeArc; #[salsa::invoke(crate::module_tree::Submodule::submodules_query)] - fn submodules(&self, source: SourceItemId) -> Arc>; + fn submodules( + &self, + file_id: HirFileId, + delc_id: Option, + ) -> Arc>; #[salsa::invoke(crate::nameres::lower::LoweredModule::lower_module_query)] fn lower_module(&self, module: Module) -> (Arc, Arc); diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index 015d640e3..0e4dc6261 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs @@ -203,7 +203,7 @@ pub(crate) trait AstItemDef: ArenaId + Clone { let items = ctx.db.file_items(ctx.file_id); let raw = SourceItemId { file_id: ctx.file_id, - item_id: Some(items.id_of(ctx.file_id, ast.syntax())), + item_id: items.id_of(ctx.file_id, ast.syntax()), }; let loc = ItemLoc { module: ctx.module, @@ -301,8 +301,7 @@ impl_arena_id!(SourceFileItemId); #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct SourceItemId { pub(crate) file_id: HirFileId, - /// None for the whole file. - pub(crate) item_id: Option, + pub(crate) item_id: SourceFileItemId, } /// Maps items' `SyntaxNode`s to `SourceFileItemId`s and back. diff --git a/crates/ra_hir/src/module_tree.rs b/crates/ra_hir/src/module_tree.rs index d5ad9decb..d1dc3fa4b 100644 --- a/crates/ra_hir/src/module_tree.rs +++ b/crates/ra_hir/src/module_tree.rs @@ -11,21 +11,28 @@ use ra_syntax::{ use ra_arena::{Arena, RawId, impl_arena_id}; use test_utils::tested_by; -use crate::{Name, AsName, HirDatabase, SourceItemId, HirFileId, Problem, SourceFileItems, ModuleSource}; +use crate::{ + Name, AsName, HirDatabase, SourceItemId, HirFileId, Problem, SourceFileItems, ModuleSource, + ids::SourceFileItemId, +}; impl ModuleSource { - pub(crate) fn from_source_item_id( + pub(crate) fn new( db: &impl HirDatabase, - source_item_id: SourceItemId, + file_id: HirFileId, + decl_id: Option, ) -> ModuleSource { - let module_syntax = db.file_item(source_item_id); - if let Some(source_file) = ast::SourceFile::cast(&module_syntax) { - ModuleSource::SourceFile(source_file.to_owned()) - } else if let Some(module) = ast::Module::cast(&module_syntax) { - assert!(module.item_list().is_some(), "expected inline module"); - ModuleSource::Module(module.to_owned()) - } else { - panic!("expected file or inline module") + match decl_id { + Some(item_id) => { + let module = db.file_item(SourceItemId { file_id, item_id }); + let module = ast::Module::cast(&*module).unwrap(); + assert!(module.item_list().is_some(), "expected inline module"); + ModuleSource::Module(module.to_owned()) + } + None => { + let source_file = db.hir_parse(file_id); + ModuleSource::SourceFile(source_file) + } } } } @@ -34,18 +41,18 @@ impl ModuleSource { pub struct Submodule { name: Name, is_declaration: bool, - source: SourceItemId, + decl_id: SourceFileItemId, } impl Submodule { pub(crate) fn submodules_query( db: &impl HirDatabase, - source: SourceItemId, + file_id: HirFileId, + decl_id: Option, ) -> Arc> { db.check_canceled(); - let file_id = source.file_id; let file_items = db.file_items(file_id); - let module_source = ModuleSource::from_source_item_id(db, source); + let module_source = ModuleSource::new(db, file_id, decl_id); let submodules = match module_source { ModuleSource::SourceFile(source_file) => { collect_submodules(file_id, &file_items, &*source_file) @@ -54,6 +61,7 @@ impl Submodule { collect_submodules(file_id, &file_items, module.item_list().unwrap()) } }; + return Arc::new(submodules); fn collect_submodules( @@ -75,10 +83,7 @@ impl Submodule { let sub = Submodule { name, is_declaration: module.has_semi(), - source: SourceItemId { - file_id, - item_id: Some(file_items.id_of(file_id, module.syntax())), - }, + decl_id: file_items.id_of(file_id, module.syntax()), }; Some(sub) }) @@ -110,7 +115,9 @@ pub struct ModuleTree { #[derive(Debug, PartialEq, Eq, Hash)] pub struct ModuleData { - source: SourceItemId, + file_id: HirFileId, + /// Points to `ast::Module`, `None` for the whole file. + decl_id: Option, parent: Option, children: Vec, } @@ -136,8 +143,15 @@ impl ModuleTree { self.mods.iter().map(|(id, _)| id) } - pub(crate) fn find_module_by_source(&self, source: SourceItemId) -> Option { - let (res, _) = self.mods.iter().find(|(_, m)| m.source == source)?; + pub(crate) fn find_module_by_source( + &self, + file_id: HirFileId, + decl_id: Option, + ) -> Option { + let (res, _) = self + .mods + .iter() + .find(|(_, m)| (m.file_id, m.decl_id) == (file_id, decl_id))?; Some(res) } @@ -147,11 +161,7 @@ impl ModuleTree { let source_root_id = db.file_source_root(file_id); let source_root = db.source_root(source_root_id); - let source = SourceItemId { - file_id: file_id.into(), - item_id: None, - }; - self.init_subtree(db, &source_root, None, source); + self.init_subtree(db, &source_root, None, file_id.into(), None); } fn init_subtree( @@ -159,16 +169,21 @@ impl ModuleTree { db: &impl HirDatabase, source_root: &SourceRoot, parent: Option, - source: SourceItemId, + file_id: HirFileId, + decl_id: Option, ) -> ModuleId { let id = self.alloc_mod(ModuleData { - source, + file_id, + decl_id, parent, children: Vec::new(), }); - for sub in db.submodules(source).iter() { + for sub in db.submodules(file_id, decl_id).iter() { let link = self.alloc_link(LinkData { - source: sub.source, + source: SourceItemId { + file_id, + item_id: sub.decl_id, + }, name: sub.name.clone(), owner: id, points_to: Vec::new(), @@ -176,24 +191,17 @@ impl ModuleTree { }); let (points_to, problem) = if sub.is_declaration { - let (points_to, problem) = resolve_submodule(db, source.file_id, &sub.name); + let (points_to, problem) = resolve_submodule(db, file_id, &sub.name); let points_to = points_to .into_iter() .map(|file_id| { - self.init_subtree( - db, - source_root, - Some(link), - SourceItemId { - file_id: file_id.into(), - item_id: None, - }, - ) + self.init_subtree(db, source_root, Some(link), file_id.into(), None) }) .collect::>(); (points_to, problem) } else { - let points_to = self.init_subtree(db, source_root, Some(link), sub.source); + let points_to = + self.init_subtree(db, source_root, Some(link), file_id, Some(sub.decl_id)); (vec![points_to], None) }; @@ -216,8 +224,11 @@ impl ModuleTree { } impl ModuleId { - pub(crate) fn source(self, tree: &ModuleTree) -> SourceItemId { - tree.mods[self].source + pub(crate) fn file_id(self, tree: &ModuleTree) -> HirFileId { + tree.mods[self].file_id + } + pub(crate) fn decl_id(self, tree: &ModuleTree) -> Option { + tree.mods[self].decl_id } pub(crate) fn parent_link(self, tree: &ModuleTree) -> Option { tree.mods[self].parent diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 5193900e0..97ce6c946 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs @@ -215,7 +215,7 @@ where // Populate extern crates prelude { let root_id = module_id.crate_root(&self.module_tree); - let file_id = root_id.source(&self.module_tree).file_id; + let file_id = root_id.file_id(&self.module_tree); let crate_graph = self.db.crate_graph(); if let Some(crate_id) = crate_graph.crate_id_for_crate_root(file_id.as_original_file()) { diff --git a/crates/ra_hir/src/nameres/lower.rs b/crates/ra_hir/src/nameres/lower.rs index 1d77548f3..8df11a5f4 100644 --- a/crates/ra_hir/src/nameres/lower.rs +++ b/crates/ra_hir/src/nameres/lower.rs @@ -121,10 +121,7 @@ impl LoweredModule { let item_id = file_items.id_of_unchecked(macro_call.syntax()); let loc = MacroCallLoc { module, - source_item_id: SourceItemId { - file_id, - item_id: Some(item_id), - }, + source_item_id: SourceItemId { file_id, item_id }, }; let id = loc.id(db); let file_id = HirFileId::from(id); diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs index 380c06404..bf9ac0dfb 100644 --- a/crates/ra_hir/src/query_definitions.rs +++ b/crates/ra_hir/src/query_definitions.rs @@ -4,9 +4,7 @@ use std::{ }; use rustc_hash::FxHashMap; -use ra_syntax::{ - AstNode, SyntaxNode, TreeArc, -}; +use ra_syntax::{SyntaxNode, TreeArc}; use ra_db::{CrateId}; use crate::{ @@ -33,12 +31,9 @@ pub(super) fn file_item( source_item_id: SourceItemId, ) -> TreeArc { let source_file = db.hir_parse(source_item_id.file_id); - match source_item_id.item_id { - Some(id) => db.file_items(source_item_id.file_id)[id] - .to_node(&source_file) - .to_owned(), - None => source_file.syntax().to_owned(), - } + db.file_items(source_item_id.file_id)[source_item_id.item_id] + .to_node(&source_file) + .to_owned() } pub(super) fn item_map(db: &impl HirDatabase, crate_id: CrateId) -> Arc { diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index c0b3f1cd4..f523f0647 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs @@ -13,18 +13,14 @@ use ra_syntax::{ }; use crate::{ - HirDatabase, Function, SourceItemId, ModuleDef, - AsName, Module, - ids::LocationCtx, + HirDatabase, Function, ModuleDef, + AsName, Module, HirFileId, + ids::{LocationCtx, SourceFileItemId}, }; /// Locates the module by `FileId`. Picks topmost module in the file. pub fn module_from_file_id(db: &impl HirDatabase, file_id: FileId) -> Option { - let module_source = SourceItemId { - file_id: file_id.into(), - item_id: None, - }; - module_from_source(db, module_source) + module_from_source(db, file_id.into(), None) } /// Locates the child module by `mod child;` declaration. @@ -59,11 +55,7 @@ fn module_from_inline( let file_id = file_id.into(); let file_items = db.file_items(file_id); let item_id = file_items.id_of(file_id, module.syntax()); - let source = SourceItemId { - file_id, - item_id: Some(item_id), - }; - module_from_source(db, source) + module_from_source(db, file_id, Some(item_id)) } /// Locates the module by child syntax element within the module @@ -83,13 +75,17 @@ pub fn module_from_child_node( } } -fn module_from_source(db: &impl HirDatabase, source: SourceItemId) -> Option { - let source_root_id = db.file_source_root(source.file_id.as_original_file()); +fn module_from_source( + db: &impl HirDatabase, + file_id: HirFileId, + decl_id: Option, +) -> Option { + let source_root_id = db.file_source_root(file_id.as_original_file()); db.source_root_crates(source_root_id) .iter() .find_map(|&krate| { let module_tree = db.module_tree(krate); - let module_id = module_tree.find_module_by_source(source)?; + let module_id = module_tree.find_module_by_source(file_id, decl_id)?; Some(Module { krate, module_id }) }) } -- cgit v1.2.3