Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #10796

Browse source 
10796: ide: display static values in hover r=Veykril a=jhgg

Continuation from #10785 - does the same thing, but for `static`'s as well.

Co-authored-by: Jake Heinz <jh@discordapp.com>
This commit is contained in:
bors[bot] 2021-11-18 09:48:10 +00:00 committed by GitHub
commit bf8cf09967
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/hir/src/lib.rs
View file

@ -1497,6 +1497,10 @@ impl Static {
db.static_data(self.id).mutable
}
pub fn value(self, db: &dyn HirDatabase) -> Option<ast::Expr> {
self.source(db)?.value.body()
}
pub fn ty(self, db: &dyn HirDatabase) -> Type {
let data = db.static_data(self.id);
let resolver = self.id.resolver(db.upcast());

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

@ -1,6 +1,8 @@
//! Logic for rendering the different hover messages
use std::fmt::Display;
use either::Either;
use hir::{AsAssocItem, Const, HasAttrs, HasSource, HirDisplay, Semantics, TypeInfo};
use hir::{AsAssocItem, HasAttrs, HasSource, HirDisplay, Semantics, TypeInfo};
use ide_db::{
base_db::SourceDatabase,
defs::Definition,
@ -352,8 +354,8 @@ pub(super) fn definition(
Definition::Function(it) => label_and_docs(db, it),
Definition::Adt(it) => label_and_docs(db, it),
Definition::Variant(it) => label_and_docs(db, it),
Definition::Const(it) => const_label_value_and_docs(db, it),
Definition::Static(it) => label_and_docs(db, it),
Definition::Const(it) => label_value_and_docs(db, it, |it| it.value(db)),
Definition::Static(it) => label_value_and_docs(db, it, |it| it.value(db)),
Definition::Trait(it) => label_and_docs(db, it),
Definition::TypeAlias(it) => label_and_docs(db, it),
Definition::BuiltinType(it) => {
@ -381,18 +383,22 @@ where
(label, docs)
}
fn const_label_value_and_docs(
fn label_value_and_docs<D, E, V>(
db: &RootDatabase,
konst: Const,
) -> (String, Option<hir::Documentation>) {
let label = if let Some(expr) = konst.value(db) {
format!("{} = {}", konst.display(db), expr)
def: D,
value_extractor: E,
) -> (String, Option<hir::Documentation>)
where
D: HasAttrs + HirDisplay,
E: Fn(&D) -> Option<V>,
V: Display,
{
let label = if let Some(value) = (value_extractor)(&def) {
format!("{} = {}", def.display(db), value)
} else {
konst.display(db).to_string()
def.display(db).to_string()
};
let docs = konst.attrs(db).docs();
let docs = def.attrs(db).docs();
(label, docs)
}

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

@ -546,7 +546,7 @@ const foo$0: u32 = {
```
```rust
static foo: u32
static foo: u32 = 456
```
"#]],
);