Bring back LRU limit for macro_expand query

rust-lang-ci · Apr 16, 2023 · 76718ea · 76718ea
1 parent 4ea5d7f
commit 76718ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/crates/hir-def/src/db.rs b/crates/hir-def/src/db.rs
@@ -93,8 +93,6 @@ pub trait DefDatabase: InternDatabase + ExpandDatabase + Upcast<dyn ExpandDataba
     ///
     /// The `block_def_map` for block 0 would return `None`, while `block_def_map` of block 1 would
     /// return a `DefMap` containing `inner`.
-    // FIXME: This actually can't return None anymore as we no longer allocate block scopes for
-    // non item declaring blocks
     #[salsa::invoke(DefMap::block_def_map_query)]
     fn block_def_map(&self, block: BlockId) -> Arc<DefMap>;
 

diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs
@@ -166,6 +166,12 @@ impl RootDatabase {
                 .copied()
                 .unwrap_or(base_db::DEFAULT_LRU_CAP),
         );
+        hir_db::MacroExpandQuery.in_db_mut(self).set_lru_capacity(
+            lru_capacities
+                .get(stringify!(MacroExpandQuery))
+                .copied()
+                .unwrap_or(base_db::DEFAULT_LRU_CAP),
+        );
 
         macro_rules! update_lru_capacity_per_query {
             ($( $module:ident :: $query:ident )*) => {$(