3 files changed, 19 insertions, 10 deletions

diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index 4b597afc0..02814ce56 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -227,10 +227,17 @@ impl RootDatabase {
         self.query(ra_db::ParseQuery).sweep(sweep);
 
         self.query(hir::db::ParseOrExpandQuery).sweep(sweep);
+        self.query(hir::db::MacroDefQuery).sweep(sweep);
+        self.query(hir::db::MacroArgQuery).sweep(sweep);
+        self.query(hir::db::MacroExpandQuery).sweep(sweep);
         self.query(hir::db::AstIdMapQuery).sweep(sweep);
-        self.query(hir::db::AstIdToNodeQuery).sweep(sweep);
 
         self.query(hir::db::RawItemsWithSourceMapQuery).sweep(sweep);
+        self.query(hir::db::ImplsInModuleWithSourceMapQuery).sweep(sweep);
         self.query(hir::db::BodyWithSourceMapQuery).sweep(sweep);
+
+        self.query(hir::db::ExprScopesQuery).sweep(sweep);
+        self.query(hir::db::InferQuery).sweep(sweep);
+        self.query(hir::db::BodyHirQuery).sweep(sweep);
     }
 }
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index d84a0e7be..d1a452ecb 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -14,8 +14,9 @@ use crate::{LineIndex, symbol_index::{self, SymbolsDatabase}};
     ra_db::SourceDatabaseStorage,
     LineIndexDatabaseStorage,
     symbol_index::SymbolsDatabaseStorage,
-    hir::db::HirDatabaseStorage,
-    hir::db::DefDatabaseStorage
+    hir::db::AstDatabaseStorage,
+    hir::db::DefDatabaseStorage,
+    hir::db::HirDatabaseStorage
 )]
 #[derive(Debug)]
 pub(crate) struct RootDatabase {
diff --git a/crates/ra_ide_api/src/status.rs b/crates/ra_ide_api/src/status.rs
index 821106fea..822279812 100644
--- a/crates/ra_ide_api/src/status.rs
+++ b/crates/ra_ide_api/src/status.rs
@@ -4,11 +4,12 @@ use std::{
     sync::Arc,
 };
 
-use ra_syntax::{AstNode, Parse};
+use ra_syntax::{TreeArc, SyntaxNode};
 use ra_db::{
-    ParseQuery, FileTextQuery, SourceRootId,
+    FileTextQuery, SourceRootId,
     salsa::{Database, debug::{DebugQueryTable, TableEntry}},
 };
+use hir::HirFileId;
 
 use crate::{
     FileId, db::RootDatabase,
@@ -16,7 +17,7 @@ use crate::{
 };
 
 pub(crate) fn syntax_tree_stats(db: &RootDatabase) -> SyntaxTreeStats {
-    db.query(ParseQuery).entries::<SyntaxTreeStats>()
+    db.query(hir::db::ParseOrExpandQuery).entries::<SyntaxTreeStats>()
 }
 
 pub(crate) fn status(db: &RootDatabase) -> String {
@@ -72,17 +73,17 @@ impl fmt::Display for SyntaxTreeStats {
     }
 }
 
-impl FromIterator<TableEntry<FileId, Parse>> for SyntaxTreeStats {
+impl FromIterator<TableEntry<HirFileId, Option<TreeArc<SyntaxNode>>>> for SyntaxTreeStats {
     fn from_iter<T>(iter: T) -> SyntaxTreeStats
     where
-        T: IntoIterator<Item = TableEntry<FileId, Parse>>,
+        T: IntoIterator<Item = TableEntry<HirFileId, Option<TreeArc<SyntaxNode>>>>,
     {
         let mut res = SyntaxTreeStats::default();
         for entry in iter {
             res.total += 1;
-            if let Some(value) = entry.value {
+            if let Some(tree) = entry.value.and_then(|it| it) {
                 res.retained += 1;
-                res.retained_size += value.tree.syntax().memory_size_of_subtree();
+                res.retained_size += tree.memory_size_of_subtree();
             }
         }
         res