Merge #1827

1827: fix panic when fetching generics r=matklad a=matklad



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

1 files changed, 5 insertions, 5 deletions

diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 162ab02b1..d26a024ed 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
 use ra_syntax::{
     ast::{self, AstNode},
-    AstPtr, SourceFile,
+    AstPtr,
 };
 
 use crate::{
@@ -29,12 +29,12 @@ impl ImplSourceMap {
     }
 
     pub fn get(&self, source: &ModuleSource, impl_id: ImplId) -> ast::ImplBlock {
-        let file = match source {
-            ModuleSource::SourceFile(file) => file.clone(),
-            ModuleSource::Module(m) => m.syntax().ancestors().find_map(SourceFile::cast).unwrap(),
+        let root = match source {
+            ModuleSource::SourceFile(file) => file.syntax().clone(),
+            ModuleSource::Module(m) => m.syntax().ancestors().last().unwrap(),
         };
 
-        self.map[impl_id].to_node(file.syntax()).to_owned()
+        self.map[impl_id].to_node(&root)
     }
 }