itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename item_tree query to file_item_tree

Browse Source
This commit is contained in:
Jonas Schievink 2021-03-13 02:24:26 +01:00
parent 759f8c83e5
commit 5fbb97a0f0
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/hir/src/db.rs
View File

@ -3,10 +3,10 @@
pub use hir_def::db::{ pub use hir_def::db::{
AttrsQuery, BlockDefMapQuery, BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, AttrsQuery, BlockDefMapQuery, BodyQuery, BodyWithSourceMapQuery, ConstDataQuery,
CrateDefMapQueryQuery, CrateLangItemsQuery, DefDatabase, DefDatabaseStorage, EnumDataQuery, CrateDefMapQueryQuery, CrateLangItemsQuery, DefDatabase, DefDatabaseStorage, EnumDataQuery,
ExprScopesQuery, FunctionDataQuery, GenericParamsQuery, ImplDataQuery, ImportMapQuery, ExprScopesQuery, FileItemTreeQuery, FunctionDataQuery, GenericParamsQuery, ImplDataQuery,
InternConstQuery, InternDatabase, InternDatabaseStorage, InternEnumQuery, InternFunctionQuery, ImportMapQuery, InternConstQuery, InternDatabase, InternDatabaseStorage, InternEnumQuery,
InternImplQuery, InternStaticQuery, InternStructQuery, InternTraitQuery, InternTypeAliasQuery, InternFunctionQuery, InternImplQuery, InternStaticQuery, InternStructQuery, InternTraitQuery,
InternUnionQuery, ItemTreeQuery, LangItemQuery, StaticDataQuery, StructDataQuery, InternTypeAliasQuery, InternUnionQuery, LangItemQuery, StaticDataQuery, StructDataQuery,
TraitDataQuery, TypeAliasDataQuery, UnionDataQuery, TraitDataQuery, TypeAliasDataQuery, UnionDataQuery,
}; };
pub use hir_expand::db::{ pub use hir_expand::db::{

4
crates/hir_def/src/data.rs
View File

@ -251,7 +251,7 @@ fn collect_items(
return Vec::new(); return Vec::new();
} }
let item_tree = db.item_tree(file_id); let item_tree = db.file_item_tree(file_id);
let crate_graph = db.crate_graph(); let crate_graph = db.crate_graph();
let cfg_options = &crate_graph[module.krate].cfg_options; let cfg_options = &crate_graph[module.krate].cfg_options;
@ -292,7 +292,7 @@ fn collect_items(
if let Ok(res) = res { if let Ok(res) = res {
if let Some((mark, mac)) = res.value { if let Some((mark, mac)) = res.value {
let src: InFile<ast::MacroItems> = expander.to_source(mac); let src: InFile<ast::MacroItems> = expander.to_source(mac);
let item_tree = db.item_tree(src.file_id); let item_tree = db.file_item_tree(src.file_id);
let iter = let iter =
item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item); item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item);
items.extend(collect_items( items.extend(collect_items(

4
crates/hir_def/src/db.rs
View File

@ -48,8 +48,8 @@ pub trait InternDatabase: SourceDatabase {
#[salsa::query_group(DefDatabaseStorage)] #[salsa::query_group(DefDatabaseStorage)]
pub trait DefDatabase: InternDatabase + AstDatabase + Upcast<dyn AstDatabase> { pub trait DefDatabase: InternDatabase + AstDatabase + Upcast<dyn AstDatabase> {
#[salsa::invoke(ItemTree::item_tree_query)] #[salsa::invoke(ItemTree::file_item_tree_query)]
fn item_tree(&self, file_id: HirFileId) -> Arc<ItemTree>; fn file_item_tree(&self, file_id: HirFileId) -> Arc<ItemTree>;
#[salsa::invoke(crate_def_map_wait)] #[salsa::invoke(crate_def_map_wait)]
#[salsa::transparent] #[salsa::transparent]

4
crates/hir_def/src/item_tree.rs
View File

@ -76,7 +76,7 @@ pub struct ItemTree {
} }
impl ItemTree { impl ItemTree {
pub(crate) fn item_tree_query(db: &dyn DefDatabase, file_id: HirFileId) -> Arc<ItemTree> { pub(crate) fn file_item_tree_query(db: &dyn DefDatabase, file_id: HirFileId) -> Arc<ItemTree> {
let _p = profile::span("item_tree_query").detail(|| format!("{:?}", file_id)); let _p = profile::span("item_tree_query").detail(|| format!("{:?}", file_id));
let syntax = if let Some(node) = db.parse_or_expand(file_id) { let syntax = if let Some(node) = db.parse_or_expand(file_id) {
if node.kind() == SyntaxKind::ERROR { if node.kind() == SyntaxKind::ERROR {
@ -417,7 +417,7 @@ impl<N: ItemTreeNode> ItemTreeId<N> {
} }
pub fn item_tree(self, db: &dyn DefDatabase) -> Arc<ItemTree> { pub fn item_tree(self, db: &dyn DefDatabase) -> Arc<ItemTree> {
db.item_tree(self.file) db.file_item_tree(self.file)
} }
} }

2
crates/hir_def/src/nameres.rs
View File

@ -213,7 +213,7 @@ impl DefMap {
) -> Option<Arc<DefMap>> { ) -> Option<Arc<DefMap>> {
let block: BlockLoc = db.lookup_intern_block(block_id); let block: BlockLoc = db.lookup_intern_block(block_id);
let item_tree = db.item_tree(block.ast_id.file_id); let item_tree = db.file_item_tree(block.ast_id.file_id);
if item_tree.inner_items_of_block(block.ast_id.value).is_empty() { if item_tree.inner_items_of_block(block.ast_id.value).is_empty() {
return None; return None;
} }

8
crates/hir_def/src/nameres/collector.rs
View File

@ -242,7 +242,7 @@ struct DefCollector<'a> {
impl DefCollector<'_> { impl DefCollector<'_> {
fn seed_with_top_level(&mut self) { fn seed_with_top_level(&mut self) {
let file_id = self.db.crate_graph()[self.def_map.krate].root_file_id; let file_id = self.db.crate_graph()[self.def_map.krate].root_file_id;
let item_tree = self.db.item_tree(file_id.into()); let item_tree = self.db.file_item_tree(file_id.into());
let module_id = self.def_map.root; let module_id = self.def_map.root;
self.def_map.modules[module_id].origin = ModuleOrigin::CrateRoot { definition: file_id }; self.def_map.modules[module_id].origin = ModuleOrigin::CrateRoot { definition: file_id };
if item_tree if item_tree
@ -263,7 +263,7 @@ impl DefCollector<'_> {
} }
fn seed_with_inner(&mut self, block: AstId<ast::BlockExpr>) { fn seed_with_inner(&mut self, block: AstId<ast::BlockExpr>) {
let item_tree = self.db.item_tree(block.file_id); let item_tree = self.db.file_item_tree(block.file_id);
let module_id = self.def_map.root; let module_id = self.def_map.root;
self.def_map.modules[module_id].origin = ModuleOrigin::BlockExpr { block }; self.def_map.modules[module_id].origin = ModuleOrigin::BlockExpr { block };
if item_tree if item_tree
@ -895,7 +895,7 @@ impl DefCollector<'_> {
} }
// Then, fetch and process the item tree. This will reuse the expansion result from above. // Then, fetch and process the item tree. This will reuse the expansion result from above.
let item_tree = self.db.item_tree(file_id); let item_tree = self.db.file_item_tree(file_id);
let mod_dir = self.mod_dirs[&module_id].clone(); let mod_dir = self.mod_dirs[&module_id].clone();
ModCollector { ModCollector {
def_collector: &mut *self, def_collector: &mut *self,
@ -1299,7 +1299,7 @@ impl ModCollector<'_, '_> {
Some((file_id, is_mod_rs)), Some((file_id, is_mod_rs)),
&self.item_tree[module.visibility], &self.item_tree[module.visibility],
); );
let item_tree = db.item_tree(file_id.into()); let item_tree = db.file_item_tree(file_id.into());
ModCollector { ModCollector {
def_collector: &mut *self.def_collector, def_collector: &mut *self.def_collector,
macro_depth: self.macro_depth, macro_depth: self.macro_depth,

2
crates/ide_db/src/apply_change.rs
View File

@ -148,7 +148,7 @@ impl RootDatabase {
hir::db::HygieneFrameQuery hir::db::HygieneFrameQuery
// DefDatabase // DefDatabase
hir::db::ItemTreeQuery hir::db::FileItemTreeQuery
hir::db::BlockDefMapQuery hir::db::BlockDefMapQuery
hir::db::CrateDefMapQueryQuery hir::db::CrateDefMapQueryQuery
hir::db::StructDataQuery hir::db::StructDataQuery