From 56df0fc83c753b7fb8829438c8d3017ef1bf450c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 25 Oct 2018 16:03:49 +0300
Subject: Improve logging

---
 crates/ra_analysis/src/db/mod.rs |  9 +--------
 crates/ra_analysis/src/imp.rs    |  2 ++
 crates/ra_analysis/src/lib.rs    | 19 ++++++++++++++++---
 3 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'crates/ra_analysis/src')

diff --git a/crates/ra_analysis/src/db/mod.rs b/crates/ra_analysis/src/db/mod.rs
index 8387118ad..1a9023697 100644
--- a/crates/ra_analysis/src/db/mod.rs
+++ b/crates/ra_analysis/src/db/mod.rs
@@ -1,7 +1,6 @@
 pub(crate) mod input;
 
 use std::{
-    fmt,
     sync::Arc,
 };
 
@@ -17,17 +16,11 @@ use crate::{
     FileId,
 };
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub(crate) struct RootDatabase {
     runtime: salsa::Runtime<RootDatabase>,
 }
 
-impl fmt::Debug for RootDatabase {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str("RootDatabase { ... }")
-    }
-}
-
 impl salsa::Database for RootDatabase {
     fn salsa_runtime(&self) -> &salsa::Runtime<RootDatabase> {
         &self.runtime
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 97ed55465..6c1a4749a 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -98,6 +98,8 @@ impl AnalysisHostImpl {
         }
     }
     pub fn apply_change(&mut self, change: AnalysisChange) {
+        log::info!("apply_change {:?}", change);
+
         for (file_id, text) in change.files_changed {
             self.db
                 .query(db::input::FileTextQuery)
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index 4a1ae3b64..703938cf9 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -13,7 +13,7 @@ mod symbol_index;
 mod completion;
 
 use std::{
-    fmt::Debug,
+    fmt,
     sync::Arc,
     collections::BTreeMap,
 };
@@ -60,12 +60,12 @@ pub struct CrateGraph {
     pub crate_roots: BTreeMap<CrateId, FileId>,
 }
 
-pub trait FileResolver: Debug + Send + Sync + 'static {
+pub trait FileResolver: fmt::Debug + Send + Sync + 'static {
     fn file_stem(&self, file_id: FileId) -> String;
     fn resolve(&self, file_id: FileId, path: &RelativePath) -> Option<FileId>;
 }
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct AnalysisChange {
     files_added: Vec<(FileId, String)>,
     files_changed: Vec<(FileId, String)>,
@@ -75,6 +75,19 @@ pub struct AnalysisChange {
     file_resolver: Option<FileResolverImp>,
 }
 
+impl fmt::Debug for AnalysisChange {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.debug_struct("AnalysisChange")
+            .field("files_added", &self.files_added.len())
+            .field("files_changed", &self.files_changed.len())
+            .field("files_removed", &self.files_removed.len())
+            .field("libraries_added", &self.libraries_added.len())
+            .field("crate_graph", &self.crate_graph)
+            .field("file_resolver", &self.file_resolver)
+            .finish()
+    }
+}
+
 
 impl AnalysisChange {
     pub fn new() -> AnalysisChange {
-- 
cgit v1.2.3