nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #14116 - Veykril:inlay-hints-disc, r=Veykril

Browse Source 
Render discriminant inlay hints for mixed variants if at least one discriminant is specified
This commit is contained in:
bors 2023-02-10 08:59:17 +00:00
commit f11cff8976
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/ide/src/inlay_hints/discriminant.rs
View File

@ -19,12 +19,15 @@ pub(super) fn enum_hints(
_: FileId,
enum_: ast::Enum,
) -> Option<()> {
let disabled = match config.discriminant_hints {
DiscriminantHints::Always => false,
DiscriminantHints::Fieldless => sema.to_def(&enum_)?.is_data_carrying(sema.db),
DiscriminantHints::Never => true,
let enabled = match config.discriminant_hints {
DiscriminantHints::Always => true,
DiscriminantHints::Fieldless => {
!sema.to_def(&enum_)?.is_data_carrying(sema.db)
|| enum_.variant_list()?.variants().any(|v| v.expr().is_some())
}
DiscriminantHints::Never => false,
};
if disabled {
if !enabled {
return None;
}
for variant in enum_.variant_list()?.variants() {
@ -161,8 +164,25 @@ enum Enum {
Variant1,
Variant2 {},
Variant3,
Variant5,
Variant6,
}
"#,
);
check_discriminants_fieldless(
r#"
enum Enum {
Variant(),
//^^^^^^^^^0
Variant1,
//^^^^^^^^1
Variant2 {},
//^^^^^^^^^^^2
Variant3,
//^^^^^^^^3
Variant5 = 5,
Variant6,
//^^^^^^^^6
}
"#,
);