mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix panic when fetching generics

Browse Source 
due to macro expansion, the root node is not always a file
This commit is contained in:
Aleksey Kladov 2019-09-12 13:12:26 +03:00
parent 3c68da792b
commit 0ffd1fdbe4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ra_hir/src/impl_block.rs
View File

@ -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)
}
}