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

Merge #3124

Browse Source 
3124: Simplify r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-02-12 17:02:41 +00:00 committed by GitHub
commit 9701e59783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ra_ide/src/goto_type_definition.rs
View File

@ -16,24 +16,16 @@ pub(crate) fn goto_type_definition(
let token = pick_best(file.token_at_offset(position.offset))?; let token = pick_best(file.token_at_offset(position.offset))?;
let token = descend_into_macros(db, position.file_id, token); let token = descend_into_macros(db, position.file_id, token);
let node = token.value.ancestors().find_map(|token| { let node = token
token .value
.ancestors() .ancestors()
.find(|n| ast::Expr::cast(n.clone()).is_some() || ast::Pat::cast(n.clone()).is_some()) .find(|n| ast::Expr::cast(n.clone()).is_some() || ast::Pat::cast(n.clone()).is_some())?;
})?;
let analyzer = hir::SourceAnalyzer::new(db, token.with_value(&node), None); let analyzer = hir::SourceAnalyzer::new(db, token.with_value(&node), None);
let ty: hir::Type = if let Some(ty) = let ty: hir::Type = ast::Expr::cast(node.clone())
ast::Expr::cast(node.clone()).and_then(|e| analyzer.type_of(db, &e)) .and_then(|e| analyzer.type_of(db, &e))
{ .or_else(|| ast::Pat::cast(node.clone()).and_then(|p| analyzer.type_of_pat(db, &p)))?;
ty
} else if let Some(ty) = ast::Pat::cast(node.clone()).and_then(|p| analyzer.type_of_pat(db, &p))
{
ty
} else {
return None;
};
let adt_def = ty.autoderef(db).find_map(|ty| ty.as_adt())?; let adt_def = ty.autoderef(db).find_map(|ty| ty.as_adt())?;