Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: the fields or variants of ADT was not restricted by limitations when hovering on Self type

Browse source
This commit is contained in:
roife 2024-04-06 14:36:34 +08:00
parent 01c3559bf3
commit c06d670f8f
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/ide/src/hover/render.rs
View file

@ -413,6 +413,15 @@ pub(super) fn definition(
Definition::Adt(adt) => {
adt.display_limited(db, config.max_adt_fields_or_variants_count).to_string()
}
Definition::SelfType(impl_def) => {
let self_ty = &impl_def.self_ty(db);
match self_ty.as_adt() {
Some(adt) => {
adt.display_limited(db, config.max_adt_fields_or_variants_count).to_string()
}
None => self_ty.display(db).to_string(),
}
}
_ => def.label(db),
};
let docs = def.docs(db, famous_defs);

34
crates/ide/src/hover/tests.rs
View file

@ -1623,6 +1623,28 @@ impl Thing {
test
```
```rust
struct Thing {
x: u32,
}
```
"#]],
);
check_hover_adt_fields_or_variants_limit(
None,
r#"
struct Thing { x: u32 }
impl Thing {
fn new() -> Self { Self$0 { x: 0 } }
}
"#,
expect![[r#"
*Self*
```rust
test
```
```rust
struct Thing
```
@ -1643,7 +1665,9 @@ impl Thing {
```
```rust
struct Thing
struct Thing {
x: u32,
}
```
"#]],
);
@ -1662,7 +1686,9 @@ impl Thing {
```
```rust
enum Thing
enum Thing {
A,
}
```
"#]],
);
@ -1681,7 +1707,9 @@ impl Thing {
```
```rust
enum Thing
enum Thing {
A,
}
```
"#]],
);