Skip to content

Commit 445e886

Browse files
roiferoife
committed
feat: add hover config for showing container bounds
1 parent e5f8598 commit 445e886

File tree

3 files changed

+60
-14
lines changed

3 files changed

+60
-14
lines changed

‎src/tools/rust-analyzer/crates/hir-ty/src/display.rs

+37
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ pub struct HirFormatter<'a> {
7474
/// When rendering something that has a concept of "children" (like fields in a struct), this limits
7575
/// how many should be rendered.
7676
pub entity_limit: Option<usize>,
77+
/// When rendering functions, whether to show the constraint from the container
78+
show_container_bounds: bool,
7779
omit_verbose_types: bool,
7880
closure_style: ClosureStyle,
7981
display_target: DisplayTarget,
@@ -101,6 +103,7 @@ pub trait HirDisplay {
101103
omit_verbose_types: bool,
102104
display_target: DisplayTarget,
103105
closure_style: ClosureStyle,
106+
show_container_bounds: bool,
104107
) -> HirDisplayWrapper<'a, Self>
105108
where
106109
Self: Sized,
@@ -117,6 +120,7 @@ pub trait HirDisplay {
117120
omit_verbose_types,
118121
display_target,
119122
closure_style,
123+
show_container_bounds,
120124
}
121125
}
122126

@@ -134,6 +138,7 @@ pub trait HirDisplay {
134138
omit_verbose_types: false,
135139
closure_style: ClosureStyle::ImplFn,
136140
display_target: DisplayTarget::Diagnostics,
141+
show_container_bounds: false,
137142
}
138143
}
139144

@@ -155,6 +160,7 @@ pub trait HirDisplay {
155160
omit_verbose_types: true,
156161
closure_style: ClosureStyle::ImplFn,
157162
display_target: DisplayTarget::Diagnostics,
163+
show_container_bounds: false,
158164
}
159165
}
160166

@@ -176,6 +182,7 @@ pub trait HirDisplay {
176182
omit_verbose_types: true,
177183
closure_style: ClosureStyle::ImplFn,
178184
display_target: DisplayTarget::Diagnostics,
185+
show_container_bounds: false,
179186
}
180187
}
181188

@@ -198,6 +205,7 @@ pub trait HirDisplay {
198205
omit_verbose_types: false,
199206
closure_style: ClosureStyle::ImplFn,
200207
display_target: DisplayTarget::SourceCode { module_id, allow_opaque },
208+
show_container_bounds: false,
201209
}) {
202210
Ok(()) => {}
203211
Err(HirDisplayError::FmtError) => panic!("Writing to String can't fail!"),
@@ -219,6 +227,29 @@ pub trait HirDisplay {
219227
omit_verbose_types: false,
220228
closure_style: ClosureStyle::ImplFn,
221229
display_target: DisplayTarget::Test,
230+
show_container_bounds: false,
231+
}
232+
}
233+
234+
/// Returns a String representation of `self` that shows the constraint from
235+
/// the container for functions
236+
fn display_with_container_bounds<'a>(
237+
&'a self,
238+
db: &'a dyn HirDatabase,
239+
show_container_bounds: bool,
240+
) -> HirDisplayWrapper<'a, Self>
241+
where
242+
Self: Sized,
243+
{
244+
HirDisplayWrapper {
245+
db,
246+
t: self,
247+
max_size: None,
248+
limited_size: None,
249+
omit_verbose_types: false,
250+
closure_style: ClosureStyle::ImplFn,
251+
display_target: DisplayTarget::Diagnostics,
252+
show_container_bounds,
222253
}
223254
}
224255
}
@@ -277,6 +308,10 @@ impl HirFormatter<'_> {
277308
pub fn omit_verbose_types(&self) -> bool {
278309
self.omit_verbose_types
279310
}
311+
312+
pub fn show_container_bounds(&self) -> bool {
313+
self.show_container_bounds
314+
}
280315
}
281316

