language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

generalize SourceAnalyzer to handle all defs with bodies

Browse source
This commit is contained in:
Aleksey Kladov 2019-04-11 16:22:10 +03:00
parent 07cc047b4f
commit 5471c1ef4b
3 changed files with 51 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/ra_hir/src/source_binder.rs
View file

@ -15,7 +15,7 @@ use ra_syntax::{
};
use crate::{
HirDatabase, Function, Struct, Enum, Const, Static, Either,
HirDatabase, Function, Struct, Enum, Const, Static, Either, DefWithBody,
AsName, Module, HirFileId, Crate, Trait, Resolver,
ids::LocationCtx,
expr, AstId
@ -219,7 +219,7 @@ pub fn resolver_for_position(db: &impl HirDatabase, position: FilePosition) -> R
.unwrap_or_default()
}
pub fn resolver_for_node(db: &impl HirDatabase, file_id: FileId, node: &SyntaxNode) -> Resolver {
fn resolver_for_node(db: &impl HirDatabase, file_id: FileId, node: &SyntaxNode) -> Resolver {
node.ancestors()
.find_map(|node| {
if ast::Expr::cast(node).is_some() || ast::Block::cast(node).is_some() {
@ -284,16 +284,24 @@ pub enum PathResolution {
impl SourceAnalyzer {
pub fn new(db: &impl HirDatabase, file_id: FileId, node: &SyntaxNode) -> SourceAnalyzer {
let resolver = resolver_for_node(db, file_id, node);
let function = function_from_child_node(db, file_id, node);
if let Some(function) = function {
SourceAnalyzer {
resolver,
body_source_map: Some(function.body_source_map(db)),
infer: Some(function.infer(db)),
let def_with_body = node.ancestors().find_map(|node| {
if let Some(src) = ast::FnDef::cast(node) {
return function_from_source(db, file_id, src).map(DefWithBody::from);
}
} else {
SourceAnalyzer { resolver, body_source_map: None, infer: None }
if let Some(src) = ast::StaticDef::cast(node) {
return static_from_source(db, file_id, src).map(DefWithBody::from);
}
if let Some(src) = ast::ConstDef::cast(node) {
return const_from_source(db, file_id, src).map(DefWithBody::from);
}
None
});
SourceAnalyzer {
resolver: def_with_body
.map(|it| it.resolver(db))
.unwrap_or_else(|| resolver_for_node(db, file_id, node)),
body_source_map: def_with_body.map(|it| it.body_source_map(db)),
infer: def_with_body.map(|it| it.infer(db)),
}
}