Merge #291

291: File module source does not depend on syntax r=matklad a=matklad

Fixes this problem: https://github.com/rust-analyzer/rust-analyzer/pull/289#issuecomment-448398571

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 4 insertions, 2 deletions

diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs
index 37c4f9e4f..efaeb1525 100644
--- a/crates/ra_hir/src/query_definitions.rs
+++ b/crates/ra_hir/src/query_definitions.rs
@@ -38,7 +38,6 @@ pub(super) fn fn_scopes(db: &impl HirDatabase, fn_id: FnId) -> Arc<FnScopes> {
 pub(super) fn file_items(db: &impl HirDatabase, file_id: FileId) -> Arc<SourceFileItems> {
     let mut res = SourceFileItems::new(file_id);
     let source_file = db.source_file(file_id);
-    res.alloc(source_file.syntax().owned());
     let source_file = source_file.borrowed();
     source_file
         .syntax()
@@ -52,7 +51,10 @@ pub(super) fn file_items(db: &impl HirDatabase, file_id: FileId) -> Arc<SourceFi
 }
 
 pub(super) fn file_item(db: &impl HirDatabase, source_item_id: SourceItemId) -> SyntaxNode {
-    db.file_items(source_item_id.file_id)[source_item_id.item_id].clone()
+    match source_item_id.item_id {
+        Some(id) => db.file_items(source_item_id.file_id)[id].clone(),
+        None => db.source_file(source_item_id.file_id).syntax().owned(),
+    }
 }
 
 pub(crate) fn submodules(