282317
#[derive(Clone, Copy)]
@@ -336,6 +371,7 @@ pub struct HirDisplayWrapper<'a, T> {
336371
omit_verbose_types: bool,
337372
closure_style: ClosureStyle,
338373
display_target: DisplayTarget,
374+
show_container_bounds: bool,
339375
}
340376

341377
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -365,6 +401,7 @@ impl<T: HirDisplay> HirDisplayWrapper<'_, T> {
365401
omit_verbose_types: self.omit_verbose_types,
366402
display_target: self.display_target,
367403
closure_style: self.closure_style,
404+
show_container_bounds: self.show_container_bounds,
368405
})
369406
}
370407

‎src/tools/rust-analyzer/crates/hir/src/display.rs

+22-14
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,16 @@ impl HirDisplay for Function {
3636

3737
match container {
3838
Some(AssocItemContainer::Trait(trait_)) => {
39-
write_trait_header(&trait_, f)?;
40-
f.write_str("\n")?;
39+
if f.show_container_bounds() {
40+
write_trait_header(&trait_, f)?;
41+
f.write_str("\n")?;
42+
}
4143
}
4244
Some(AssocItemContainer::Impl(impl_)) => {
43-
write_impl_header(&impl_, f)?;
44-
f.write_str("\n")?;
45+
if f.show_container_bounds() {
46+
write_impl_header(&impl_, f)?;
47+
f.write_str("\n")?;
48+
}
4549

4650
// Block-local impls are "hoisted" to the nearest (non-block) module.
4751
module = module.nearest_non_block_module(db);
@@ -588,12 +592,14 @@ fn write_where_clause(
588592
let params = f.db.generic_params(def);
589593

590594
let container = match def {
591-
GenericDefId::FunctionId(id) => match id.lookup(f.db.upcast()).container() {
592-
ItemContainerId::ImplId(it) => Some(("impl", it.into())),
593-
ItemContainerId::TraitId(it) => Some(("trait", it.into())),
594-
_ => None,
595+
GenericDefId::FunctionId(id) if f.show_container_bounds() => {
596+
match id.lookup(f.db.upcast()).container() {
597+
ItemContainerId::ImplId(it) => Some(("impl", it.into())),
598+
ItemContainerId::TraitId(it) => Some(("trait", it.into())),
599+
_ => None,
600+
}
601+
.map(|(name, def)| (name, f.db.generic_params(def)))
595602
}
596-
.map(|(name, def)| (name, f.db.generic_params(def))),
597603
_ => None,
598604
};
599605

@@ -607,18 +613,20 @@ fn write_where_clause(
607613
})
608614
};
609615

610-
if no_displayable_pred(&params)
611-
&& container.as_ref().map_or(true, |(_, p)| no_displayable_pred(p))
612-
{
616+
let container_bounds_no_displayable =
617+
container.as_ref().map_or(true, |(_, p)| no_displayable_pred(p));
618+
if no_displayable_pred(&params) && container_bounds_no_displayable {
613619
return Ok(false);
614620
}
615621

616622
f.write_str("\nwhere")?;
617623
write_where_predicates(&params, f)?;
618624

619625
if let Some((name, container_params)) = container {
620-
write!(f, "\n // Bounds from {}:", name)?;
621-
write_where_predicates(&container_params, f)?;
626+
if !container_bounds_no_displayable {
627+
write!(f, "\n // Bounds from {}:", name)?;
628+
write_where_predicates(&container_params, f)?;
629+
}
622630
}
623631

624632
Ok(true)

‎src/tools/rust-analyzer/crates/ide/src/hover/render.rs

+1
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ pub(super) fn definition(
430430
}
431431
label
432432
}
433+
Definition::Function(fn_) => fn_.display_with_container_bounds(db, true).to_string(),
433434
_ => def.label(db),
434435
};
435436
let docs = def.docs(db, famous_defs);

0 commit comments

Comments
 (0)