language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: add hover display for trait assoc items

Browse source
This commit is contained in:
Young-Flash 2023-11-16 17:22:53 +08:00 • committed by Young-Flash
parent 543d7e98db
commit dba167592e
2 changed files with 127 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/hir/src/display.rs
View file

@ -595,6 +595,30 @@ impl HirDisplay for Trait {
let def_id = GenericDefId::TraitId(self.id); let def_id = GenericDefId::TraitId(self.id);
write_generic_params(def_id, f)?; write_generic_params(def_id, f)?;
write_where_clause(def_id, f)?; write_where_clause(def_id, f)?;
let assoc_items = self.items(f.db);
if assoc_items.is_empty() {
f.write_str(" {}")?;
} else {
f.write_str(" {\n")?;
for item in assoc_items {
f.write_str(" ")?;
match item {
AssocItem::Function(func) => {
func.hir_fmt(f)?;
}
AssocItem::Const(cst) => {
cst.hir_fmt(f)?;
}
AssocItem::TypeAlias(type_alias) => {
type_alias.hir_fmt(f)?;
}
};
f.write_str(",\n")?;
}
f.write_str("}")?;
}
Ok(()) Ok(())
} }
} }

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

@ -2685,7 +2685,7 @@ fn main() { let s$0t = foo(); }
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo", description: "trait Foo {}",
}, },
}, },
], ],
@ -2719,7 +2719,7 @@ fn main() { let s$0t = foo(); }
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo<T>", description: "trait Foo<T> {}",
}, },
}, },
HoverGotoTypeData { HoverGotoTypeData {
@ -2886,7 +2886,7 @@ fn foo(ar$0g: &impl Foo) {}
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo", description: "trait Foo {}",
}, },
}, },
], ],
@ -2988,7 +2988,7 @@ pub mod future {
name: "Future", name: "Future",
kind: Trait, kind: Trait,
container_name: "future", container_name: "future",
description: "pub trait Future", description: "pub trait Future {}",
}, },
}, },
HoverGotoTypeData { HoverGotoTypeData {
@ -3033,7 +3033,7 @@ fn foo(ar$0g: &impl Foo<S>) {}
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo<T>", description: "trait Foo<T> {}",
}, },
}, },
HoverGotoTypeData { HoverGotoTypeData {
@ -3096,7 +3096,7 @@ fn main() { let s$0t = foo(); }
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo", description: "trait Foo {}",
}, },
}, },
], ],
@ -3127,7 +3127,7 @@ fn foo(ar$0g: &dyn Foo) {}
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo", description: "trait Foo {}",
}, },
}, },
], ],
@ -3159,7 +3159,7 @@ fn foo(ar$0g: &dyn Foo<S>) {}
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo<T>", description: "trait Foo<T> {}",
}, },
}, },
HoverGotoTypeData { HoverGotoTypeData {
@ -3288,7 +3288,7 @@ fn main() { let s$0t = test().get(); }
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo", description: "trait Foo {\n type Item,\n fn get(self) -> Self::Item,\n}",
}, },
}, },
], ],
@ -3353,7 +3353,7 @@ fn foo<T: Foo>(t: T$0){}
focus_range: 6..9, focus_range: 6..9,
name: "Foo", name: "Foo",
kind: Trait, kind: Trait,
description: "trait Foo", description: "trait Foo {}",
}, },
}, },
], ],
@ -6252,6 +6252,99 @@ impl T for () {
); );
} }
#[test]
fn hover_trait_show_assoc_items() {
check(
r#"
trait T {}
impl T$0 for () {}
"#,
expect![[r#"
*T*
```rust
test
```
```rust
trait T {}
```
"#]],
);
check(
r#"
trait T {
fn func() {}
}
impl T$0 for () {}
"#,
expect![[r#"
*T*
```rust
test
```
```rust
trait T {
fn func(),
}
```
"#]],
);
check(
r#"
trait T {
fn func() {}
const FLAG: i32 = 34;
}
impl T$0 for () {}
"#,
expect![[r#"
*T*
```rust
test
```
```rust
trait T {
fn func(),
const FLAG: i32,
}
```
"#]],
);
check(
r#"
trait T {
fn func() {}
const FLAG: i32 = 34;
type Bar;
}
impl T$0 for () {}
"#,
expect![[r#"
*T*
```rust
test
```
```rust
trait T {
fn func(),
const FLAG: i32,
type Bar,
}
```
"#]],
);
}
#[test] #[test]
fn hover_ranged_macro_call() { fn hover_ranged_macro_call() {
check_hover_range( check_hover_range(