1 files changed, 28 insertions, 9 deletions

diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index c7e7dc1c0..85df9c089 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -30,7 +30,7 @@ use crate::{
 };
 
 pub use crate::{
-    completion::CompletionItem,
+    completion::{CompletionItem, CompletionItemKind, InsertText},
 };
 pub use ra_editor::{
     FileSymbol, Fold, FoldKind, HighlightedRange, LineIndex, Runnable, RunnableKind, StructureNode,
@@ -72,13 +72,23 @@ struct RemoveFile {
 
 impl fmt::Debug for AnalysisChange {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("AnalysisChange")
-            .field("new_roots", &self.new_roots)
-            .field("roots_changed", &self.roots_changed)
-            .field("files_changed", &self.files_changed.len())
-            .field("libraries_added", &self.libraries_added.len())
-            .field("crate_graph", &self.crate_graph)
-            .finish()
+        let mut d = fmt.debug_struct("AnalysisChange");
+        if !self.new_roots.is_empty() {
+            d.field("new_roots", &self.new_roots);
+        }
+        if !self.roots_changed.is_empty() {
+            d.field("roots_changed", &self.roots_changed);
+        }
+        if !self.files_changed.is_empty() {
+            d.field("files_changed", &self.files_changed.len());
+        }
+        if !self.libraries_added.is_empty() {
+            d.field("libraries_added", &self.libraries_added.len());
+        }
+        if !self.crate_graph.is_some() {
+            d.field("crate_graph", &self.crate_graph);
+        }
+        d.finish()
     }
 }
 
@@ -358,13 +368,22 @@ impl Analysis {
     }
 }
 
-#[derive(Debug)]
 pub struct LibraryData {
     root_id: SourceRootId,
     root_change: RootChange,
     symbol_index: SymbolIndex,
 }
 
+impl fmt::Debug for LibraryData {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("LibraryData")
+            .field("root_id", &self.root_id)
+            .field("root_change", &self.root_change)
+            .field("n_symbols", &self.symbol_index.len())
+            .finish()
+    }
+}
+
 impl LibraryData {
     pub fn prepare(
         root_id: SourceRootId,