bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/hover.rs')
-rw-r--r--crates/ide/src/hover.rs30
1 files changed, 10 insertions, 20 deletions
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 3372d74af6..592fff322e 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -173,27 +173,17 @@ pub(crate) fn hover_for_definition(
Definition::BuiltinType(_) => Some(FamousDefs(sema, sema.scope(node)?.krate())),
_ => None,
};
- if let Some(markup) = render::definition(sema.db, definition, famous_defs.as_ref(), config) {
- let mut res = HoverResult::default();
- res.markup = render::process_markup(sema.db, definition, &markup, config);
- if let Some(action) = show_implementations_action(sema.db, definition) {
- res.actions.push(action);
+ render::definition(sema.db, definition, famous_defs.as_ref(), config).map(|markup| {
+ HoverResult {
+ markup: render::process_markup(sema.db, definition, &markup, config),
+ actions: show_implementations_action(sema.db, definition)
+ .into_iter()
+ .chain(show_fn_references_action(sema.db, definition))
+ .chain(runnable_action(sema, definition, file_id))
+ .chain(goto_type_action_for_def(sema.db, definition))
+ .collect(),
}
-
- if let Some(action) = show_fn_references_action(sema.db, definition) {
- res.actions.push(action);
- }
-
- if let Some(action) = runnable_action(sema, definition, file_id) {
- res.actions.push(action);
- }
-
- if let Some(action) = goto_type_action_for_def(sema.db, definition) {
- res.actions.push(action);
- }
- return Some(res);
- }
- None
+ })
}
fn hover_ranged(