diff options
Diffstat (limited to 'crates/hir_def/src/data.rs')
-rw-r--r-- | crates/hir_def/src/data.rs | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/crates/hir_def/src/data.rs b/crates/hir_def/src/data.rs index 74a2194e5..1a27f7bf2 100644 --- a/crates/hir_def/src/data.rs +++ b/crates/hir_def/src/data.rs | |||
@@ -267,23 +267,26 @@ fn collect_items( | |||
267 | let ast_id_map = db.ast_id_map(file_id); | 267 | let ast_id_map = db.ast_id_map(file_id); |
268 | let root = db.parse_or_expand(file_id).unwrap(); | 268 | let root = db.parse_or_expand(file_id).unwrap(); |
269 | let call = ast_id_map.get(call.ast_id).to_node(&root); | 269 | let call = ast_id_map.get(call.ast_id).to_node(&root); |
270 | 270 | let res = expander.enter_expand(db, call); | |
271 | if let Some((mark, mac)) = expander.enter_expand(db, call).value { | 271 | |
272 | let src: InFile<ast::MacroItems> = expander.to_source(mac); | 272 | if let Ok(res) = res { |
273 | let item_tree = db.item_tree(src.file_id); | 273 | if let Some((mark, mac)) = res.value { |
274 | let iter = | 274 | let src: InFile<ast::MacroItems> = expander.to_source(mac); |
275 | item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item); | 275 | let item_tree = db.item_tree(src.file_id); |
276 | items.extend(collect_items( | 276 | let iter = |
277 | db, | 277 | item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item); |
278 | module, | 278 | items.extend(collect_items( |
279 | expander, | 279 | db, |
280 | iter, | 280 | module, |
281 | src.file_id, | 281 | expander, |
282 | container, | 282 | iter, |
283 | limit - 1, | 283 | src.file_id, |
284 | )); | 284 | container, |
285 | 285 | limit - 1, | |
286 | expander.exit(db, mark); | 286 | )); |
287 | |||
288 | expander.exit(db, mark); | ||
289 | } | ||
287 | } | 290 | } |
288 | } | 291 | } |
289 | } | 292 | } |