add function to find all imports

Cargo.toml

@@ -10,7 +10,7 @@ categories = ["development-tools"]
 [dependencies]
 rustc-serialize = "0.3"
 log = "0.3"
-rls-data = "= 0.13"
+rls-data = "= 0.14"
 rls-span = "0.4"
 derive-new = "0.5"
 radix_trie = "0.1"

src/analysis.rs

@@ -12,7 +12,7 @@ use std::time::SystemTime;
 use radix_trie::{Trie, TrieCommon};
 
 use {Id, Span};
-use raw::{CrateId, DefKind};
+use raw::{CrateId, DefKind, ImportKind};
 
 /// This is the main database that contains all the collected symbol information,
 /// such as definitions, their mapping between spans, hierarchy and so on,
@@ -39,6 +39,7 @@ pub struct PerCrateAnalysis {
     pub ref_spans: HashMap<Id, Vec<Span>>,
     pub globs: HashMap<Span, Glob>,
     pub impls: HashMap<Id, Vec<Span>>,
+    pub imports: Vec<Import>,
 
     pub root_id: Option<Id>,
     pub timestamp: SystemTime,
@@ -88,6 +89,15 @@ pub struct Def {
     // pub sig: Option<Signature>,
 }
 
+#[derive(Debug, Clone)]
+pub struct Import {
+    pub kind: ImportKind,
+    pub parent: Option<Id>,
+
+    /// The imported def.
+    pub def_id: Option<Id>,
+}
+
 #[derive(Debug, Clone)]
 pub struct Signature {
     pub span: Span,
@@ -123,6 +133,7 @@ impl PerCrateAnalysis {
             ref_spans: HashMap::new(),
             globs: HashMap::new(),
             impls: HashMap::new(),
+            imports: Vec::new(),
             root_id: None,
             timestamp,
         }

src/lib.rs

@@ -26,7 +26,7 @@ mod util;
 #[cfg(test)]
 mod test;
 
-pub use analysis::{Def, Ref};
+pub use analysis::{Def, Ref, Import};
 use analysis::Analysis;
 pub use raw::{name_space_for_def_kind, read_analysis_from_files, CrateId, DefKind};
 pub use loader::{AnalysisLoader, CargoAnalysisLoader, Target};
@@ -286,6 +286,11 @@ impl<L: AnalysisLoader> AnalysisHost<L> {
         })
     }
 
+    /// Returns all the imports in the analysis data.
+    pub fn find_all_imports(&self) -> AResult<Vec<Import>> {
+        self.with_analysis(|a| Some(a.for_all_crates(|c| Some(c.imports.clone()))))
+    }
+
     pub fn id(&self, span: &Span) -> AResult<Id> {
         self.with_analysis(|a| a.def_id_for_span(span))
     }

src/lowering.rs

@@ -9,7 +9,7 @@
 //! For processing the raw save-analysis data from rustc into the rls
 //! in-memory representation.
 
-use analysis::{Def, Glob, PerCrateAnalysis, Ref};
+use analysis::{Def, Glob, Import, PerCrateAnalysis, Ref};
 use data;
 use raw::{self, RelationKind, CrateId};
 use {AResult, AnalysisHost, Id, Span, NULL};
@@ -176,6 +176,14 @@ impl CrateReader {
                 let def_id = self.id_from_compiler_id(ref_id);
                 self.record_ref(def_id, span, analysis, project_analysis);
             }
+
+            let import = Import {
+                kind: i.kind,
+                parent: i.parent.map(|id| self.id_from_compiler_id(&id)),
+                def_id: i.ref_id.map(|id| self.id_from_compiler_id(&id)),
+            };
+            trace!("record import {:?}", import);
+            analysis.imports.push(import);
         }
     }
 

src/raw.rs

@@ -8,7 +8,7 @@
 
 use {AnalysisLoader, Blacklist};
 use listings::{DirectoryListing, ListingKind};
-pub use data::{CratePreludeData, Def, DefKind, GlobalCrateId as CrateId, Import,
+pub use data::{CratePreludeData, Def, DefKind, GlobalCrateId as CrateId, Import, ImportKind,
                Ref, Relation, RelationKind, SigElement, Signature, SpanData};
 use data::Analysis;