Move ModuleSource back to hir

2019-11-23 17:06:04 +03:00
parent 6bdd5fa461
commit ffc2325d19
4 changed files with 71 additions and 78 deletions
--- a/crates/ra_hir/src/code_model/src.rs
+++ b/crates/ra_hir/src/code_model/src.rs
@@ -117,7 +117,9 @@ impl HasSource for Import {
    fn source(self, db: &impl DefDatabase) -> Source<Self::Ast> {
        let src = self.parent.definition_source(db);
        let (_, source_map) = db.raw_items_with_source_map(src.file_id);
-        src.with_value(source_map.get(&src.value, self.id))
+        let root = db.parse_or_expand(src.file_id).unwrap();
+        let ptr = source_map.get(self.id);
+        src.with_value(ptr.map(|it| it.to_node(&root), |it| it.to_node(&root)))
    }
 }