1 files changed, 5 insertions, 7 deletions

diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs
index 61c93a964..bf9ac0dfb 100644
--- a/crates/ra_hir/src/query_definitions.rs
+++ b/crates/ra_hir/src/query_definitions.rs
@@ -4,9 +4,7 @@ use std::{
 };
 
 use rustc_hash::FxHashMap;
-use ra_syntax::{
-    AstNode, SyntaxNode, TreeArc,
-};
+use ra_syntax::{SyntaxNode, TreeArc};
 use ra_db::{CrateId};
 
 use crate::{
@@ -32,10 +30,10 @@ pub(super) fn file_item(
     db: &impl HirDatabase,
     source_item_id: SourceItemId,
 ) -> TreeArc<SyntaxNode> {
-    match source_item_id.item_id {
-        Some(id) => db.file_items(source_item_id.file_id)[id].to_owned(),
-        None => db.hir_parse(source_item_id.file_id).syntax().to_owned(),
-    }
+    let source_file = db.hir_parse(source_item_id.file_id);
+    db.file_items(source_item_id.file_id)[source_item_id.item_id]
+        .to_node(&source_file)
+        .to_owned()
 }
 
 pub(super) fn item_map(db: &impl HirDatabase, crate_id: CrateId) -> Arc<ItemMap> {