Unnamed repository; edit this file 'description' to name the repository.
Render discriminant inlay hints for mixed variants if at least one discriminant is specified
| -rw-r--r-- | crates/ide/src/inlay_hints/discriminant.rs | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/crates/ide/src/inlay_hints/discriminant.rs b/crates/ide/src/inlay_hints/discriminant.rs index c5c947150b..5dd51ad11f 100644 --- a/crates/ide/src/inlay_hints/discriminant.rs +++ b/crates/ide/src/inlay_hints/discriminant.rs @@ -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 } "#, ); |