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

Merge #5698

Browse source 
5698: Display the value of a const on the hover r=jonas-schievink a=JmPotato

Signed-off-by: JmPotato <ghzpotato@gmail.com>

Close #4051 

To display the value of a const, I modified the implementation of `ShortLabel` for `ast::Const`.

Co-authored-by: JmPotato <ghzpotato@gmail.com>
This commit is contained in:
bors[bot] 2020-08-10 09:55:58 +00:00 committed by GitHub
commit f3336509e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_ide/src/display/short_label.rs
View file

@ -61,7 +61,11 @@ impl ShortLabel for ast::TypeAlias {
impl ShortLabel for ast::Const {
fn short_label(&self) -> Option<String> {
short_label_from_ty(self, self.ty(), "const ")
let mut new_buf = short_label_from_ty(self, self.ty(), "const ")?;
if let Some(expr) = self.body() {
format_to!(new_buf, " = {}", expr.syntax());
}
Some(new_buf)
}
}

8
crates/ra_ide/src/hover.rs
View file

@ -590,16 +590,16 @@ fn main() {
#[test]
fn hover_const_static() {
check(
r#"const foo<|>: u32 = 0;"#,
r#"const foo<|>: u32 = 123;"#,
expect![[r#"
*foo*
```rust
const foo: u32
const foo: u32 = 123
```
"#]],
);
check(
r#"static foo<|>: u32 = 0;"#,
r#"static foo<|>: u32 = 456;"#,
expect![[r#"
*foo*
```rust
@ -834,7 +834,7 @@ fn main() {
expect![[r#"
*C*
```rust
const C: u32
const C: u32 = 1
```
"#]],
)