mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes names for collect_item funtions

Browse Source
This commit is contained in:
Edwin Cheng 2020-05-04 18:34:32 +08:00
parent 73ed2f2e90
commit 5899c8eaa9
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/ra_hir_def/src/data.rs
View File

@ -161,14 +161,14 @@ pub(crate) fn trait_data_query(db: &dyn DefDatabase, tr: TraitId) -> Arc<TraitDa
if let Some(item_list) = src.value.item_list() {
let mut expander = Expander::new(db, tr_loc.ast_id.file_id, module_id);
items.extend(collect_impl_items(
items.extend(collect_items(
db,
&mut expander,
item_list.impl_items(),
src.file_id,
container,
));
items.extend(collect_impl_items_in_macros(
items.extend(collect_items_in_macros(
db,
&mut expander,
&src.with_value(item_list),
@ -219,23 +219,12 @@ pub(crate) fn impl_data_query(db: &dyn DefDatabase, id: ImplId) -> Arc<ImplData>
if let Some(item_list) = src.value.item_list() {
let mut expander = Expander::new(db, impl_loc.ast_id.file_id, module_id);
items.extend(
collect_impl_items(
db,
&mut expander,
item_list.impl_items(),
src.file_id,
container,
)
collect_items(db, &mut expander, item_list.impl_items(), src.file_id, container)
.into_iter()
.map(|(_, item)| item),
);
items.extend(
collect_impl_items_in_macros(
db,
&mut expander,
&src.with_value(item_list),
container,
)
collect_items_in_macros(db, &mut expander, &src.with_value(item_list), container)
.into_iter()
.map(|(_, item)| item),
);
@ -281,7 +270,7 @@ fn new<N: NameOwner + TypeAscriptionOwner + VisibilityOwner>(
}
}
fn collect_impl_items_in_macros(
fn collect_items_in_macros(
db: &dyn DefDatabase,
expander: &mut Expander,
impl_def: &InFile<ast::ItemList>,
@ -293,13 +282,13 @@ fn collect_impl_items_in_macros(
let limit = 100;
for m in impl_def.value.syntax().children().filter_map(ast::MacroCall::cast) {
res.extend(collect_impl_items_in_macro(db, expander, m, container, limit))
res.extend(collect_items_in_macro(db, expander, m, container, limit))
}
res
}
fn collect_impl_items_in_macro(
fn collect_items_in_macro(
db: &dyn DefDatabase,
expander: &mut Expander,
m: ast::MacroCall,
@ -312,7 +301,7 @@ fn collect_impl_items_in_macro(
if let Some((mark, items)) = expander.enter_expand(db, None, m) {
let items: InFile<ast::MacroItems> = expander.to_source(items);
let mut res = collect_impl_items(
let mut res = collect_items(
db,
expander,
items.value.items().filter_map(|it| ImplItem::cast(it.syntax().clone())),
@ -324,7 +313,7 @@ fn collect_impl_items_in_macro(
// Note that ast::ModuleItem do not include ast::MacroCall
// We cannot use ModuleItemOwner::items here
for it in items.value.syntax().children().filter_map(ast::MacroCall::cast) {
res.extend(collect_impl_items_in_macro(db, expander, it, container, limit - 1))
res.extend(collect_items_in_macro(db, expander, it, container, limit - 1))
}
expander.exit(db, mark);
res
@ -333,7 +322,7 @@ fn collect_impl_items_in_macro(
}
}
fn collect_impl_items(
fn collect_items(
db: &dyn DefDatabase,
expander: &mut Expander,
impl_items: impl Iterator<Item = ImplItem>,