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

simplify

Browse Source
This commit is contained in:
Anatol Ulrich 2021-10-26 12:21:18 +02:00
parent 2490807ca5
commit 686f8fbea3
1 changed files with 12 additions and 17 deletions

29
crates/ide/src/goto_type_definition.rs

@ -36,13 +36,11 @@ pub(crate) fn goto_type_definition(
} }
} }
}; };
let range = token.text_range();
// TODO this became pretty baroque after refactoring for `descend_into_macros(_many)` sema.descend_into_macros(token)
let range = sema
.descend_into_macros(token)
.iter() .iter()
.filter_map(|token| { .filter_map(|token| {
let ty_range = sema.token_ancestors_with_macros(token.clone()).find_map(|node| { let ty = sema.token_ancestors_with_macros(token.clone()).find_map(|node| {
let ty = match_ast! { let ty = match_ast! {
match node { match node {
ast::Expr(it) => sema.type_of_expr(&it)?.original, ast::Expr(it) => sema.type_of_expr(&it)?.original,
@ -64,12 +62,11 @@ pub(crate) fn goto_type_definition(
} }
}; };
let range = node.text_range(); Some(ty)
Some((ty, range.start(), range.end()))
}); });
ty_range ty
}) })
.inspect(|(ty, _range_start, _range_end)| { .for_each(|ty| {
// collect from each `ty` into the `res` result vec // collect from each `ty` into the `res` result vec
let ty = ty.strip_references(); let ty = ty.strip_references();
ty.walk(db, |t| { ty.walk(db, |t| {
@ -83,14 +80,12 @@ pub(crate) fn goto_type_definition(
push(trait_.into()); push(trait_.into());
} }
}); });
}) // reduce all ranges into a single umbrella span (TODO fishy?) });
.map(|(_, range_start, range_end)| (range_start, range_end)) if res.is_empty() {
.reduce(|(start_acc, end_acc), (start_cur, end_cur)| { None
(start_acc.min(start_cur), end_acc.max(end_cur)) } else {
}) Some(RangeInfo::new(range, res))
.map(|(range_start, range_end)| TextRange::new(range_start, range_end))?; // TODO easy to miss `?` bail }
Some(RangeInfo::new(range, res))
} }
#[cfg(test)] #[cfg(test)]