rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Aleksey Kladov
2019-04-13 09:36:28 +03:00
parent 65b0073653
commit 17a0e22883
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/ra_hir/src/source_binder.rs
View File

@@ -101,15 +101,6 @@ fn function_from_source(
Some(Function { id: ctx.to_def(fn_def) }) Some(Function { id: ctx.to_def(fn_def) })
} }
fn function_from_child_node(
db: &impl HirDatabase,
file_id: FileId,
node: &SyntaxNode,
) -> Option<Function> {
let fn_def = node.ancestors().find_map(ast::FnDef::cast)?;
function_from_source(db, file_id, fn_def)
}
pub fn struct_from_module( pub fn struct_from_module(
db: &impl HirDatabase, db: &impl HirDatabase,
module: Module, module: Module,
@@ -148,7 +139,11 @@ fn resolver_for_node(
node.ancestors() node.ancestors()
.find_map(|node| { .find_map(|node| {
if ast::Expr::cast(node).is_some() || ast::Block::cast(node).is_some() { if ast::Expr::cast(node).is_some() || ast::Block::cast(node).is_some() {
if let Some(func) = function_from_child_node(db, file_id, node) { if let Some(func) = node
.ancestors()
.find_map(ast::FnDef::cast)
.and_then(|it| function_from_source(db, file_id, it))
{
let scopes = func.scopes(db); let scopes = func.scopes(db);
let scope = match offset { let scope = match offset {
None => scopes.scope_for(&node), None => scopes.scope_for(&node),